chore: clean up nixos configurations

Consolidate nixpkgs instances into once for all x86 systems

flake.lock

@@ -325,22 +325,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-small": {
-      "locked": {
-        "lastModified": 1753505055,
-        "narHash": "sha256-jQKnNATDGDeuIeUf7r0yHnmirfYkYPHeF0N2Lv8rjPE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7be0239edbf0783ff959f94f9728db414be73002",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1730741070,
@@ -397,7 +381,6 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-small": "nixpkgs-small",
         "systems": "systems_2",
         "treefmt-nix": "treefmt-nix"
       }

flake.nix

@@ -2,7 +2,6 @@
   description = "dadada's nix flake";
 
   inputs = {
-    nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     disko = {
       url = "github:nix-community/disko";

home/nixpkgs-config.nix

@@ -1,7 +0,0 @@
-{ pkgs }:
-{
-  allowUnfree = true;
-  allowUnfreePredicate = pkg: true;
-  allowBroken = false;
-  android_sdk.accept_license = true;
-}

home/pkgs.nix

@@ -125,7 +125,6 @@ with pkgs;
   spotify
   sqlite
   sshfs-fuse
-  steam
   taplo
   tcpdump
   tdesktop

hydra-jobs.nix

@@ -1,4 +0,0 @@
-{ self, nixpkgs, ... }:
-(nixpkgs.lib.mapAttrs' (
-  name: config: nixpkgs.lib.nameValuePair name config.config.system.build.toplevel
-) self.nixosConfigurations)

nixos/configurations.nix

@@ -8,127 +8,92 @@
   nixos-hardware,
   nixos-generators,
   nixpkgs,
-  nixpkgs-small,
   ...
 }@inputs:
 let
