refactoring

This commit is contained in:
Andrea Ciceri 2023-04-20 20:13:06 +02:00
parent 75580df3bc
commit 33dff4df07
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg

View file

@ -58,12 +58,7 @@
check = lib.isFunction; check = lib.isFunction;
merge = lib.mergeOneOption; merge = lib.mergeOneOption;
}); });
default = with inputs; [ default = [];
agenix.overlays.default
comma.overlays.default
nur.overlay
nil.overlays.default # FIXME This shouldn't be here
];
}; };
extraModules = lib.mkOption { extraModules = lib.mkOption {
description = "Extra NixOS modules"; description = "Extra NixOS modules";
@ -81,6 +76,11 @@
default = "ccr"; default = "ccr";
}; };
}; };
config.overlays = with inputs; [
agenix.overlays.default
comma.overlays.default
nur.overlay
];
})); }));
default = {}; default = {};
}; };
@ -165,6 +165,7 @@
ccrEmacs.hmModules.default ccrEmacs.hmModules.default
hyprland.homeManagerModules.default hyprland.homeManagerModules.default
]; ];
overlays = [inputs.nil.overlays.default];
secrets = { secrets = {
"thinkpad-wireguard-private-key" = {}; "thinkpad-wireguard-private-key" = {};
"cachix-personal-token".owner = "ccr"; "cachix-personal-token".owner = "ccr";
@ -209,6 +210,7 @@
]; ];
} }
]; ];
overlays = [inputs.nil.overlays.default];
secrets = { secrets = {
"mothership-wireguard-private-key" = {}; "mothership-wireguard-private-key" = {};
"cachix-personal-token".owner = "ccr"; "cachix-personal-token".owner = "ccr";