From 0123fe466f81165915a3d3ecc22b77bde0b0774f Mon Sep 17 00:00:00 2001 From: Alejandro Angulo Date: Sun, 2 Apr 2023 16:20:41 -0700 Subject: [PATCH] Added development suite --- modules/archetypes/workstation/default.nix | 3 ++- modules/suites/development/default.nix | 30 ++++++++++++++++++++++ systems/x86_64-linux/gospel/default.nix | 7 ----- 3 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 modules/suites/development/default.nix diff --git a/modules/archetypes/workstation/default.nix b/modules/archetypes/workstation/default.nix index 2b338b4..ab90ce7 100644 --- a/modules/archetypes/workstation/default.nix +++ b/modules/archetypes/workstation/default.nix @@ -15,8 +15,9 @@ in { config = mkIf cfg.enable { aa = { suites = { - utils.enable = true; desktop.enable = true; + development.enable = true; + utils.enable = true; }; }; }; diff --git a/modules/suites/development/default.nix b/modules/suites/development/default.nix new file mode 100644 index 0000000..51985df --- /dev/null +++ b/modules/suites/development/default.nix @@ -0,0 +1,30 @@ +{ + options, + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.aa.suites.development; +in { + options.aa.suites.development = with lib.types; { + enable = mkEnableOption "common configuration"; + }; + + config = mkIf cfg.enable { + aa = { + tools = { + git.enable = true; + gpg.enable = true; + zsh.enable = true; + exa.enable = true; + }; + + apps = { + neovim.enable = true; + tmux.enable = true; + }; + }; + }; +} diff --git a/systems/x86_64-linux/gospel/default.nix b/systems/x86_64-linux/gospel/default.nix index 6efa630..94dfc64 100644 --- a/systems/x86_64-linux/gospel/default.nix +++ b/systems/x86_64-linux/gospel/default.nix @@ -21,13 +21,6 @@ suites.gaming.enable = true; - tools.git.enable = true; - tools.gpg.enable = true; - tools.zsh.enable = true; - tools.exa.enable = true; - - apps.neovim.enable = true; - apps.tmux.enable = true; apps.yubikey.enable = true; services.openssh.enable = true;