move impermanence input up the tree

flake.lock

@@ -215,11 +215,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-SakyZnAhoToQmui5hozmLqkoLw6N/AHCgKF4tCP/sTQ=",
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/disko",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/disko",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/disko",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/disko",
         "type": "path"
       }
     },
@@ -1022,21 +1022,6 @@
         "type": "github"
       }
     },
-    "impermanenceConfig": {
-      "inputs": {
-        "impermanence": "impermanence"
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-7ipphehm+qDglyyFxGz2ZYf9uNbXCohPCFAGSI2QMb8=",
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/impermanence",
-        "type": "path"
-      },
-      "original": {
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/impermanence",
-        "type": "path"
-      }
-    },
     "kitty": {
       "locked": {
         "lastModified": 1,
@@ -1059,11 +1044,11 @@
       "locked": {
         "lastModified": 0,
         "narHash": "sha256-Hz1a2OgtlwgdQhI6hiUvityjVURsoY6oXkXq25RyiBM=",
-        "path": "/mnt/nix/store/iannwyfkv44qaginpf0m6915sdw9y61i-source/home",
+        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/home",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/iannwyfkv44qaginpf0m6915sdw9y61i-source/home",
+        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/home",
         "type": "path"
       }
     },
@@ -1449,11 +1434,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-6oCDKhDSqJMWeODXDHD5XorN7/+KXBBIPZ2z+obwUNY=",
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/packages",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/packages",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/packages",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/packages",
         "type": "path"
       }
     },
@@ -1539,11 +1524,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-hg0wqQn6BxQXLmfBINzZoaWpdSIlwwZxKbYz+4df83o=",
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/programs",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/programs",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/programs",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/programs",
         "type": "path"
       }
     },
@@ -1670,30 +1655,30 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-VZKans7CW3BgyWaVgi9mGKvJsCvyse2zLPRB5fJnlfA=",
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/services",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/services",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/rvvgy838if8wgg37p3pn9g3airwqdvk9-source/services",
+        "path": "/mnt/nix/store/4y5l241pnwi2qh4wxcfmxlpdnjq8nsac-source/services",
         "type": "path"
       }
     },
     "system": {
       "inputs": {
         "diskoConfig": "diskoConfig",
-        "impermanenceConfig": "impermanenceConfig",
+        "impermanence": "impermanence",
         "pckgs": "pckgs",
         "prgms": "prgms_2",
         "srvcs": "srvcs"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-exwW4tel96FIoxYUW72TGM9s5fze+qMf32ohapeTOsM=",
+        "narHash": "sha256-6D9Qya9I2fNjDLasG/DH3OQwSGoFbMkU7ZpvPEIEPqs=",
-        "path": "/mnt/nix/store/iannwyfkv44qaginpf0m6915sdw9y61i-source/system",
+        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/system",
         "type": "path"
       },
       "original": {
-        "path": "/mnt/nix/store/iannwyfkv44qaginpf0m6915sdw9y61i-source/system",
+        "path": "/mnt/nix/store/x4s89c2jcsnfwqjbj5zcpb233i9x31i0-source/system",
         "type": "path"
       }
     },

system/flake.nix

@@ -11,7 +11,7 @@
 
         diskoConfig.url = "./disko";
 
-        impermanenceConfig.url = "./impermanence";
+        impermanence.url = "github:nix-community/impermanence";
 
     };
 
@@ -22,7 +22,8 @@
                 ./configuration
                 ./configuration/${core_inputs.host}/hardware-configuration.nix
                 inputs.diskoConfig.module
-                inputs.impermanenceConfig.module
+                ./impermanence
+                inputs.impermanence.nixosModules.impermanence
                 inputs.srvcs.module
                 inputs.pckgs.module
                 inputs.prgms.module

system/impermanence/default.nix

@@ -1,16 +1,7 @@
-{ config, lib, self, ... }: {
+{ config, lib, ... }: {
 
-    options = {};
 
-    config = lib.mkMerge [
+    config = lib.mkIf config.disko.impermanent {
-
-        {
-            imports = [
-                self.inputs.impermanence.nixosModules.impermanence
-            ];   
-        }
-
-        (lib.mkIf config.disko.impermanent {
 
             fileSystems."/persist".neededForBoot = true;
             environment.persistence = {
@@ -32,6 +23,5 @@
             };
 
             programs.fuse.userAllowOther = true;
-        })
+    };
-    ];
 }

system/impermanence/flake.nix

@@ -1,10 +0,0 @@
-{
-    description = "nix impermanence config";
-
-    inputs.impermanence.url = "github:nix-community/impermanence";
-
-    outputs = { self, ... }: {
-
-        module = { config, lib, ... }: import ./. { inherit config lib self; };
-    };
-}