Refactor codebase

flake.nix

@@ -55,10 +55,12 @@
         {
           hephaestus = nixpkgs.lib.nixosSystem {
             specialArgs = {
-              inherit unstable;
+              inherit
-              inherit master;
+                unstable
-              inherit vpngate;
+                master
-              inherit inputs;
+                vpngate
+                inputs
+                ;
             };
             modules = [
               ./hosts/hephaestus.nix
@@ -90,6 +92,7 @@
                       };
                     };
 
+                    nixpkgs.config.allowUnfree = true;
                     nixpkgs.overlays = [ (import ./overlays) ];
 
                     home-manager = {
@@ -99,10 +102,7 @@
                         ./home.nix
                         inputs.nixvim.homeModules.nixvim
                       ];
-                      extraSpecialArgs = {
+                      extraSpecialArgs = { inherit unstable master; };
-                        inherit unstable;
-                        inherit master;
-                      };
                     };
                   };
                 }
@@ -126,10 +126,7 @@
         {
           zelus = darwin.lib.darwinSystem {
             inherit system;
-            specialArgs = {
+            specialArgs = { inherit unstable master; };
-              inherit unstable;
-              inherit master;
-            };
 
             modules = [
               home-manager.darwinModules.home-manager
@@ -139,6 +136,7 @@
                 { ... }:
                 {
                   config = {
+                    nixpkgs.config.allowUnfree = true;
                     nixpkgs.overlays = [ (import ./overlays) ];
                     home-manager = {
                       useGlobalPkgs = true;
@@ -147,10 +145,7 @@
                         ./home.nix
                         inputs.nixvim.homeModules.nixvim
                       ];
-                      extraSpecialArgs = {
+                      extraSpecialArgs = { inherit unstable master; };
-                        inherit unstable;
-                        inherit master;
-                      };
                     };
                   };
                 }

hosts/hephaestus.nix

@@ -64,20 +64,34 @@
   };
 
   environment.systemPackages = with pkgs; [
+    # desktop apps
     bitwarden-desktop
-    bleachbit
-    calibre
-    clamtk
-    cryptsetup
     dbeaver-bin
     discord
     freefilesync
     gimp-with-plugins
     google-chrome
-    hardinfo2
     httpie-desktop
+    onlyoffice-desktopeditors
+    pika-backup
+    pinta
+    qbittorrent
+    unstable.obsidian
+    unstable.podman-desktop
+    unstable.signal-desktop-bin
+    unstable.zoom-us
+
+    # gaming
     heroic
-    iputils
+    ludusavi
+    lutris
+    mupen64plus
+    protonup-qt
+    unstable.mcpelauncher-ui-qt
+    unstable.ryubing
+    wine
+
+    # kde
     kdePackages.bluedevil
     kdePackages.kcalc
     kdePackages.kcharselect
@@ -86,43 +100,44 @@
     kdePackages.ksystemlog
     kdePackages.partitionmanager
     kdePackages.sddm-kcm
+
+    # media
+    calibre
     libation
-    ludusavi
+    unstable.spotify
-    lutris
+    vlc
-    mupen64plus
+
+    # networking
+    iputils
+    traceroute
+    unstable.ktailctl
+    unstable.tailscale
+    vpngate.packages.x86_64-linux.default
+    whois
+
+    # security
+    bleachbit
+    clamtk
+    cryptsetup
+    opensnitch-ui
+    pinentry-curses
+
+    # system utilities
+    hardinfo2
     nfs-utils
+    pciutils
+    qemu
+    unrar
+    unstable.beszel
+    usbutils
+    virt-manager
+    wayland-utils
+    wl-clipboard
+
+    # development
     nodePackages.prettier
     nodePackages.yarn
     nodejs
-    onlyoffice-desktopeditors
-    opensnitch-ui
-    pciutils
-    pika-backup
-    pinentry-curses
-    pinta
-    protonup-qt
-    qbittorrent
-    qemu
-    traceroute
-    unrar
-    unstable.beszel
-    unstable.ktailctl
-    unstable.mcpelauncher-ui-qt
-    unstable.obsidian
-    unstable.podman-desktop
-    unstable.ryubing
-    unstable.signal-desktop-bin
-    unstable.spotify
-    unstable.tailscale
-    unstable.zoom-us
-    usbutils
-    virt-manager
-    vlc
-    vpngate.packages.x86_64-linux.default
-    wayland-utils
-    whois
-    wine
-    wl-clipboard
   ];
 
   fileSystems = {
@@ -167,12 +182,7 @@
     emoji = [ "Noto Color Emoji" ];
   };
 
-  nixpkgs = {
+  nixpkgs.hostPlatform = "x86_64-linux";
-    hostPlatform = "x86_64-linux";
-    config = {
-      allowUnfree = true;
-    };
-  };
 
   networking = {
     iproute2.enable = true;

hosts/zelus.nix

@@ -1,11 +1,5 @@
 { pkgs, ... }:
 {
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-    };
-  };
-
   networking = {
     hostName = "zelus";
   };