more stuff

systems/_common/configuration.nix

@@ -14,7 +14,7 @@ in
       (/${settings.systemsDir}/${settings.system.hostname}/hardware-configuration.nix)
       # home manager import
       (import "${home-manager}/nixos")
-      # ./ragenix.nix
+      ./ragenix.nix
     ];
 
   # Enable flakes
@@ -24,7 +24,7 @@ in
   security.polkit.enable = true;
   home-manager.useUserPackages = true;
   home-manager.useGlobalPkgs = true;
-  home-manager.extraSpecialArgs = args;
+  home-manager.extraSpecialArgs = { inherit settings; inherit ylib; inherit (args) ragenix; };
 
   # ==========
   #   Common

systems/_common/ragenix.nix

@@ -1,23 +1,29 @@
 # TODO check out the by host way this person does: https://github.com/hlissner/dotfiles/blob/089f1a9da9018df9e5fc200c2d7bef70f4546026/modules/agenix.nix
-{ settings, lib, inputs, ... }:
+{ settings, lib, ragenix, ... }:
 let
-  secretsDir = "${settings.secretsDir}";
-  secretsFile = "${secretsDir}/secrets.nix";
+  # secretsDir = "${settings.secretsDir}";
+  # secretsFile = "${secretsDir}/secrets.nix";
 in
 {
-  # imports = [ inputs.ragenix.nixosModules.age ];
-  environment.systemPackages = [ inputs.ragenix.defaultPackage.${settings.system.architecture} ];
+  imports = [ ragenix.nixosModules.age ];
+  environment.systemPackages = [ ragenix.packages.${settings.system.architecture}.default ];
 
-  # age = {
-  #   secrets =
-  #     if pathExists secretsFile
-  #     then
-  #       mapAttrs'
-  #         (n: _: nameValuePair (removeSuffix ".age" n) {
-  #           file = "${secretsDir}/${n}";
-  #           owner = mkDefault settings.user.username; # TODO and root? or does that matter...
-  #         })
-  #         (import secretsFile)
-  #     else { };
-  # };
+  age = {
+    secrets =
+      # if builtins.pathExists secretsFile
+      # then
+      #   builtins.mapAttrs'
+      #     (n: _: lib.nameValuePair (lib.removeSuffix ".age" n) {
+      #       file = "${secretsDir}/${n}";
+      #       owner = lib.mkDefault settings.user.username; # TODO and root? or does that matter...
+      #     })
+      #     (import secretsFile)
+      # else { };
+      {
+        test1 = {
+          file = /${settings.secretsDir}/test1.age;
+          owner = settings.user.username;
+        };
+      };
+  };
 }