Fix(treewide): Make system compile again

7 files changed, 27 insertions, 30 deletions

diff --git a/bootstrap/setup/setup.sh b/bootstrap/setup/setup.sh
index bd32a136..1e3b4899 100755
--- a/bootstrap/setup/setup.sh
+++ b/bootstrap/setup/setup.sh
@@ -6,7 +6,7 @@ msg "Select a host-config:"
 hosts=$(mktmp);
 host="";
 
-awk -F "." '/pkgs.lib.nixosSystem/{print $1}' "$(tmp 'curl https://codeberg.org/ene/nixos-config/raw/branch/prime/flake/nixosConfigurations/default.nix 2> /dev/null')" | awk '{print $1}' > $hosts;
+awk -F "." '/nixpkgs.lib.nixosSystem/{print $1}' "$(tmp 'curl https://codeberg.org/ene/nixos-config/raw/branch/prime/flake/nixosConfigurations/default.nix 2> /dev/null')" | awk '{print $1}' > $hosts;
 
 while ! grep "$host" "$hosts" > /dev/null || [ "$(printf "%s" "$host" | wc -c)" -eq 0 ]; do
     i=1;
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];
   };
 }
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 3c8017ca..a2dd9b58 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -20,8 +20,8 @@
   # TODO add XDG_RUNTIME_DIR
 in {
   imports = [
-    # inputs.impermanence.nixosModules.home-manager.impermanence
-    "${impermanence}/home-manager.nix"
+    impermanence.nixosModules.home-manager.impermanence
+    #"${impermanence}/home-manager.nix"
     ./impermanence
     ./packages
     ./config
diff --git a/system/default.nix b/system/default.nix
index a417aecc..64073fb8 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -3,7 +3,7 @@
     ./boot
     ./fileSystemLayouts
     ./font
-    ./impermanence
+    #./impermanence already at flake level imported
     ./locale
     ./sound
     ./users # the position of this item is fully arbitrary
@@ -11,6 +11,7 @@
     ./hardware
     ./services
     ./tempfiles
+    ./nixpkgs
   ];
   # remove all bloat, nixos installs by default
   environment = {
diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix
index 2d62dc94..71b023ff 100644
--- a/system/impermanence/default.nix
+++ b/system/impermanence/default.nix
@@ -1,9 +1,4 @@
-{impermanence, ...}: {
-  imports = [
-    # impermanence.nixosModules.impermanence
-    "${impermanence}/nixos.nix"
-  ];
-
+{...}: {
   # needed for the hm impermanence config
   programs.fuse.userAllowOther = true;
 
diff --git a/system/nixpkgs/default.nix b/system/nixpkgs/default.nix
new file mode 100644
index 00000000..f226faa2
--- /dev/null
+++ b/system/nixpkgs/default.nix
@@ -0,0 +1,6 @@
+# vim: ts=2
+{lib, ...}: {
+  nixpkgs.config = {
+    #contentAddressedByDefault = true;
+  };
+}