-  nixosSystem =
+  # create a new instance allowing some unfree packages
-    {
+  nixpkgsx86 = import nixpkgs {
-      nixpkgs,
-      system ? "x86_64-linux",
-      extraModules ? [ ],
-    }:
-    nixpkgs.lib.nixosSystem {
-      inherit system;
-
-      modules = [
-        {
-          nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
-        }
-      ]
-      ++ (nixpkgs.lib.attrValues self.nixosModules)
-      ++ [ agenix.nixosModules.age ]
-      ++ extraModules;
-    };
-in
-{
-  stolas =
-    let
     system = "x86_64-linux";
-    in
+    config.allowUnfreePredicate =
-    nixosSystem {
+      pkg:
-      inherit nixpkgs system;
+      builtins.elem (nixpkgs.lib.getName pkg) [
-
+        "aspell-dict-en-science"
-      extraModules = [
+        "brgenml1lpr"
-        lanzaboote.nixosModules.lanzaboote
+        "saleae-logic-2"
-        disko.nixosModules.disko
+        "spotify"
-        {
+      ];
-          nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
-          dadada.pkgs = self.packages.${system};
-          dadada.inputs = inputs // {
-            dadada = self;
   };
-        }
+  nixosSystem = nixpkgs.lib.nixosSystem;
-        nixos-hardware.nixosModules.framework-amd-ai-300-series
+  baseModule =
-        home-manager.nixosModules.home-manager
+    { lib, ... }:
+    {
+      _module.args.inputs = inputs;
+      imports = [
+        inputs.agenix.nixosModules.age
+        inputs.disko.nixosModules.disko
+        inputs.home-manager.nixosModules.home-manager
         (
           { pkgs, ... }:
           {
-            home-manager.useGlobalPkgs = true;
+            dadada.homepage.package = homepage;
-            home-manager.useUserPackages = true;
+            dadada.pkgs = inputs.self.packages.${pkgs.system};
-            home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [
+            dadada.inputs = inputs // {
-              { dadada.home.helix.package = pkgs.helix; }
+              dadada = inputs.self;
-            ];
+            };
-            home-manager.users.dadada = import ../home;
           }
         )
+        inputs.lanzaboote.nixosModules.lanzaboote
+      ]
+      ++ (lib.attrValues inputs.self.nixosModules);
+    };
+  homeModule = ./modules/profiles/home.nix;
+in
+{
+  stolas = nixosSystem {
+    modules = [
+      { nixpkgs.pkgs = nixpkgsx86; }
+      baseModule
+      nixos-hardware.nixosModules.framework-amd-ai-300-series
+      homeModule
       ./stolas
     ];
   };
 
-  gorgon =
+  gorgon = nixosSystem {
-    let
+    modules = [
-      system = "x86_64-linux";
+      { nixpkgs.pkgs = nixpkgsx86; }
-    in
+      baseModule
-    nixosSystem {
-      inherit nixpkgs system;
-
-      extraModules = [
-        {
-          nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
-          dadada.pkgs = self.packages.${system};
-          dadada.inputs = inputs // {
-            dadada = self;
-          };
-        }
       nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
-        home-manager.nixosModules.home-manager
+      homeModule
-        (
-          { pkgs, ... }:
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules) ++ [
-              { dadada.home.helix.package = pkgs.helix; }
-              { manual.manpages.enable = false; }
-            ];
-            home-manager.users.dadada = import ../home;
-          }
-        )
       ./gorgon/configuration.nix
     ];
   };
 
   surgat = nixosSystem {
-    nixpkgs = nixpkgs-small;
+    modules = [
-    system = "x86_64-linux";
+      { nixpkgs.pkgs = nixpkgsx86; }
-    extraModules = [
+      baseModule
-      {
-        dadada.homepage.package = homepage;
-      }
-      ./modules/profiles/server.nix
       ./surgat/configuration.nix
     ];
   };
 
   agares = nixosSystem {
-    nixpkgs = nixpkgs-small;
+    modules = [
-    extraModules = [
+      { nixpkgs.pkgs = nixpkgsx86; }
+      baseModule
       ./agares/configuration.nix
     ];
   };
 
-  installer =
+  installer = nixosSystem {
-    let
-      nixpkgs = nixpkgs-small;
-    in
-    nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
     modules = [
       nixos-generators.nixosModules.install-iso
-        self.nixosModules.admin
+      inputs.self.nixosModules.admin
+      (
+        { lib, ... }:
         {
-          isoImage.isoName = nixpkgs.lib.mkForce "dadada-nixos-installer.iso";
+          nixpkgs.pkgs = nixpkgs.legacyPackages."x86_64-linux";
+          isoImage.isoName = lib.mkForce "dadada-nixos-installer.iso";
           networking.tempAddresses = "disabled";
           dadada.admin.enable = true;
           documentation.enable = true;
@@ -139,12 +104,14 @@ in
             keyMap = "us";
           };
         }
+      )
     ];
   };
 
   ninurta = nixosSystem {
-    nixpkgs = nixpkgs-small;
+    modules = [
-    extraModules = [
+      { nixpkgs.pkgs = nixpkgsx86; }
+      baseModule
       ./ninurta/configuration.nix
     ];
   };

nixos/gorgon/configuration.nix

@@ -52,8 +52,6 @@ in
   age.secrets."${config.networking.hostName}-backup-passphrase-gs".file =
     "${secretsPath}/${config.networking.hostName}-backup-passphrase-gs.age";
 
-  nixpkgs.config.android_sdk.accept_license = true;
-
   programs.ssh.startAgent = true;
 
   nix.extraOptions = ''
@@ -85,7 +83,7 @@ in
   networking.hostName = "gorgon";
 
   dadada = {
-    steam.enable = true;
+    steam.enable = false;
     yubikey.enable = true;
   };
 
@@ -154,7 +152,6 @@ in
   #];
 
   environment.systemPackages = with pkgs; [
-    android-studio
     ghostscript
     smartmontools
 

nixos/modules/nixpkgs.nix

@@ -1,3 +0,0 @@
-{
-  nixpkgs.config.allowUnfreePredicate = pkg: true;
-}

nixos/modules/profiles/cloud.nix

@@ -4,6 +4,10 @@ let
   initrdHostKey = "${config.networking.hostName}-ssh_host_ed25519_key";
 in
 {
+  imports = [
+    ./server.nix
+  ];
+
   boot.initrd.availableKernelModules = [ "virtio-pci" ];
 
   boot.kernelParams = [

nixos/modules/profiles/home.nix

@@ -0,0 +1,7 @@
+{ pkgs, inputs, ... }:
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.sharedModules = pkgs.lib.attrValues inputs.self.hmModules;
+  home-manager.users.dadada = inputs.self.hmConfigurations.dadada;
+}

nixos/stolas/default.nix

@@ -12,11 +12,6 @@
     ./paperless.nix
   ];
 
-  nixpkgs = {
-    hostPlatform = "x86_64-linux";
-    config.allowUnfree = true;
-  };
-
   boot = {
     lanzaboote = {
       enable = true;
@@ -58,7 +53,7 @@
     # NOTE: hardware.framework.enableKmod requires kernel patching, but enables access to some EC features
     bluetooth.enable = true;
     cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    enableAllFirmware = true;
+    enableRedistributableFirmware = true;
     framework.laptop13.audioEnhancement.enable = true;
     graphics = {
       enable = true;

outputs.nix

@@ -1,4 +1,3 @@
-# Adapted from Mic92/dotfiles
 {
   self,
   flake-utils,
@@ -11,7 +10,7 @@
 (flake-utils.lib.eachDefaultSystem (
   system:
   let
-    pkgs = import nixpkgs { inherit system; };
+    pkgs = nixpkgs.legacyPackages.${system};
     treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
   in
   {
@@ -31,20 +30,16 @@
     formatter = treefmtEval.config.build.wrapper;
 
     packages = import ./pkgs { inherit pkgs; } // {
-      installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage;
+      installer-iso = inputs.self.nixosConfigurations.installer.config.system.build.isoImage;
     };
   }
 ))
 // {
-  hmModules = import ./home/modules.nix { lib = nixpkgs.lib; };
-
-  nixosConfigurations = import ./nixos/configurations.nix inputs;
-
-  nixosModules = import ./nixos/modules { lib = nixpkgs.lib; };
-
-  overlays = import ./overlays.nix;
-
-  hydraJobs = import ./hydra-jobs.nix inputs;
-
   checks = import ./checks.nix inputs;
+  hmModules = import ./home/modules.nix { lib = nixpkgs.lib; };
+  hmConfigurations = {
+    dadada = import ./home;
+  };
+  nixosConfigurations = import ./nixos/configurations.nix inputs;
+  nixosModules = import ./nixos/modules { lib = nixpkgs.lib; };
 }

overlays.nix

@@ -1 +0,0 @@
-{ }