treewide: Align files with the same files in the `nixos-server` repo

This facilitates overlaying the two repos over each other.

1 files changed, 75 insertions, 76 deletions

diff --git a/inputs.nix b/inputs.nix
index abc7822e..132e4df2 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -1,7 +1,7 @@
 let
-  nixosVersion = "26.05";
+  nixosVersion = "26.11";
 
-  lanzabooteVersion = "v1.1.0";
+  lanzabooteVersion = "v1.2.0";
 
   w_nixpkgs = ref: {
     type = "github";
@@ -13,12 +13,20 @@ let
     type = "tarball";
     inherit url;
   };
+  w_github = owner: repo: {
+    type = "github";
+    inherit owner repo;
+  };
 
-  nixos_stable = "https://channels.nixos.org/nixos-${nixosVersion}/nixexprs.tar.zst";
-  nixos_unstable = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst";
+  nixos_stable = "https://channels.nixos.org/nixos-${nixosVersion}-small/nixexprs.tar.zst";
+  nixos_unstable = "https://channels.nixos.org/nixos-unstable-small/nixexprs.tar.zst";
 in {
   _unflake.dedupRules = [
     {
+      when = w_nixpkgs "nixos-unstable";
+      set = w_tarball nixos_unstable;
+    }
+    {
       when = w_nixpkgs "nixpkgs-unstable";
       set = w_tarball nixos_unstable;
     }
@@ -31,40 +39,63 @@ in {
       set = w_tarball nixos_stable;
     }
     {
+      when = w_nixpkgs "nixos-25.05-small";
+      set = w_tarball nixos_stable;
+    }
+    {
       when = w_nixpkgs "nixos-25.11";
       set = w_tarball nixos_stable;
     }
     {
+      when = w_nixpkgs "nixos-25.11-small";
+      set = w_tarball nixos_stable;
+    }
+    {
       when = w_nixpkgs "nixos-26.05";
       set = w_tarball nixos_stable;
     }
-
     {
-      when = {
-        type = "github";
-        owner = "nix-community";
-        repo = "home-manager";
-      };
+      when = w_nixpkgs "nixos-26.05-small";
+      set = w_tarball nixos_stable;
+    }
+    {
+      when = {url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst";};
+      set = w_tarball nixos_unstable;
+    }
+
+    # {
+    #   when = {url = "https://git.foss-syndicate.org/vhack.eu/nix-library";};
+    #   set = {url = "file:///home/nixos/s/nix-library";};
+    # }
 
+    {
+      when = w_github "nix-community" "home-manager";
       set = {ref = "master";};
     }
 
     {
-      when = {
-        type = "github";
-        owner = "nix-systems";
-        repo = "default";
+      when = w_github "edolstra" "flake-compat";
+      set = {
+        type = "git";
+        url = "https://git.lix.systems/lix-project/flake-compat";
+        ref = "main";
       };
-
-      set = {ref = "main";};
     }
     {
-      when = {
-        type = "github";
-        owner = "nix-systems";
-        repo = "x86_64-linux";
+      when = w_github "nixos" "flake-compat";
+      set = {
+        type = "git";
+        url = "https://git.lix.systems/lix-project/flake-compat";
+        ref = "main";
       };
+    }
 
+    {
+      when = w_github "nix-systems" "default";
+      set = {ref = "main";};
+    }
+    {
+      when = w_github "nix-systems" "x86_64-linux";
       set = {
         repo = "default";
         ref = "main";
@@ -72,65 +103,33 @@ in {
     }
 
     {
-      when = {
-        type = "github";
-        owner = "numtide";
-        repo = "treefmt-nix";
-      };
-
+      when = w_github "numtide" "treefmt-nix";
       set = {ref = "main";};
     }
   ];
 
   # Actual inputs
-  "agenix" = {
-    url = "github:ryantm/agenix/main";
-  };
-  "disko" = {
-    url = "github:nix-community/disko/master";
-  };
-  "devshells" = {
-    url = "git+https://git.foss-syndicate.org/bpeetz/devshells?ref=prime";
-  };
-  "flake-compat" = {
-    url = "git+https://git.lix.systems/lix-project/flake-compat?ref=main";
-  };
-  "home-manager" = {
-    url = "github:nix-community/home-manager/master";
-  };
-  "impermanence" = {
-    url = "github:nix-community/impermanence/master";
-  };
-  "lanzaboote" = {
-    url = "github:nix-community/lanzaboote/${lanzabooteVersion}";
-  };
-  "library" = {
-    url = "git+https://git.foss-syndicate.org/vhack.eu/nix-library?ref=prime";
-  };
-  "turtle" = {
-    url = "git+https://git.foss-syndicate.org/bpeetz/forks/atuin?ref=main";
-  };
-  "nix-index-database" = {
-    url = "github:nix-community/nix-index-database/main";
-  };
-  "nixos-generators" = {
-    url = "github:nix-community/nixos-generators/master";
-  };
-  "nixpkgs-stable" = {url = "tarball+${nixos_stable}";};
-  "nixpkgs" = {url = "tarball+${nixos_unstable}";};
-  "nixvim" = {
-    url = "github:nix-community/nixvim/main";
-  };
-  "qmk_firmware" = {
-    url = "git+https://git.foss-syndicate.org/bpeetz/qmk_layout?ref=prime";
-  };
-  # "serverphone" = {
-  #     url = "git+https://codeberg.org/vhack.eu/serverphone?ref=prime";
-  # };
-  "templates" = {
-    url = "git+https://codeberg.org/bpeetz/flake-templates?ref=prime";
-  };
-  "treefmt-nix" = {
-    url = "github:numtide/treefmt-nix/main";
-  };
+  agenix.url = "github:ryantm/agenix/main";
+  devshells.url = "git+https://git.foss-syndicate.org/bpeetz/devshells?ref=prime";
+  disko.url = "github:nix-community/disko/master";
+  flake-compat.url = "git+https://git.lix.systems/lix-project/flake-compat?ref=main";
+  home-manager.url = "github:nix-community/home-manager/master";
+  impermanence.url = "github:nix-community/impermanence/master";
+  lanzaboote.url = "github:nix-community/lanzaboote/${lanzabooteVersion}";
+  library.url = "git+https://git.foss-syndicate.org/vhack.eu/nix-library?ref=prime";
+  nix-index-database.url = "github:nix-community/nix-index-database/main";
+  nixos-generators.url = "github:nix-community/nixos-generators/master";
+  nixpkgs-stable.url = "tarball+${nixos_stable}";
+  nixpkgs-unstable.url = "tarball+${nixos_unstable}";
+  nixvim.url = "github:nix-community/nixvim/main";
+  qmk_firmware.url = "git+https://git.foss-syndicate.org/bpeetz/qmk_layout?ref=prime";
+  serverphone.url = "git+https://codeberg.org/vhack.eu/serverphone?ref=prime";
+  templates.url = "git+https://codeberg.org/bpeetz/flake-templates?ref=prime";
+  treefmt-nix.url = "github:numtide/treefmt-nix/main";
+  turtle.url = "git+https://git.foss-syndicate.org/bpeetz/forks/atuin?ref=main";
+
+  # Server
+  deploy-rs.url = "github:serokell/deploy-rs";
+  rocie.url = "git+https://git.foss-syndicate.org/bpeetz/rocie/nix?ref=prime";
+  simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-${nixosVersion}";
 }