diff --git a/modules/archetypes/workstation/default.nix b/modules/archetypes/workstation/default.nix index 595565c..2b338b4 100644 --- a/modules/archetypes/workstation/default.nix +++ b/modules/archetypes/workstation/default.nix @@ -15,6 +15,7 @@ in { config = mkIf cfg.enable { aa = { suites = { + utils.enable = true; desktop.enable = true; }; }; diff --git a/modules/suites/utils/default.nix b/modules/suites/utils/default.nix new file mode 100644 index 0000000..6e6322c --- /dev/null +++ b/modules/suites/utils/default.nix @@ -0,0 +1,29 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.aa.suites.utils; +in { + options.aa.suites.utils = with lib.types; { + enable = mkEnableOption "common configuration"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + bat + curl + fd + file + htop + jq + killall + ripgrep + usbutils + wget + ]; + }; +} diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix index 2591718..6efa630 100644 --- a/systems/x86_64-linux/gospel/default.nix +++ b/systems/x86_64-linux/gospel/default.nix @@ -15,7 +15,10 @@ aa = { nix.enable = true; - suites.desktop.enable = true; + archetypes = { + workstation.enable = true; + }; + suites.gaming.enable = true; tools.git.enable = true; @@ -56,9 +59,6 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - wget - killall - usbutils pavucontrol cachix nixos-generators @@ -75,11 +75,7 @@ prusa-slicer esptool minicom - file signal-desktop - ripgrep - bat - htop ]; # This value determines the NixOS release from which the default