From b70f651bcce7f6f6d44f4371f0697fe87fb0c540 Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 25 Aug 2025 01:19:49 +1000 Subject: [PATCH 1/2] add support for smfh impure mode --- default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/default.nix b/default.nix index c2d1467..adb3ece 100644 --- a/default.nix +++ b/default.nix @@ -92,6 +92,20 @@ in ''; }; enable = mkEnableOption "Arbitrary Symlink Manager"; + impure = mkOption { + type = bool; + default = false; + description = '' + Expand ~ and environment variables in paths, similar to if you were in a shell. + ''; + }; + variables = mkOption { + type = attrsOf str; + default = { }; + description = '' + A set of environment variables to use in the deployment. + ''; + }; }; files = mkOption { description = "Files to link"; @@ -146,6 +160,7 @@ in text = ( builtins.toJSON { inherit files; + inherit (config.environment.arbys) impure; clobber_by_default = config.environment.arbys.clobber; version = 1; } @@ -195,6 +210,7 @@ in "arbys-copy.service" ]; after = [ "arbys-prep.service" ]; + environment = config.environment.arbys.variables; script = let linker = lib.getExe (pkgs.smfh or (pkgs.callPackage ./smfh.nix { })); From cc1e2613fbbb0ed98bb4ce0d52c6e99bb8f98055 Mon Sep 17 00:00:00 2001 From: atagen Date: Mon, 25 Aug 2025 01:19:59 +1000 Subject: [PATCH 2/2] minor docs tweak --- default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index adb3ece..59a36ac 100644 --- a/default.nix +++ b/default.nix @@ -39,7 +39,10 @@ let source = mkOption { type = nullOr (either path str); default = null; - description = "Path of the source file or directory - be sure to quote paths you don't want nix to copy to the store."; + description = '' + Path of the source file or directory. + Be sure to quote paths you don't want nix to copy to the store. + ''; }; executable = mkOption {