2 files changed, 15 insertions, 20 deletions
diff --git a/flake.nix b/flake.nix
index b8d9890e..466b7d01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,6 +72,7 @@
     # modules
     impermanence,
     agenix,
+    ragenix,
     # external dependencies
     neovim_config,
     user_js,
@@ -87,22 +88,13 @@
   }: let
     sysLib = import ./lib {inherit pkgs shell-library;};
     system = "x86_64-linux";
-    pkgs = import nixpkgs {
-      config = {
-#contentAddressedByDefault = true;
-        config.allowUnfreePredicate = pkg:
-          builtins.elem (nixpkgs.lib.getName pkg) [
-            "steam"
-            "steam-original"
-          ];
-      };
-      inherit system;
-    };
+    pkgs = nixpkgs.legacyPackages.${system};
   in {
     nixosConfigurations = import ./flake/nixosConfigurations {
       inherit
         system
         pkgs
+        nixpkgs
         sysLib
         home-manager
         agenix
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index d8663f85..d47c89aa 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -2,6 +2,7 @@
 {
   system,
   pkgs,
+  nixpkgs,
   sysLib,
   yambar_cpu,
   yambar_memory,
@@ -52,19 +53,21 @@
     };
   };
   ageConfig = import ../../secrets;
+  impermanenceConfig = import ../../system/impermanence;
   defaultModules = [
     agenix.nixosModules.default
     ageConfig
 
     home-manager.nixosModules.home-manager
-    #(import "${inputs.home-manager}/nixos")
 
-    # inputs.impermanence.nixosModules.home-manager.impermanence
     homeManagerConfig
+
+    impermanence.nixosModules.impermanence
+    impermanenceConfig
   ];
 in {
-  tiamat = pkgs.lib.nixosSystem {
-    inherit system;
+  tiamat = nixpkgs.lib.nixosSystem {
+    inherit system pkgs;
     modules =
       [
         ../../hosts/tiamat/configuration.nix
@@ -72,23 +75,23 @@ in {
       ++ defaultModules;
   };
 
-  mammun = pkgs.lib.nixosSystem {
-    inherit system;
+  mammun = nixpkgs.lib.nixosSystem {
+    inherit system pkgs;
     modules =
       [
         ../../hosts/mammun/configuration.nix
       ]
       ++ defaultModules;
   };
-  lahmu = pkgs.lib.nixosSystem {
-    inherit system;
+  lahmu = nixpkgs.lib.nixosSystem {
+    inherit system pkgs;
     modules =
       [
         ../../hosts/lahmu/configuration.nix
       ]
       ++ defaultModules;
   };
-  spawn = pkgs.lib.nixosSystem {
+  spawn = nixpkgs.lib.nixosSystem {
     modules = [../../hosts/spawn/configuration.nix];
   };
 }