Began aggresively formatting project

devenv.nix

@@ -1,6 +1,7 @@
 {pkgs, ...}: {
   pre-commit.hooks = {
     alejandra.enable = true;
+    deadnix.enable = true;
   };
 
   packages = with pkgs; [nixpkgs-fmt nixfmt];

flake.nix

@@ -1,6 +1,6 @@
 {
   description = "NixOS configuration of Thomas Syms";
-  nixConfig = { experimental-features = [ "nix-command" "flakes" ]; };
+  nixConfig = {experimental-features = ["nix-command" "flakes"];};
   inputs = {
     # System
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -18,73 +18,80 @@
     # Theming
     stylix.url = "github:danth/stylix";
   };
-  outputs = inputs@{ self, nixpkgs, stylix, home-manager, ... }:
+  outputs = inputs @ {
-    let
+    nixpkgs,
-      system = "x86_64-linux";
+    stylix,
-      pkgs = nixpkgs.legacyPackages.${system};
+    home-manager,
-    in
+    ...
-    {
+  }: let
-      nixosConfigurations = {
+    system = "x86_64-linux";
-        Equinox = nixpkgs.lib.nixosSystem {
+    pkgs = nixpkgs.legacyPackages.${system};
-          system = "x86_64-linux";
+  in {
-          specialArgs = { inherit inputs; inherit system; };
+    nixosConfigurations = {
-          modules = [
+      Equinox = nixpkgs.lib.nixosSystem {
-            # Theme
+        system = "x86_64-linux";
-            stylix.nixosModules.stylix
+        specialArgs = {
-            ./themes/targets/all.nix
+          inherit inputs;
-            ./themes/sandstone-forest
+          inherit system;
-
-            ./hosts/Equinox
-            home-manager.nixosModules.home-manager
-            {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.extraSpecialArgs =
-                {
-                  inherit inputs;
-                  inherit system;
-                };
-
-              home-manager.users.panotaka = {
-                imports = [ ./home ./home/shell ./home/desktop ];
-              };
-            }
-          ];
         };
+        modules = [
+          # Theme
+          stylix.nixosModules.stylix
+          ./themes/targets/all.nix
+          ./themes/sandstone-forest
 
-        Blackbird = nixpkgs.lib.nixosSystem {
+          ./hosts/Equinox
-          system = "x86_64-linux";
+          home-manager.nixosModules.home-manager
-          specialArgs = { inherit inputs; inherit system; };
+          {
-          modules = [
+            home-manager.useGlobalPkgs = true;
-            ./hosts/Blackbird
+            home-manager.useUserPackages = true;
-            home-manager.nixosModules.home-manager
+            home-manager.extraSpecialArgs = {
-            {
+              inherit inputs;
-              home-manager.useGlobalPkgs = true;
+              inherit system;
-              home-manager.useUserPackages = true;
+            };
-              home-manager.extraSpecialArgs =
-                {
-                  inherit inputs;
-                  inherit system;
-                };
 
-              home-manager.users.panotaka = {
+            home-manager.users.panotaka = {
-                imports = [ ./home ./home/shell ./home/desktop ];
+              imports = [./home ./home/shell ./home/desktop];
-              };
+            };
-            }
+          }
-            stylix.nixosModules.stylix
+        ];
-            ./themes/targets/all.nix
-            ./themes/spaceduck
-          ];
-        };
       };
 
-      homeConfigurations.panotaka = home-manager.lib.homeManagerConfiguration {
+      Blackbird = nixpkgs.lib.nixosSystem {
-        inherit pkgs;
+        system = "x86_64-linux";
-
+        specialArgs = {
+          inherit inputs;
+          inherit system;
+        };
         modules = [
-          ./home
+          ./hosts/Blackbird
-          ./home/shell
+          home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.extraSpecialArgs = {
+              inherit inputs;
+              inherit system;
+            };
+
+            home-manager.users.panotaka = {
+              imports = [./home ./home/shell ./home/desktop];
+            };
+          }
+          stylix.nixosModules.stylix
+          ./themes/targets/all.nix
+          ./themes/spaceduck
         ];
       };
     };
+
+    homeConfigurations.panotaka = home-manager.lib.homeManagerConfiguration {
+      inherit pkgs;
+
+      modules = [
+        ./home
+        ./home/shell
+      ];
+    };
+  };
 }

home/default.nix

@@ -1,6 +1,4 @@
-{ config, pkgs, ... }:
+{...}: {
-
-{
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
   home = {

home/desktop/browsers.nix

@@ -1,17 +1,14 @@
-{ pkgs
+{pkgs, ...}: {
-, config
-, ...
-}: {
   programs = {
     chromium = {
       enable = true;
       package = pkgs.ungoogled-chromium;
-      commandLineArgs = [ "--enable-features=TouchpadOverscrollHistoryNavigation" ];
+      commandLineArgs = ["--enable-features=TouchpadOverscrollHistoryNavigation"];
     };
 
     firefox = {
       enable = true;
-      profiles.panotaka = { };
+      profiles.panotaka = {};
     };
   };
 }

home/desktop/common.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     # Work-specific programs
     teams-for-linux

home/desktop/default.nix

@@ -1,9 +1,4 @@
-{ inputs
+{...}: {
-, system
-, config
-, pkgs
-, ...
-}: {
   imports = [
     ./common.nix
     ./browsers.nix

home/desktop/kde/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{pkgs, ...}: {
   home.packages = with pkgs; [
     # KDE specific packages
     filelight

home/desktop/vscode/default.nix

@@ -1,68 +1,62 @@
-{ inputs
-, system
-, config
-, pkgs
-, home-manager
-, ...
-}:
-
 {
+  inputs,
+  system,
+  pkgs,
+  ...
+}: {
   imports = [
     ./nix.nix
   ];
 
-
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
-    extensions = with inputs.nix-vscode-extensions.extensions.${system};
+    extensions = with inputs.nix-vscode-extensions.extensions.${system}; [
-      [
+      # General extensions
-        # General extensions
 
-        ## Code Completion
+      ## Code Completion
-        vscode-marketplace.github.copilot
+      vscode-marketplace.github.copilot
-        vscode-marketplace.github.copilot-chat
+      vscode-marketplace.github.copilot-chat
 
-        ## Error Checking
+      ## Error Checking
-        vscode-marketplace.usernamehw.errorlens
+      vscode-marketplace.usernamehw.errorlens
 
-        ## Export and Visualisation
+      ## Export and Visualisation
-        vscode-marketplace.ibm.output-colorizer
+      vscode-marketplace.ibm.output-colorizer
-        vscode-marketplace.nobuhito.printcode
+      vscode-marketplace.nobuhito.printcode
-        vscode-marketplace.pnp.polacode
+      vscode-marketplace.pnp.polacode
 
-        ## Git
+      ## Git
-        vscode-marketplace.lamartire.git-indicators
+      vscode-marketplace.lamartire.git-indicators
-        vscode-marketplace.mhutchie.git-graph
+      vscode-marketplace.mhutchie.git-graph
 
-        ## Miscelaneous
+      ## Miscelaneous
-        vscode-marketplace.britesnow.vscode-toggle-quotes
+      vscode-marketplace.britesnow.vscode-toggle-quotes
-        vscode-marketplace.mrmlnc.vscode-duplicate
+      vscode-marketplace.mrmlnc.vscode-duplicate
-        vscode-marketplace.qcz.text-power-tools
+      vscode-marketplace.qcz.text-power-tools
 
+      # Language extensions
 
-        # Language extensions
+      ## CSV
+      vscode-marketplace.mechatroner.rainbow-csv
 
-        ## CSV
+      ## JavaScript/TypeScript language extensions
-        vscode-marketplace.mechatroner.rainbow-csv
+      vscode-marketplace.christian-kohler.npm-intellisense
+      vscode-marketplace.esbenp.prettier-vscode
+      vscode-marketplace.johnpapa.vscode-peacock
+      vscode-marketplace.liamhammett.inline-parameters
+      vscode-marketplace.mgmcdermott.vscode-language-babel
+      vscode-marketplace.yatki.vscode-surround
 
-        ## JavaScript/TypeScript language extensions
+      ## Rust language extensions
-        vscode-marketplace.christian-kohler.npm-intellisense
+      vscode-marketplace.rust-lang.rust-analyzer
-        vscode-marketplace.esbenp.prettier-vscode
+      vscode-marketplace.serayuzgur.crates
-        vscode-marketplace.johnpapa.vscode-peacock
+      vscode-marketplace.tamasfe.even-better-toml
-        vscode-marketplace.liamhammett.inline-parameters
+      vscode-marketplace.vadimcn.vscode-lldb
-        vscode-marketplace.mgmcdermott.vscode-language-babel
-        vscode-marketplace.yatki.vscode-surround
 
-        ## Rust language extensions
+      ## SVG
-        vscode-marketplace.rust-lang.rust-analyzer
+      vscode-marketplace.dheovani.svg-viewer
-        vscode-marketplace.serayuzgur.crates
+    ];
-        vscode-marketplace.tamasfe.even-better-toml
-        vscode-marketplace.vadimcn.vscode-lldb
-
-        ## SVG
-        vscode-marketplace.dheovani.svg-viewer
-      ];
     userSettings = {
       "editor.linkedEditing" = true;
       "window.menuBarVisibility" = "toggle";

home/desktop/vscode/nix.nix

@@ -1,9 +1,7 @@
 {
   inputs,
   system,
-  config,
   pkgs,
-  home-manager,
   ...
 }: {
   home.packages = with pkgs; [

home/shell/atuin.nix

@@ -1,6 +1,6 @@
 {
   programs.atuin = {
     enable = true;
-    flags = [ "--disable-up-arrow" ];
+    flags = ["--disable-up-arrow"];
   };
 }

home/shell/btop.nix

@@ -1,7 +1,4 @@
-{ config
+{...}: {
-, ...
-}:
-{
   programs.btop = {
     enable = true;
   };

home/shell/common.nix

@@ -1,7 +1,4 @@
-{ pkgs
+{pkgs, ...}: {
-, ...
-}:
-{
   home.shellAliases = {
     sudo = "sudo --preserve-env=PATH";
   };

home/shell/default.nix

@@ -1,5 +1,4 @@
-{ config, ... }:
+{...}: {
-{
   imports = [
     ./atuin.nix
     ./autojump.nix
@@ -18,5 +17,4 @@
     ./zoxide.nix
     ./zsh
   ];
-
 }

home/shell/eza.nix

@@ -1,7 +1,4 @@
-{ config
+{...}: {
-, ...
-}:
-{
   programs.eza = {
     enable = true;
     enableAliases = true;

home/shell/fish/default.nix

@@ -1,13 +1,8 @@
-{ config
+{pkgs, ...}: {
-, pkgs
-, ...
-}:
-{
   home.packages = with pkgs; [
     grc
   ];
 
-
   programs.fish = {
     enable = true;
 
@@ -19,5 +14,4 @@
       }
     ];
   };
-
 }

home/shell/git.nix

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

home/shell/htop.nix

@@ -1,7 +1,4 @@
-{ config
+{...}: {
-, ...
-}:
-{
   programs.htop = {
     enable = true;
   };

home/shell/rmtrash.nix

@@ -1,8 +1,4 @@
-{ config
+{pkgs, ...}: {
-, pkgs
-, ...
-}:
-{
   home.packages = with pkgs; [
     rmtrash
   ];

home/shell/starship.nix

@@ -1,5 +1,4 @@
-{ config, lib, ... }: {
+{...}: {
-
   programs.starship = {
     enable = true;
     settings = {
@@ -277,7 +276,6 @@
       zig = {
         symbol = "zig ";
       };
-
     };
   };
 }

home/shell/zoxide.nix

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

home/shell/zsh/default.nix

@@ -1,28 +1,22 @@
-{ config
+{lib, ...}: {
-, lib
-, ...
-}:
-{
   programs.zsh = lib.mkForce {
     enable = true;
 
     oh-my-zsh = {
       enable = true;
-      plugins = [ "grc" "git" ];
+      plugins = ["grc" "git"];
     };
 
     zplug = {
       enable = true;
       plugins = [
-        { name = "zsh-users/zsh-autosuggestions"; }
+        {name = "zsh-users/zsh-autosuggestions";}
         {
           name = "zsh-users/zsh-syntax-highlighting";
         }
         #{ name = "marlonrichert/zsh-autocomplete"; }
-        { name = "hlissner/zsh-autopair"; }
+        {name = "hlissner/zsh-autopair";}
-
       ];
     };
-
   };
 }

hosts/Blackbird/default.nix

@@ -1,43 +1,38 @@
-{ config, pkgs, inputs, lib, ... }:
-
-let
-  hostname = "Blackbird";
-in
 {
-
+  inputs,
-
+  lib,
+  ...
+}: let
+  hostname = "Blackbird";
+in {
   # System version
   system.stateVersion = "23.11";
 
-
   imports = [
     # Import hardware configuration
     inputs.nixos-hardware.nixosModules.gpd-pocket-3
     inputs.disko.nixosModules.disko
     ./disko.nix
 
-
     # Import system configuration
     ../../modules/system.nix
     ../../modules/harden.nix
     ../../modules/kde.nix
   ];
 
-
   # Set networking
   hardware.enableRedistributableFirmware = true;
   networking.hostName = hostname;
   networking.networkmanager.enable = true;
   networking.useDHCP = lib.mkDefault true;
 
-
   # Bootloader configuration
   boot = {
-    kernelModules = [ "kvm-intel" ];
+    kernelModules = ["kvm-intel"];
-    extraModulePackages = [ ];
+    extraModulePackages = [];
 
     initrd = {
-      kernelModules = [ ];
+      kernelModules = [];
       availableKernelModules = [
         "xhci_pci"
         "thunderbolt"
@@ -57,7 +52,6 @@ in
     };
   };
 
-
   # Setup Audio
   sound.enable = true;
   hardware.pulseaudio.enable = false;
@@ -69,8 +63,6 @@ in
     pulse.enable = true;
   };
 
-
   # Setup bluetooth
   hardware.bluetooth.enable = true;
-
 }

hosts/Blackbird/disko.nix

@@ -29,19 +29,19 @@
                 };
                 content = {
                   type = "btrfs";
-                  extraArgs = [ "-f" ];
+                  extraArgs = ["-f"];
                   subvolumes = {
                     "/root" = {
                       mountpoint = "/";
-                      mountOptions = [ "compress=zstd" "noatime" ];
+                      mountOptions = ["compress=zstd" "noatime"];
                     };
                     "/home" = {
                       mountpoint = "/home";
-                      mountOptions = [ "compress=zstd" "noatime" ];
+                      mountOptions = ["compress=zstd" "noatime"];
                     };
                     "/nix" = {
                       mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" "noatime" ];
+                      mountOptions = ["compress=zstd" "noatime"];
                     };
                     "/swap" = {
                       mountpoint = "/.swapvol";

hosts/Equinox/default.nix

@@ -1,15 +1,13 @@
-{ config, pkgs, inputs, lib, ... }:
-
-let
-  hostname = "Equinox";
-in
 {
-
+  inputs,
-
+  lib,
+  ...
+}: let
+  hostname = "Equinox";
+in {
   # System version
   system.stateVersion = "23.11";
 
-
   imports = [
     # Import hardware configuration
     inputs.nixos-hardware.nixosModules.dell-xps-15-9510
@@ -17,28 +15,25 @@ in
     inputs.disko.nixosModules.disko
     ./disko.nix
 
-
     # Import system configuration
     ../../modules/system.nix
     ../../modules/harden.nix
     ../../modules/kde.nix
   ];
 
-
   # Set networking
   hardware.enableRedistributableFirmware = true;
   networking.hostName = hostname;
   networking.networkmanager.enable = true;
   networking.useDHCP = lib.mkDefault true;
 
-
   # Bootloader configuration
   boot = {
-    kernelModules = [ "kvm-intel" ];
+    kernelModules = ["kvm-intel"];
-    extraModulePackages = [ ];
+    extraModulePackages = [];
 
     initrd = {
-      kernelModules = [ ];
+      kernelModules = [];
       availableKernelModules = [
         "xhci_pci"
         "thunderbolt"
@@ -58,7 +53,6 @@ in
     };
   };
 
-
   # Setup Audio
   sound.enable = true;
   hardware.pulseaudio.enable = false;
@@ -70,8 +64,6 @@ in
     pulse.enable = true;
   };
 
-
   # Setup bluetooth
   hardware.bluetooth.enable = true;
-
 }

hosts/Equinox/disko.nix

@@ -29,19 +29,19 @@
                 };
                 content = {
                   type = "btrfs";
-                  extraArgs = [ "-f" ];
+                  extraArgs = ["-f"];
                   subvolumes = {
                     "/root" = {
                       mountpoint = "/";
-                      mountOptions = [ "compress=zstd" "noatime" ];
+                      mountOptions = ["compress=zstd" "noatime"];
                     };
                     "/home" = {
                       mountpoint = "/home";
-                      mountOptions = [ "compress=zstd" "noatime" ];
+                      mountOptions = ["compress=zstd" "noatime"];
                     };
                     "/nix" = {
                       mountpoint = "/nix";
-                      mountOptions = [ "compress=zstd" "noatime" ];
+                      mountOptions = ["compress=zstd" "noatime"];
                     };
                     "/swap" = {
                       mountpoint = "/.swapvol";

modules/harden.nix

@@ -19,5 +19,5 @@
       enable = true;
     };
   };
-  nix.settings.allowed-users = [ "root" "@users" ];
+  nix.settings.allowed-users = ["root" "@users"];
 }

modules/i3.nix

@@ -1,10 +1,6 @@
-{ pkgs, ... }:
+{pkgs, ...}: {
-
-
-{
-
   # i3 related options
-  environment.pathsToLink = [ "/libexec" ]; # links /libexec from derivations to /run/current-system/sw
+  environment.pathsToLink = ["/libexec"]; # links /libexec from derivations to /run/current-system/sw
   services.xserver = {
     enable = true;
 

modules/kde.nix

@@ -1,5 +1,4 @@
-{ pkgs, ... }:
+{...}: {
-{
   services.xserver.enable = true;
   services.xserver.displayManager.sddm.enable = true;
   services.xserver.displayManager.defaultSession = "plasmawayland";

modules/system.nix

@@ -1,7 +1,9 @@
-{ config, pkgs, ... }:
-
 {
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  config,
+  pkgs,
+  ...
+}: {
+  nix.settings.experimental-features = ["nix-command" "flakes"];
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
@@ -31,7 +33,7 @@
   users.users.panotaka = {
     isNormalUser = true;
     description = "panotaka";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = ["networkmanager" "wheel"];
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
     ];

themes/sandstone-forest/default.nix

@@ -1,6 +1,9 @@
-{ system, inputs, config, pkgs, ... }:
-
 {
+  system,
+  inputs,
+  pkgs,
+  ...
+}: {
   stylix.image = ./wallpaper.jpg;
 
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
@@ -32,7 +35,7 @@
     };
 
     monospace = {
-      package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
+      package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
       name = "JetBrainsMono Nerd Font";
     };
 

themes/spaceduck/default.nix

@@ -1,6 +1,4 @@
-{ config, pkgs, ... }:
+{pkgs, ...}: {
-
-{
   stylix.image = ./DotGrid.svg;
 
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/spaceduck.yaml";
@@ -17,7 +15,7 @@
     };
 
     monospace = {
-      package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
+      package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
       name = "JetBrainsMono Nerd Font";
     };