summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix9
-rw-r--r--home/zsh/plugins.nix2
-rw-r--r--lib/secrets/default.nix22
3 files changed, 19 insertions, 14 deletions
diff --git a/flake.nix b/flake.nix
index 0ec1e03..e6c50a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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;
+ };
}