defaults: cleanup

This commit is contained in:
Elec3137 2026-03-23 21:12:03 -07:00
commit 0144d9667b
4 changed files with 18 additions and 19 deletions

View file

@ -12,10 +12,15 @@ in
imports = [ imports = [
./jp.nix ./jp.nix
./plasma.nix ./plasma.nix
./browsers.nix
./tmux.nix ./tmux.nix
./git.nix ./git.nix
./shell.nix ./shell.nix
./browsers.nix
./nix.nix
./lix.nix
./system.nix
]; ];
options.nixowos.${name} = { options.nixowos.${name} = {
@ -26,10 +31,15 @@ in
nixowos.${name} = lib.mkDefault { nixowos.${name} = lib.mkDefault {
jp.enable = true; jp.enable = true;
plasma.enable = config.services.desktopManager.plasma6.enable; plasma.enable = config.services.desktopManager.plasma6.enable;
browers.enable = true;
tmux.enable = true; tmux.enable = true;
git.enable = true; git.enable = true;
shell.enable = true; shell.enable = true;
browers.enable = true;
nix.enable = true;
lix.enable = true;
system.enable = true;
}; };
}; };
} }

View file

@ -7,10 +7,10 @@
let let
name = "lix"; name = "lix";
cfg = config.nixowos.system.${name}; cfg = config.nixowos.defaults.${name};
in in
{ {
options.nixowos.system.${name} = { options.nixowos.defaults.${name} = {
enable = lib.mkEnableOption name; enable = lib.mkEnableOption name;
}; };

View file

@ -7,10 +7,10 @@
let let
name = "nix"; name = "nix";
cfg = config.nixowos.system.${name}; cfg = config.nixowos.defaults.${name};
in in
{ {
options.nixowos.system.${name} = { options.nixowos.defaults.${name} = {
enable = lib.mkEnableOption name; enable = lib.mkEnableOption name;
}; };

View file

@ -7,16 +7,10 @@
let let
name = "system"; name = "system";
cfg = config.nixowos.${name}; cfg = config.nixowos.defaults.${name};
in in
{ {
imports = [ options.nixowos.defaults.${name} = {
./lix.nix
./nix.nix
./luks.nix
];
options.nixowos.${name} = {
enable = lib.mkEnableOption name; enable = lib.mkEnableOption name;
extraPackages = lib.mkOption { extraPackages = lib.mkOption {
@ -28,11 +22,6 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
nixowos.${name} = lib.mkDefault {
lix.enable = true;
nix.enable = true;
luks.enable = true;
};
environment.systemPackages = cfg.extraPackages; environment.systemPackages = cfg.extraPackages;