home

commit c1e8fe9f7569c76d4d35f349b6996ce35c9f6c26
parent f35481b6f2426e1065cc9d3a57204db323dbe903
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 31 May 2022 11:31:51 +0200

flake: use home-manager stable versions…

… and both 21.11 and 22.05 while I migrate

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
flake.lock
 | 
26
++++++++++++++++++++++++--
M
flake.nix
 | 
25
+++++++++++++++----------

2 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -192,7 +192,7 @@
         "type": "github"
       }
     },
-    "home-manager-stable": {
+    "home-manager-21_11": {
       "inputs": {
         "nixpkgs": [
           "nixos-21_11"
@@ -213,6 +213,27 @@
         "type": "github"
       }
     },
+    "home-manager-22_05": {
+      "inputs": {
+        "nixpkgs": [
+          "nixos-22_05"
+        ]
+      },
+      "locked": {
+        "lastModified": 1653937612,
+        "narHash": "sha256-HybwffYKOM3UwlY54ZVCZgX7o5xpp2KhbZyyOnvwFMo=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-22.05",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
     "impermanence": {
       "locked": {
         "lastModified": 1646131459,
@@ -441,7 +462,8 @@
         "flake-utils": "flake-utils_3",
         "flake-utils-plus": "flake-utils-plus",
         "home-manager": "home-manager",
-        "home-manager-stable": "home-manager-stable",
+        "home-manager-21_11": "home-manager-21_11",
+        "home-manager-22_05": "home-manager-22_05",
         "impermanence": "impermanence",
         "nix-hardware": "nix-hardware",
         "nixos-21_11": "nixos-21_11",
diff --git a/flake.nix b/flake.nix
@@ -16,7 +16,8 @@
 
     # Flake Dependencies
     home-manager = { type = "github"; owner = "nix-community"; repo = "home-manager"; inputs.nixpkgs.follows = "nixpkgs"; };
-    home-manager-stable = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-21.11"; inputs.nixpkgs.follows = "nixos-21_11"; };
+    home-manager-21_11 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-21.11"; inputs.nixpkgs.follows = "nixos-21_11"; };
+    home-manager-22_05 = { type = "github"; owner = "nix-community"; repo = "home-manager"; ref = "release-22.05"; inputs.nixpkgs.follows = "nixos-22_05"; };
     impermanence = { type = "github"; owner = "nix-community"; repo = "impermanence"; };
 
     nur.url = "github:nix-community/NUR";
@@ -54,7 +55,8 @@
     , flake-utils-plus
     , flake-utils
     , home-manager
-    , home-manager-stable
+    , home-manager-21_11
+    , home-manager-22_05
     , emacs-overlay
     , nur
     , sops-nix
@@ -65,16 +67,19 @@
     } @ inputs:
     let
       mkApp = flake-utils.lib.mkApp;
-      # homeProfiles = import ./home { inherit (nixpkgs) lib; };
 
       nixosModules = flake-utils-plus.lib.exportModules [
         ./systems/modules/virtualisation/buildkit.nix
       ];
 
-      stableModules = [
-        home-manager-stable.nixosModules.home-manager
+      stableModules_21_11 = [
+        home-manager-21_11.nixosModules.home-manager
         ./systems/modules/profiles/docker.stable.nix
       ];
+      stableModules_22_05 = [
+        home-manager-22_05.nixosModules.home-manager
+        ./systems/modules/profiles/docker.nix
+      ];
       unstableModules = [
         home-manager.nixosModules.home-manager
         ./systems/modules/profiles/docker.nix
@@ -178,14 +183,14 @@
         };
         # Servers
         shikoku = {
-          channelName = "nixos-21_11";
-          modules = stableModules ++ [
+          channelName = "nixos-22_05";
+          modules = stableModules_22_05 ++ [
             ./systems/hosts/shikoku.nix
           ];
         };
         wakasu = {
           channelName = "nixos-21_11";
-          modules = stableModules ++ [
+          modules = stableModules_21_11 ++ [
             nixos-hardware.nixosModules.lenovo-thinkpad
             nixos-hardware.nixosModules.common-pc-laptop-ssd
             ./systems/hosts/wakasu.nix
@@ -193,14 +198,14 @@
         };
         sakhalin = {
           channelName = "nixos-21_11";
-          modules = stableModules ++ [
+          modules = stableModules_21_11 ++ [
             nixos-hardware.nixosModules.common-pc-ssd
             ./systems/hosts/sakhalin.nix
           ];
         };
         kerkouane = {
           channelName = "nixos-21_11";
-          modules = stableModules ++ [
+          modules = stableModules_21_11 ++ [
             ./systems/modules/services/govanityurl.nix
             ./systems/hosts/kerkouane.nix
           ];