treewide: alejandra formatting

flake.nix

@@ -9,8 +9,13 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs = { self, nixpkgs, home-manager, hyprland, ... }@inputs:
+  outputs = {
-    let
+    self,
+    nixpkgs,
+    home-manager,
+    hyprland,
+    ...
+  } @ inputs: let
     system = "x86_64-linux";
     lib = nixpkgs.lib;
   in {
@@ -19,12 +24,11 @@
         inherit system;
         modules = [
           ./hosts/tsuki
-            home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager
+          {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.extraSpecialArgs = {
+            home-manager.extraSpecialArgs = {inherit inputs;};
-              inherit inputs;
-            };
             home-manager.users.notoh = {
               imports = [
                 hyprland.homeManagerModules.default
@@ -38,14 +42,11 @@
         inherit system;
         modules = [
           ./hosts/hime
-            home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager
+          {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.oh = {
+            home-manager.users.oh = {imports = [./hosts/hime/home.nix];};
-              imports = [
-                ./hosts/hime/home.nix
-              ];
-            };
           }
         ];
       };
@@ -53,13 +54,12 @@
         inherit system;
         modules = [
           ./hosts/sutakku
-          home-manager.nixosModules.home-manager {
+          home-manager.nixosModules.home-manager
+          {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
             home-manager.users.oh = {
-              imports = [
+              imports = [./hosts/sutakku/home.nix];
-                ./hosts/sutakku/home.nix
-              ];
             };
           }
         ];

home/default.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
   imports = [
     ./neofetch
     ./nushell
@@ -16,5 +13,6 @@
   home.packages = with pkgs; [
     bat
     croc
+    alejandra
   ];
 }

home/direnv/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.direnv = {
     enable = true;
     enableNushellIntegration = true;

home/dunst/config.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   global = {
     frame_color = "#f5c2e7";
     frame_width = "4";

home/dunst/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   services.dunst = {
     enable = true;
     waylandDisplay = "DP-2";

home/git/default.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
   home.packages = with pkgs; [gh];
 
   programs.git = {

home/gtk/default.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
-
   home.pointerCursor = {
     package = pkgs.bibata-cursors;
     name = "Bibata-Modern-Classic";

home/helix/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   imports = [
     ./themes/catppuccin_mocha.nix
   ];

home/helix/themes/catppuccin_mocha.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.helix = {
     themes.catppuccin_mocha = let
       transparent = "none";
@@ -45,24 +43,39 @@
       "string" = green;
       "string.regexp" = peach;
       "string.special" = blue;
-    "comment" = {fg = maroon; modifiers = ["italic"]; };
+      "comment" = {
+        fg = maroon;
+        modifiers = ["italic"];
+      };
       "variable" = "text";
-    "variable.parameter" = {fg = maroon; modifiers = ["italic"]; };
+      "variable.parameter" = {
+        fg = maroon;
+        modifiers = ["italic"];
+      };
       "variable.builtin" = red;
       "variable.other.member" = teal;
       "label" = sapphire;
       "punctuation" = overlay2;
       "punctuation.special" = sky;
       "keyword" = mauve;
-    "keyword.control.conditional" = {fg = mauve; modifiers = ["italic"]; };
+      "keyword.control.conditional" = {
+        fg = mauve;
+        modifiers = ["italic"];
+      };
       "operator" = sky;
       "function" = blue;
       "function.macro" = mauve;
       "tag" = mauve;
       "attribute" = blue;
-    "namespace" = {fg = blue; modifiers = ["italic"]; };
+      "namespace" = {
+        fg = blue;
+        modifiers = ["italic"];
+      };
       "special" = blue;
-    "markup.heading.marker" = {fg = peach; modifiers = ["bold"]; };
+      "markup.heading.marker" = {
+        fg = peach;
+        modifiers = ["bold"];
+      };
       "markup.heading.1" = lavender;
       "markup.heading.2" = mauve;
       "markup.heading.3" = green;
@@ -72,7 +85,10 @@
       "markup.list" = mauve;
       "markup.bold" = {modifiers = ["bold"];};
       "markup.italic" = {modifiers = ["italic"];};
-    "markup.link.url" = {fg = rosewater; modifiers = ["italic" "underlined"]; };
+      "markup.link.url" = {
+        fg = rosewater;
+        modifiers = ["italic" "underlined"];
+      };
       "markup.link.text" = blue;
       "markup.raw" = flamingo;
       "diff.plus" = green;
@@ -81,36 +97,116 @@
       "ui.background" = {fg = surface1;};
       "ui.linenr" = {fg = surface1;};
       "ui.linenr.selected" = {fg = lavender;};
-    "ui.statusline" = { fg = subtext1; bg = mantle; };
+      "ui.statusline" = {
-    "ui.statusline.inactive" = { fg = surface2; bg = mantle; };
+        fg = subtext1;
-    "ui.statusline.normal" = { fg = base; bg = lavender; modifiers = ["bold"]; };
+        bg = mantle;
-    "ui.statusline.insert" = { fg = base; bg = green; modifiers = ["bold"]; };
+      };
-    "ui.statusline.select" = { fg = base; bg = flamingo; modifiers = ["bold"]; };
+      "ui.statusline.inactive" = {
-    "ui.popup" = { fg = text; bg = surface0; };
+        fg = surface2;
+        bg = mantle;
+      };
+      "ui.statusline.normal" = {
+        fg = base;
+        bg = lavender;
+        modifiers = ["bold"];
+      };
+      "ui.statusline.insert" = {
+        fg = base;
+        bg = green;
+        modifiers = ["bold"];
+      };
+      "ui.statusline.select" = {
+        fg = base;
+        bg = flamingo;
+        modifiers = ["bold"];
+      };
+      "ui.popup" = {
+        fg = text;
+        bg = surface0;
+      };
       "ui.window" = {fg = crust;};
-    "ui.help" = { fg = overlay2; bg = surface0; };
+      "ui.help" = {
-    "ui.bufferline" = { fg = subtext0; bg = mantle; };
+        fg = overlay2;
-    "ui.bufferline.active" = { fg = mauve; bg = base; underline = {color = mauve; style = "line"; }; };
+        bg = surface0;
+      };
+      "ui.bufferline" = {
+        fg = subtext0;
+        bg = mantle;
+      };
+      "ui.bufferline.active" = {
+        fg = mauve;
+        bg = base;
+        underline = {
+          color = mauve;
+          style = "line";
+        };
+      };
       "ui.bufferline.background" = {bg = crust;};
       "ui.text" = text;
-    "ui.text.focus" = { fg = text; bg = surface0; modifiers = ["bold"]; };
+      "ui.text.focus" = {
+        fg = text;
+        bg = surface0;
+        modifiers = ["bold"];
+      };
       "ui.text.inactive" = {fg = overlay1;};
       "ui.virtual" = overlay0;
       "ui.virtual.ruler" = {bg = surface0;};
       "ui.virtual.indent-guide" = surface0;
-    "ui.virtual.inlay-hint" = { fg = surface1; bg = mantle; };
+      "ui.virtual.inlay-hint" = {
+        fg = surface1;
+        bg = mantle;
+      };
       "ui.selection" = {bg = surface1;};
-    "ui.cursor" = { fg = base; bg = secondary_cursor; };
+      "ui.cursor" = {
-    "ui.cursor.primary" = { fg = base; bg = rosewater; };
+        fg = base;
-    "ui.cursor.match" = { fg = peach; modifiers = ["bold"]; };
+        bg = secondary_cursor;
+      };
+      "ui.cursor.primary" = {
+        fg = base;
+        bg = rosewater;
+      };
+      "ui.cursor.match" = {
+        fg = peach;
+        modifiers = ["bold"];
+      };
       "ui.cursorline.primary" = {bg = cursorline;};
-    "ui.highlight" = { bg = surface1; modifiers = ["bold"]; };
+      "ui.highlight" = {
-    "ui.menu" = { fg = overlay2; bg = surface0; };
+        bg = surface1;
-    "ui.menu.selected" = { fg = text; bg = surface1; modifiers = ["bold"]; };
+        modifiers = ["bold"];
-    "diagnostic.error" = { underline = { color = red; style = "curl"; }; };
+      };
-    "diagnostic.warning" = { underline = { color = yellow; style = "curl"; }; };
+      "ui.menu" = {
-    "diagnostic.info" = { underline = { color = sky; style = "curl"; }; };
+        fg = overlay2;
-    "diagnostic.hint" = { underline = { color = teal; style = "curl"; }; };
+        bg = surface0;
+      };
+      "ui.menu.selected" = {
+        fg = text;
+        bg = surface1;
+        modifiers = ["bold"];
+      };
+      "diagnostic.error" = {
+        underline = {
+          color = red;
+          style = "curl";
+        };
+      };
+      "diagnostic.warning" = {
+        underline = {
+          color = yellow;
+          style = "curl";
+        };
+      };
+      "diagnostic.info" = {
+        underline = {
+          color = sky;
+          style = "curl";
+        };
+      };
+      "diagnostic.hint" = {
+        underline = {
+          color = teal;
+          style = "curl";
+        };
+      };
 
       "error" = red;
       "warning" = yellow;

home/lazygit/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.lazygit = {
     enable = true;
     settings = {

home/lf/default.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
   programs.lf = {
     enable = true;
     settings = {

home/librewolf/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.librewolf = {
     enable = true;
     settings = {

home/nushell/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.nushell = {
     enable = true;
     configFile.source = ./config.nu;

home/starship/default.nix

@@ -93,7 +93,6 @@
         style = "bg:#e05a75 fg:#11111b";
         format = "[ $time ]($style)";
       };
-
     };
   };
 }

home/waybar/default.nix

@@ -3,8 +3,7 @@
   pkgs,
   lib,
   ...
-}:
+}: let
-  let  
   compileSCSS = name: source: "${pkgs.runCommandLocal name {} ''
     mkdir -p $out
     ${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css

home/wayland/default.nix

@@ -1,9 +1,4 @@
-{
+{pkgs, ...}: let
-  pkgs,
-  ...
-}:
-
-let 
   dbus-hyprland-environment = pkgs.writeTextFile {
     name = "dbus-hyprland-environment";
     destination = "/bin/dbus-hyprland-environment";
@@ -14,9 +9,7 @@ let
       systemctl --user start pipewire wireplumber pipewire-media-session xdg-desktop-portal xdg-desktop-portal-hyprland
     '';
   };
-  in
+in {
-{
-
   imports = [
     ../../modules/greetd.nix
   ];
@@ -69,5 +62,4 @@ let
   environment.etc."greetd/environments".text = ''
     Hyprland
   '';
-
 }

home/wayland/hyprland/config.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   wayland.windowManager.hyprland.extraConfig = ''
 
     monitor = HDMI-A-1,1920x1080,5760x0,1 #right

home/wayland/hyprland/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   imports = [./config.nix];
 
   wayland.windowManager.hyprland = {

home/wezterm/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.wezterm = {
     enable = true;
     extraConfig = ''

home/zathura/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.zathura = {
     enable = true;
     extraConfig = ''

home/zellij/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   imports = [
     ./layouts.nix
   ];

home/zellij/layouts.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   home.file.".config/zellij/snowflake.kdl".text = ''
       layout {
         tab name="main" {

home/zoxide/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   programs.zoxide = {
     enable = true;
     enableNushellIntegration = true;

hosts/hime/default.nix

@@ -1,9 +1,5 @@
-{ 
+{pkgs, ...}: {
-  pkgs, 
+  imports = [
-  ... 
-}: {
-  imports =
-    [
     ./hardware-configuration.nix
     ../../modules
   ];
@@ -47,12 +43,10 @@
     };
   };
 
-
   environment.systemPackages = with pkgs; [
     docker-compose
     wget
     python3Full
     nfs-utils
   ];
-
 }

hosts/hime/hardware-configuration.nix

@@ -1,8 +1,12 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
   boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
@@ -10,25 +14,25 @@
   boot.kernelModules = [];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/154e6059-35f9-49bb-b049-085b325ac997";
+    device = "/dev/disk/by-uuid/154e6059-35f9-49bb-b049-085b325ac997";
     fsType = "ext4";
   };
-  fileSystems."/home/oh/nas" = 
+  fileSystems."/home/oh/nas" = {
-  { device = "192.168.1.71:/volume1/hime";
+    device = "192.168.1.71:/volume1/hime";
     fsType = "nfs";
   };
-  fileSystems."/home/oh/docker/nextcloud" =
+  fileSystems."/home/oh/docker/nextcloud" = {
-  { device = "192.168.1.71:/volume1/nextcloud";
+    device = "192.168.1.71:/volume1/nextcloud";
     fsType = "nfs";
   };
-  fileSystems."/home/oh/docker/stash/data" = 
+  fileSystems."/home/oh/docker/stash/data" = {
-  { device = "192.168.1.71:/volume1/stash";
+    device = "192.168.1.71:/volume1/stash";
     fsType = "nfs";
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/15978bb3-da9b-4ec2-bd35-1716dd97812b"; }
+    {device = "/dev/disk/by-uuid/15978bb3-da9b-4ec2-bd35-1716dd97812b";}
   ];
 
   networking.useDHCP = lib.mkDefault true;

hosts/hime/home.nix

@@ -1,7 +1,8 @@
-{config, pkgs, ...}:
-
 {
-
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ../../home
   ];

hosts/sutakku/default.nix

@@ -1,8 +1,9 @@
-{ config, pkgs, ... }:
-
 {
-  imports =
+  config,
-    [ 
+  pkgs,
+  ...
+}: {
+  imports = [
     ./hardware-configuration.nix
     ../../modules
   ];

hosts/sutakku/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
   ];
 
   boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
@@ -13,18 +17,17 @@
   boot.kernelModules = [];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/dae21f73-2c6b-4959-90cc-07fb77c2a880";
+    device = "/dev/disk/by-uuid/dae21f73-2c6b-4959-90cc-07fb77c2a880";
     fsType = "ext4";
   };
-  fileSystems."/media" =
+  fileSystems."/media" = {
-  { 
     device = "192.168.1.71:/volume1/media";
     fsType = "nfs";
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/990dd47b-fa78-4636-844e-83cc638052dc"; }
+    {device = "/dev/disk/by-uuid/990dd47b-fa78-4636-844e-83cc638052dc";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/sutakku/home.nix

@@ -1,7 +1,8 @@
-{config, pkgs, ...}:
-
 {
-
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ../../home
   ];

hosts/tsuki/default.nix

@@ -3,8 +3,7 @@
   pkgs,
   ...
 }: {
-  imports =
+  imports = [
-    [ 
     ./hardware-configuration.nix
     ../../home/wayland
     ../../modules

hosts/tsuki/hardware-configuration.nix

@@ -1,11 +1,15 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
@@ -13,32 +17,32 @@
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/7d098aab-1968-4605-a9a7-b1627941c1ff";
+    device = "/dev/disk/by-uuid/7d098aab-1968-4605-a9a7-b1627941c1ff";
     fsType = "ext4";
   };
 
-  fileSystems."/boot/efi" =
+  fileSystems."/boot/efi" = {
-    { device = "/dev/disk/by-uuid/C356-B67C";
+    device = "/dev/disk/by-uuid/C356-B67C";
     fsType = "vfat";
   };
 
-  fileSystems."/hdd" = 
+  fileSystems."/hdd" = {
-    { device = "/dev/disk/by-uuid/e2e4c4f3-51df-4020-b557-a7cf684de85b";
+    device = "/dev/disk/by-uuid/e2e4c4f3-51df-4020-b557-a7cf684de85b";
     fsType = "ext4";
   };
 
-  fileSystems."/ssd" = 
+  fileSystems."/ssd" = {
-    { device = "/dev/disk/by-uuid/9e5a189d-7435-45d7-aef6-cdee4de2428d";
+    device = "/dev/disk/by-uuid/9e5a189d-7435-45d7-aef6-cdee4de2428d";
     fsType = "ext4";
   };
-  fileSystems."/nas" =
+  fileSystems."/nas" = {
-    { device = "192.168.1.71:/volume1/tsuki";
+    device = "192.168.1.71:/volume1/tsuki";
     fsType = "nfs";
   };
 
-  swapDevices =
+  swapDevices = [
-    [ { device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc"; }
+    {device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc";}
   ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/tsuki/home.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
-
   imports = [
     ../../home
     ../../home/librewolf

modules/default.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   imports = [
     ./security.nix
     ./networking.nix

modules/fonts.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
-  
   fonts = {
     enableDefaultFonts = false;
     fontDir.enable = true;
@@ -29,7 +25,6 @@
       };
 
       hinting.style = "hintfull";
-    
     };
   };
 }

modules/greetd.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   services.greetd = {
     enable = true;
     settings = rec {
@@ -12,5 +10,3 @@
     };
   };
 }
-
-

modules/networking.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   networking = {
     networkmanager.enable = true;
     nameservers = ["1.1.1.1"];

modules/nix.nix

@@ -1,8 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
-
   nixpkgs = {
     config = {
       allowUnfree = true;

modules/security.nix

@@ -48,4 +48,3 @@
     defaults.email = "github@notohh.dev";
   };
 }
-

modules/swayidle.nix

@@ -1,6 +1,4 @@
-{
+{...}: {
-  ...
-}: {
   home.file.".local/bin/lock" = {
     executable = true;
     text = ''

modules/system.nix

@@ -1,7 +1,4 @@
-{
+{...}: {
-  ...
-}: {
-
   documentation = {
     enable = true;
     doc.enable = false;
@@ -36,5 +33,4 @@
 
   system.autoUpgrade.enable = false;
   system.stateVersion = "23.05"; # no touchy
-  
 }

pkgs/chatterino7/default.nix

@@ -22,10 +22,12 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     make
   '';
-   installPhase = ''
+  installPhase =
+    ''
       mkdir -p "$out/bin"
       mv "bin/chatterino" "$out/bin"
-  '' + ''
+    ''
+    + ''
       mkdir -p $out/share/icons/hicolor/256x256/apps
       cp $src/resources/icon.png $out/share/icons/hicolor/256x256/apps/chatterino.png
     '';