users/foo-dogsquared/setups/research: move from programs namespace

It encompasses more than the programs themselves anyways.
This commit is contained in:
Gabriel Arazas 2024-09-03 18:12:46 +08:00
parent 6a0a697ffe
commit 95f24e424f
No known key found for this signature in database
GPG Key ID: 62104B43D00AA360
3 changed files with 4 additions and 4 deletions

View File

@ -20,7 +20,6 @@ in
nixvim.enable = true; nixvim.enable = true;
email.enable = true; email.enable = true;
email.thunderbird.enable = true; email.thunderbird.enable = true;
research.enable = true;
vs-code.enable = true; vs-code.enable = true;
custom-homepage = { custom-homepage = {
@ -49,6 +48,7 @@ in
fonts.enable = true; fonts.enable = true;
music.enable = true; music.enable = true;
music.mpd.enable = true; music.mpd.enable = true;
research.enable = true;
}; };
}; };

View File

@ -12,7 +12,6 @@
./programs/keys.nix ./programs/keys.nix
./programs/nixvim ./programs/nixvim
./programs/custom-homepage.nix ./programs/custom-homepage.nix
./programs/research.nix
./programs/shell.nix ./programs/shell.nix
./programs/terminal-multiplexer.nix ./programs/terminal-multiplexer.nix
./programs/vs-code.nix ./programs/vs-code.nix
@ -21,5 +20,6 @@
./setups/development.nix ./setups/development.nix
./setups/fonts.nix ./setups/fonts.nix
./setups/music.nix ./setups/music.nix
./setups/research.nix
]; ];
} }

View File

@ -2,10 +2,10 @@
let let
userCfg = config.users.foo-dogsquared; userCfg = config.users.foo-dogsquared;
cfg = userCfg.programs.research; cfg = userCfg.setups.research;
in in
{ {
options.users.foo-dogsquared.programs.research.enable = options.users.foo-dogsquared.setups.research.enable =
lib.mkEnableOption "foo-dogsquared's usual toolbelt for research"; lib.mkEnableOption "foo-dogsquared's usual toolbelt for research";
config = lib.mkIf cfg.enable (lib.mkMerge [ config = lib.mkIf cfg.enable (lib.mkMerge [