formatting
This commit is contained in:
parent
64fcff10aa
commit
48387d08e3
14 changed files with 129 additions and 111 deletions
|
|
@ -1,19 +1,19 @@
|
|||
{
|
||||
pkgs,
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
outputs,
|
||||
lib,
|
||||
inputs,
|
||||
outputs,
|
||||
helperLib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.myNixOS;
|
||||
|
||||
# Taking all modules in ./features and adding enables to them
|
||||
features =
|
||||
features =
|
||||
helperLib.extendModules
|
||||
(name: {
|
||||
extraOptions = {
|
||||
(name: {
|
||||
extraOptions = {
|
||||
myNixOS.${name}.enable = lib.mkEnableOption "enable my ${name} configuration";
|
||||
};
|
||||
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
(helperLib.filesIn ./features);
|
||||
|
||||
# taking all module bundles in ./bundles and adding bundle.enables to them
|
||||
bundles =
|
||||
bundles =
|
||||
helperLib.extendModules
|
||||
(name: {
|
||||
extraOptions = {
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
(helperLib.filesIn ./bundles);
|
||||
|
||||
# taking all module services in ./services and adding service.enables to them
|
||||
services =
|
||||
services =
|
||||
helperLib.extendModules
|
||||
(name: {
|
||||
extraOptions = {
|
||||
|
|
@ -45,14 +45,13 @@
|
|||
})
|
||||
(helperLib.filesIn ./services);
|
||||
in {
|
||||
imports =
|
||||
[
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
]
|
||||
++ features
|
||||
++ bundles
|
||||
++ services
|
||||
;
|
||||
imports =
|
||||
[
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
]
|
||||
++ features
|
||||
++ bundles
|
||||
++ services;
|
||||
|
||||
options.myNixOS = {
|
||||
sharedSettings = {
|
||||
|
|
@ -68,7 +67,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
|
||||
config = {
|
||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||
programs.nix-ld.enable = true;
|
||||
|
|
@ -81,7 +79,6 @@ in {
|
|||
defaultLocale.enable = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
# imports = [
|
||||
# ./neo.nix
|
||||
|
|
@ -95,3 +92,4 @@ in {
|
|||
# pipewire.enable = lib.mkDefault true;
|
||||
# pipewire.useJack = lib.mkDefault false;
|
||||
# }
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue