From 6ca9dde866a27d4e0343a28a8cbc1d8b4ba1fb10 Mon Sep 17 00:00:00 2001
From: Tim Schubert <dadada@dadada.li>
Date: Sat, 17 May 2025 12:49:05 +0200
Subject: [PATCH] chore: update nixpkgs

---
 flake.lock               |  51 ++++++------------
 flake.nix                |   5 +-
 nixos/configurations.nix | 110 +++++++++++++++++++++++----------------
 outputs.nix              |  29 +++++------
 4 files changed, 97 insertions(+), 98 deletions(-)

diff --git a/flake.lock b/flake.lock
index f95384d..e980db7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -277,38 +277,6 @@
       }
     },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1747418223,
-        "narHash": "sha256-DkCYFm09AR2+FPKcT7lD8iIMNXqTdesVvwKpCnqKiYg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d6c9326e40bb557ebb8c040b4375590bc06413f8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-full": {
-      "locked": {
-        "lastModified": 1747335874,
-        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1747327360,
         "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
@@ -324,6 +292,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-small": {
+      "locked": {
+        "lastModified": 1747452614,
+        "narHash": "sha256-hSEz6JHZTJJTeIudt0SK3UoZnfThHwKCUGvSe5/zn8g=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e067fb89ac3e59f993f257c799318132f1492f01",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -336,8 +320,7 @@
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-full": "nixpkgs-full",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs-small": "nixpkgs-small",
         "systems": "systems_2",
         "treefmt-nix": "treefmt-nix"
       }
diff --git a/flake.nix b/flake.nix
index 021bc7a..ec49fa2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,9 +2,8 @@
   description = "dadada's nix flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
-    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-full.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     flake-utils = {
       url = "github:numtide/flake-utils";
       inputs.systems.follows = "systems";
diff --git a/nixos/configurations.nix b/nixos/configurations.nix
index 48d70cd..497a7bf 100644
--- a/nixos/configurations.nix
+++ b/nixos/configurations.nix
@@ -1,32 +1,42 @@
-{ self
-, agenix
-, lix-module
-, nixpkgs
-, nixpkgs-full
-, home-manager
-, homepage
-, nixos-hardware
-, nixos-generators
-, nixpkgs-unstable
-, ...
+{
+  self,
+  agenix,
+  home-manager,
+  homepage,
+  lix-module,
+  nixos-hardware,
+  nixos-generators,
+  nixpkgs,
+  nixpkgs-small,
+  ...
 }@inputs:
 let
   lixModule = lix-module.nixosModules.default;
 
-  nixosSystem = { n_nixpkgs ? nixpkgs, system ? "x86_64-linux", extraModules ? [ ] }: n_nixpkgs.lib.nixosSystem {
-    inherit system;
+  nixosSystem =
+    {
+      nixpkgs,
+      system ? "x86_64-linux",
+      extraModules ? [ ],
+    }:
+    nixpkgs.lib.nixosSystem {
+      inherit system;
 
-    modules = [
-      lixModule
-      {
-        nixpkgs.overlays = n_nixpkgs.lib.attrValues self.overlays;
-      }
-    ] ++ (n_nixpkgs.lib.attrValues self.nixosModules) ++ [ agenix.nixosModules.age ] ++ extraModules;
-  };
+      modules =
+        [
+          lixModule
+          {
+            nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
+          }
+        ]
+        ++ (nixpkgs.lib.attrValues self.nixosModules)
+        ++ [ agenix.nixosModules.age ]
+        ++ extraModules;
+    };
 in
 {
   gorgon = nixosSystem rec {
-    n_nixpkgs = nixpkgs-unstable;
+    nixpkgs = nixpkgs;
 
     system = "x86_64-linux";
 
@@ -34,13 +44,16 @@ in
       {
         nixpkgs.overlays = nixpkgs.lib.attrValues self.overlays;
         dadada.pkgs = self.packages.${system};
-        dadada.inputs = inputs // { dadada = self; };
+        dadada.inputs = inputs // {
+          dadada = self;
+        };
       }
 
       nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
 
       home-manager.nixosModules.home-manager
-      ({ pkgs, lib, ... }:
+      (
+        { pkgs, lib, ... }:
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
@@ -49,12 +62,14 @@ in
             { manual.manpages.enable = false; }
           ];
           home-manager.users.dadada = import ../home;
-        })
+        }
+      )
       ./gorgon/configuration.nix
     ];
   };
 
   surgat = nixosSystem {
+    nixpkgs = nixpkgs-small;
     system = "x86_64-linux";
     extraModules = [
       {
@@ -66,34 +81,39 @@ in
   };
 
   agares = nixosSystem {
+    nixpkgs = nixpkgs-small;
     extraModules = [
       ./agares/configuration.nix
     ];
   };
 
-  installer = nixpkgs.lib.nixosSystem {
-    system = "x86_64-linux";
-    modules = [
-      lixModule
-      nixos-generators.nixosModules.install-iso
-      self.nixosModules.admin
-      {
-        isoImage.isoName = nixpkgs.lib.mkForce "dadada-nixos-installer.iso";
-        networking.tempAddresses = "disabled";
-        dadada.admin.enable = true;
-        documentation.enable = true;
-        documentation.nixos.enable = true;
-        i18n.defaultLocale = "en_US.UTF-8";
-        console = {
-          font = "Lat2-Terminus16";
-          keyMap = "us";
-        };
-      }
-    ];
-  };
+  installer =
+    let
+      nixpkgs = nixpkgs-small;
+    in
+    nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        lixModule
+        nixos-generators.nixosModules.install-iso
+        self.nixosModules.admin
+        {
+          isoImage.isoName = nixpkgs.lib.mkForce "dadada-nixos-installer.iso";
+          networking.tempAddresses = "disabled";
+          dadada.admin.enable = true;
+          documentation.enable = true;
+          documentation.nixos.enable = true;
+          i18n.defaultLocale = "en_US.UTF-8";
+          console = {
+            font = "Lat2-Terminus16";
+            keyMap = "us";
+          };
+        }
+      ];
+    };
 
   ninurta = nixosSystem {
-    n_nixpkgs = nixpkgs-full;
+    nixpkgs = nixpkgs-small;
     extraModules = [
       ./ninurta/configuration.nix
     ];
diff --git a/outputs.nix b/outputs.nix
index efa3dab..d588f6e 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,18 +1,14 @@
 # Adapted from Mic92/dotfiles
-{ self
-, flake-utils
-, flake-registry
-, homepage
-, lix-module
-, nixpkgs
-, home-manager
-, nixos-hardware
-, nixpkgs-full
-, agenix
-, devshell
-, ...
-} @ inputs:
-(flake-utils.lib.eachDefaultSystem (system:
+{
+  self,
+  flake-utils,
+  nixpkgs,
+  agenix,
+  devshell,
+  ...
+}@inputs:
+(flake-utils.lib.eachDefaultSystem (
+  system:
   let
     pkgs = import nixpkgs { inherit system; };
   in
@@ -35,8 +31,9 @@
     packages = import ./pkgs { inherit pkgs; } // {
       installer-iso = self.nixosConfigurations.installer.config.system.build.isoImage;
     };
-  }))
-  // {
+  }
+))
+// {
 
   hmModules = import ./home/modules.nix { lib = nixpkgs.lib; };