inputs.nix: Use nixos channels instead of github for the nixos tarballs

This reduces the dependency on github somewhat.

4 files changed, 49 insertions, 45 deletions

diff --git a/inputs.nix b/inputs.nix
index c899f356..b874df3c 100644
--- a/inputs.nix
+++ b/inputs.nix
@@ -1,6 +1,5 @@
 let
-  nixpkgsVersion = "26.05";
-  nixos-stable = "nixos-${nixpkgsVersion}";
+  nixosVersion = "26.05";
 
   lanzabooteVersion = "v1.1.0";
 
@@ -10,27 +9,34 @@ let
     repo = "nixpkgs";
     inherit ref;
   };
+  w_tarball = url: {
+    type = "tarball";
+    inherit url;
+  };
+
+  nixos_stable = "https://channels.nixos.org/nixos-${nixosVersion}/nixexprs.tar.zst";
+  nixos_unstable = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst";
 in {
   _unflake.dedupRules = [
     {
       when = w_nixpkgs "nixpkgs-unstable";
-      set = {ref = "nixos-unstable";};
+      set = w_tarball nixos_unstable;
     }
     {
       when = w_nixpkgs "nixos-unstable-small";
-      set = {ref = "nixos-unstable";};
+      set = w_tarball nixos_unstable;
     }
     {
       when = w_nixpkgs "nixos-25.05";
-      set = {ref = nixos-stable;};
+      set = w_tarball nixos_stable;
     }
     {
       when = w_nixpkgs "nixos-25.11";
-      set = {ref = nixos-stable;};
+      set = w_tarball nixos_stable;
     }
     {
       when = w_nixpkgs "nixos-26.05";
-      set = {ref = nixos-stable;};
+      set = w_tarball nixos_stable;
     }
 
     {
@@ -107,12 +113,8 @@ in {
   "nixos-generators" = {
     url = "github:nix-community/nixos-generators/master";
   };
-  "nixpkgs-stable" = {
-    url = "github:NixOS/nixpkgs/nixos-${nixpkgsVersion}";
-  };
-  "nixpkgs" = {
-    url = "github:NixOS/nixpkgs/nixos-unstable-small";
-  };
+  "nixpkgs-stable" = {url = "tarball+${nixos_stable}";};
+  "nixpkgs" = {url = "tarball+${nixos_unstable}";};
   "nixvim" = {
     url = "github:nix-community/nixvim/main";
   };
diff --git a/modules/by-name/ve/version/module.nix b/modules/by-name/ve/version/module.nix
index 2219a134..28328d1d 100644
--- a/modules/by-name/ve/version/module.nix
+++ b/modules/by-name/ve/version/module.nix
@@ -22,7 +22,7 @@ in {
   };
   config = lib.mkIf cfg.enable {
     environment.etc.nixpkgs-git-revision = {
-      text = nixpkgs.sourceInfo.rev;
+      source = "${nixpkgs}/.git-revision";
     };
   };
 }
diff --git a/npins/sources.json b/npins/sources.json
index 44ef8c95..fb7c8913 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -249,19 +249,6 @@
       "url": "https://github.com/nixos/flake-compat/archive/5edf11c44bc78a0d334f6334cdaf7d60d732daab.tar.gz",
       "hash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns="
     },
-    "unflake_github_nixos_nixpkgs_ref_nixos-26-05": {
-      "type": "Git",
-      "repository": {
-        "type": "GitHub",
-        "owner": "nixos",
-        "repo": "nixpkgs"
-      },
-      "branch": "nixos-26.05",
-      "submodules": false,
-      "revision": "9f78f44a87948854445dae0b6bf82b2e87e4efb5",
-      "url": "https://github.com/nixos/nixpkgs/archive/9f78f44a87948854445dae0b6bf82b2e87e4efb5.tar.gz",
-      "hash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw="
-    },
     "unflake_github_nixos_nixpkgs_ref_nixos-unstable": {
       "type": "Git",
       "repository": {
@@ -326,6 +313,18 @@
       "revision": "b027ee29d959fda4b60b57566d64c98a202e0feb",
       "url": "https://github.com/ryantm/agenix/archive/b027ee29d959fda4b60b57566d64c98a202e0feb.tar.gz",
       "hash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I="
+    },
+    "unflake_tarball_https---channels-nixos-org-nixos-26-05-nixexprs-tar-zst": {
+      "type": "Url",
+      "url": "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst",
+      "unpack": true,
+      "hash": "sha256-eVWN0FVPJSK7wgm9SxzFwd6FNRWoJN2oAe3M6MbpZ8U="
+    },
+    "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst": {
+      "type": "Url",
+      "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.zst",
+      "unpack": true,
+      "hash": "sha256-kSR/jfpR4cE26YRZ8exQkoRbEA30vyWimajwZANYYaE="
     }
   },
   "version": 8
diff --git a/unflake.nix b/unflake.nix
index 65e4583c..fb98cb70 100644
--- a/unflake.nix
+++ b/unflake.nix
@@ -14,7 +14,7 @@ let
   injections = rec {
     unflake_github_cachix_pre-commit-hooks-nix = {
       flake-compat = "unflake_github_nixos_flake-compat_flake_false";
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_github_hercules-ci_flake-parts = {
       nixpkgs-lib = "unflake_github_nix-community_nixpkgs-lib";
@@ -22,21 +22,21 @@ let
     unflake_github_ipetkov_crane = {
     };
     unflake_github_lnl7_nix-darwin_ref_master = {
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_github_nix-community_nix-index-database_ref_main = {
       nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
     };
     unflake_github_nix-community_nixvim_ref_main = {
       flake-parts = "unflake_github_hercules-ci_flake-parts";
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
-      systems = "unflake_github_nix-systems_default_ref_main";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
+      systems = "unflake_github_nix-systems_default_ref_main_flake_false";
     };
     unflake_github_nix-community_disko_ref_master = {
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_github_nix-community_home-manager_ref_master = {
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_github_nix-community_impermanence_ref_master = {
       home-manager = "unflake_github_nix-community_home-manager_ref_master";
@@ -44,7 +44,7 @@ let
     };
     unflake_github_nix-community_nixos-generators_ref_master = {
       nixlib = "unflake_github_nix-community_nixpkgs-lib";
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_github_nix-community_lanzaboote_ref_v1-1-0 = {
       crane = "unflake_github_ipetkov_crane";
@@ -56,44 +56,46 @@ let
     };
     unflake_github_nix-systems_default_ref_main = {
     };
-    unflake_github_nixos_nixpkgs_ref_nixos-26-05 = {
-    };
     unflake_github_nixos_nixpkgs_ref_nixos-unstable = {
     };
     unflake_github_numtide_treefmt-nix_ref_main = {
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_github_numtide_flake-utils = {
       systems = "unflake_github_nix-systems_default_ref_main";
     };
     unflake_github_oxalica_rust-overlay = {
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_github_ryantm_agenix_ref_main = {
       darwin = "unflake_github_lnl7_nix-darwin_ref_master";
       home-manager = "unflake_github_nix-community_home-manager_ref_master";
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-26-05";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-26-05-nixexprs-tar-zst";
       systems = "unflake_github_nix-systems_default_ref_main";
     };
     unflake_git_https---git-foss-syndicate-org-bpeetz-forks-atuin_ref_main = {
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
     };
     unflake_git_https---git-lix-systems-lix-project-flake-compat_ref_main = {
     };
     unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime = {
       flake-utils = "unflake_github_numtide_flake-utils";
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
       systems = "unflake_github_nix-systems_default_ref_main";
       treefmt-nix = "unflake_github_numtide_treefmt-nix_ref_main";
     };
     unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime = {
       flake-utils = "unflake_github_numtide_flake-utils";
-      nixpkgs = "unflake_github_nixos_nixpkgs_ref_nixos-unstable";
+      nixpkgs = "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst";
       systems = "unflake_github_nix-systems_default_ref_main";
       treefmt-nix = "unflake_github_numtide_treefmt-nix_ref_main";
     };
     unflake_git_https---git-foss-syndicate-org-vhack-eu-nix-library_ref_prime = {
     };
+    unflake_tarball_https---channels-nixos-org-nixos-26-05-nixexprs-tar-zst = {
+    };
+    unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst = {
+    };
   };
   inject = name: flake_path: subdir:
     let
@@ -123,7 +125,6 @@ let
     unflake_github_nix-community_lanzaboote_ref_v1-1-0 = inject "unflake_github_nix-community_lanzaboote_ref_v1-1-0" "flake.nix" "";
     unflake_github_nix-community_nixpkgs-lib = inject "unflake_github_nix-community_nixpkgs-lib" "flake.nix" "";
     unflake_github_nix-systems_default_ref_main = inject "unflake_github_nix-systems_default_ref_main" "flake.nix" "";
-    unflake_github_nixos_nixpkgs_ref_nixos-26-05 = inject "unflake_github_nixos_nixpkgs_ref_nixos-26-05" "flake.nix" "";
     unflake_github_nixos_nixpkgs_ref_nixos-unstable = inject "unflake_github_nixos_nixpkgs_ref_nixos-unstable" "flake.nix" "";
     unflake_github_nixos_flake-compat_flake_false = deps.unflake_github_nixos_flake-compat_flake_false;
     unflake_github_numtide_treefmt-nix_ref_main = inject "unflake_github_numtide_treefmt-nix_ref_main" "flake.nix" "";
@@ -135,6 +136,8 @@ let
     unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime = inject "unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime" "flake.nix" "";
     unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime = inject "unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime" "flake.nix" "";
     unflake_git_https---git-foss-syndicate-org-vhack-eu-nix-library_ref_prime = inject "unflake_git_https---git-foss-syndicate-org-vhack-eu-nix-library_ref_prime" "flake.nix" "";
+    unflake_tarball_https---channels-nixos-org-nixos-26-05-nixexprs-tar-zst = inject "unflake_tarball_https---channels-nixos-org-nixos-26-05-nixexprs-tar-zst" "flake.nix" "";
+    unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst = inject "unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst" "flake.nix" "";
   };
   inputs = {
     agenix = universe.unflake_github_ryantm_agenix_ref_main;
@@ -146,8 +149,8 @@ let
     library = universe.unflake_git_https---git-foss-syndicate-org-vhack-eu-nix-library_ref_prime;
     nix-index-database = universe.unflake_github_nix-community_nix-index-database_ref_main;
     nixos-generators = universe.unflake_github_nix-community_nixos-generators_ref_master;
-    nixpkgs = universe.unflake_github_nixos_nixpkgs_ref_nixos-unstable;
-    nixpkgs-stable = universe.unflake_github_nixos_nixpkgs_ref_nixos-26-05;
+    nixpkgs = universe.unflake_tarball_https---channels-nixos-org-nixos-unstable-nixexprs-tar-zst;
+    nixpkgs-stable = universe.unflake_tarball_https---channels-nixos-org-nixos-26-05-nixexprs-tar-zst;
     nixvim = universe.unflake_github_nix-community_nixvim_ref_main;
     qmk_firmware = universe.unflake_git_https---git-foss-syndicate-org-bpeetz-qmk_layout_ref_prime;
     templates = universe.unflake_git_https---codeberg-org-bpeetz-flake-templates_ref_prime;