Re-introduce config dir and use it for a symlink

pinpox · Apr 7, 2024 · a72d5d8 · a72d5d8
1 parent c9a8df7
commit a72d5d8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/flake.nix b/flake.nix
@@ -102,6 +102,7 @@
                         REMOTE_SUDO_COMMAND = ''{{default "${deployment.sudo.command}" .LP_REMOTE_SUDO_COMMAND}}'';
                         REMOTE_SUDO_OPTS = ''{{default "${pkgs.lib.concatStrings deployment.sudo.opts}" .LP_REMOTE_SUDO_OPTS}}'';
                         REBUILD_ACTION = ''{{default "switch" .REBUILD_ACTION}}'';
+                        REMOTE_CONFIG_DIR = deployment.config-dir;
                         LOCAL_FLAKE_SOURCE = configFlake;
                         HOSTNAME = hostName;
                       };
@@ -187,7 +188,7 @@
                                 '' else ''
                                 {{.REMOTE_COMMAND}} {{.REMOTE_SSH_OPTS}} {{.REMOTE_USER}}@{{.REMOTE_HOST}} \
                                   "${optionalString useSudo "{{.REMOTE_SUDO_COMMAND}} {{.REMOTE_SUDO_OPTS}}"} nixos-rebuild {{.REBUILD_ACTION}} \
-                                  --flake '{{.LOCAL_FLAKE_SOURCE}}#{{.HOSTNAME}}'"
+                                  --flake "$(readlink -f {{.REMOTE_CONFIG_DIR}}/flake)#{{.HOSTNAME}}""
                               '')
                             ];
                           };
@@ -203,6 +204,10 @@
                                   --to ssh://{{.REMOTE_USER}}@{{.REMOTE_HOST}} \
                                   {{.LOCAL_FLAKE_SOURCE}}
                               ''
+                              ''
+                                {{.REMOTE_COMMAND}} {{.REMOTE_SSH_OPTS}} {{.REMOTE_USER}}@{{.REMOTE_HOST}} \
+                                  "${optionalString useSudo "{{.REMOTE_SUDO_COMMAND}} {{.REMOTE_SUDO_OPTS}}"} ln -sfn {{.LOCAL_FLAKE_SOURCE}} {{.REMOTE_CONFIG_DIR}}/flake"
+                              ''
                             ];
                           };
                         } // hostConfig.config.lollypops.extraTasks;

diff --git a/module.nix b/module.nix
@@ -51,9 +51,9 @@ let
 in
 {
 
-  imports = [
-    (mkRemovedOptionModule ["lollypops" "deployment" "config-dir"] "The flake is now stored in the Nix store directly.")
-  ];
+  # imports = [
+  #   (mkRemovedOptionModule ["lollypops" "deployment" "config-dir"] "The flake is now stored in the Nix store directly.")
+  # ];
 
   options.lollypops = {
 
@@ -93,6 +93,12 @@ in
         description = "Evaluate locally instead of on the remote when rebuilding";
       };
 
+      config-dir = mkOption {
+        type = types.str;
+        default = "/var/src/lollypops";
+        description = "Path to place the configuration on the remote host";
+      };
+
       group = mkOption {
         type = types.str;
         default = "default";