Fix broken secret symlinks on not-non-nixos systems

rake5k · Oct 17, 2023 · a96d25f · a96d25f
1 parent 66b29b2
commit a96d25f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/home/programs/logseq/default.nix b/home/programs/logseq/default.nix
@@ -25,7 +25,6 @@ in
         enable = true;
         identities = [ sshKey sshPubKey ];
       };
-      roles.homeage.secrets = [ sshKey sshPubKey ];
     };
 
     home.packages = [ pkgs.logseq ];

diff --git a/home/programs/ssh/default.nix b/home/programs/ssh/default.nix
@@ -6,15 +6,10 @@ let
 
   cfg = config.custom.programs.ssh;
 
-  inherit (config.custom.roles.homeage) secretsPath;
-  sshDirectory = ".ssh";
-  mkFileEntry = identity: {
-    name = "${sshDirectory}/${identity}";
-    value = {
-      # Using `mkOutOfStoreSymlink` as a workaround for files not being created on activation:
-      # https://github.com/jordanisaacs/homeage/issues/42
-      source = config.lib.file.mkOutOfStoreSymlink "${secretsPath}/${identity}";
-    };
+  sshDirectory = "${config.xdg.dataHome}/.ssh";
+  mkHomeageFile = identity: nameValuePair identity {
+    source = "${config.custom.roles.homeage.secretsSourcePath}/${identity}.age";
+    symlinks = [ "${sshDirectory}/${identity}" ];
   };
 
 in
@@ -33,8 +28,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    custom.roles.homeage.secrets = cfg.identities;
-    home.file = listToAttrs (map mkFileEntry cfg.identities);
+    homeage.file = listToAttrs (map mkHomeageFile cfg.identities);
     programs.ssh.enable = true;
   };
 }
diff --git a/home/roles/homeage/default.nix b/home/roles/homeage/default.nix
@@ -6,11 +6,9 @@ let
 
   cfg = config.custom.roles.homeage;
 
-  secretsSourcePath = "${inputs.self}/secrets/${config.home.username}";
-
   mkHomeageFile = secret: nameValuePair secret {
     path = secret;
-    source = "${secretsSourcePath}/${secret}.age";
+    source = "${cfg.secretsSourcePath}/${secret}.age";
     symlinks = [ "${cfg.secretsPath}/${secret}" ];
   };
 
@@ -27,6 +25,12 @@ in
         description = "Secrets to install.";
       };
 
+      secretsSourcePath = mkOption {
+        type = types.path;
+        default = "${inputs.self}/secrets/${config.home.username}";
+        description = "Default source path of the encrypted files.";
+      };
+
       secretsPath = mkOption {
         type = types.path;
         default = "${config.xdg.dataHome}/secrets";