diff options
| author | Linnnus <[email protected]> | 2023-09-07 17:36:58 +0200 |
|---|---|---|
| committer | Linnnus <[email protected]> | 2023-09-07 17:36:58 +0200 |
| commit | 97539f9b1b004f1b8b8aa2608e92050b7f3d2433 (patch) | |
| tree | eb50f3963bdccb75abd1db8ba5a2aecf3dfb7066 | |
| parent | edcc3acea595d3045253c3c2fe2462599c1c54e0 (diff) | |
Make reorganization """work""" for mac
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | home/zsh/plugins.nix | 2 | ||||
| -rw-r--r-- | lib/secrets/default.nix | 22 |
3 files changed, 19 insertions, 14 deletions
@@ -31,7 +31,10 @@ ./hosts/muhammed/configuration.nix ./hosts/common.nix ./home - ./lib + # FIXME: Get the following to work without nix-darwin bithcing about unused NixOS options. + # ./lib + # ./modules + # ./services ]; }; }; @@ -46,8 +49,8 @@ ./hosts/common.nix ./home ./lib - ./modules/default.nix - ./services/default.nix + ./modules + ./services ]; }; }; diff --git a/home/zsh/plugins.nix b/home/zsh/plugins.nix index 3bebfce..8855857 100644 --- a/home/zsh/plugins.nix +++ b/home/zsh/plugins.nix @@ -30,7 +30,7 @@ let fixupPhase = '' substituteInPlace ${pname}.zsh \ - --replace md5 ${pkgs.outils}/bin/md5 + --replace md5 ${pkgs.hashdeep}/bin/md5deep mkdir -p $out mv * $out diff --git a/lib/secrets/default.nix b/lib/secrets/default.nix index 9592052..3c2da95 100644 --- a/lib/secrets/default.nix +++ b/lib/secrets/default.nix @@ -77,14 +77,16 @@ in default = { }; }; - config.systemd.services = - let - units = mapAttrs' - (name: info: { - name = "${name}-key"; - value = (mkService name info); - }) - cfg; - in - units; + config = mkIf (cfg != []) { + systemd.services = + let + units = mapAttrs' + (name: info: { + name = "${name}-key"; + value = (mkService name info); + }) + cfg; + in + units; + }; } |