refactoring
This commit is contained in:
parent
75580df3bc
commit
33dff4df07
1 changed files with 8 additions and 6 deletions
|
@ -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";
|
||||||
|
|
Loading…
Add table
Reference in a new issue