christoph/flake-nixinator
1
Fork 0
Code Activity

Update systemmodules/homemodules paths to allow nixd to differentiate between the two

Browse Source
This commit is contained in:
Christoph Urlacher
2026-01-18 15:47:51 +01:00
parent 25ae0f4b85
commit b7e2bba8f0
63 changed files with 173 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/systemmodules/1_deprecated/agenix/default.nix
View File

@ -7,9 +7,9 @@
publicKeys,
...
}: let
inherit (config.modules) agenix;
inherit (config.systemmodules) agenix;
in {
options.modules.agenix = import ./options.nix {inherit lib mylib;};
options.systemmodules.agenix = import ./options.nix {inherit lib mylib;};
config = {
# NOTE: Add below snippet to home/christoph/default.nix to generate the secrets.nix file
@ -23,13 +23,13 @@ in {
# {
# ${lib.optionalString
# # If this user defined any secrets...
# (builtins.hasAttr "${username}" nixosConfig.modules.agenix.secrets)
# (builtins.hasAttr "${username}" nixosconfig.systemmodules.agenix.secrets)
# # ...we will add them to the current secrets.nix,
# # s.t. agenix can be used to encrypt/access them.
# (builtins.concatStringsSep "\n"
# (builtins.map
# (mkSecret publicKeys.${username}.ssh)
# nixosConfig.modules.agenix.secrets.${username}))}
# nixosconfig.systemmodules.agenix.secrets.${username}))}
# }
# '';

4
system/systemmodules/1_deprecated/containers/default.nix
View File

@ -10,9 +10,9 @@
with lib;
with mylib.virtualisation;
with mylib.modules; let
cfg = config.modules.containers;
cfg = config.systemmodules.containers;
in {
options.modules.containers = import ./options.nix {inherit lib mylib;};
options.systemmodules.containers = import ./options.nix {inherit lib mylib;};
# TODO: These need config options exposed through the module,
# e.g. to set paths/volumes/binds differently per system...