seth: modularize user setup

9 files changed, 17 insertions, 13 deletions

diff --git a/users/seth/module/programs/bat.nix b/users/seth/module/programs/bat.nix
index 267eb57..a046be2 100644
--- a/users/seth/module/programs/bat.nix
+++ b/users/seth/module/programs/bat.nix
@@ -6,7 +6,7 @@
   cfg = config.seth.programs.bat;
 in {
   options.seth.programs.bat = {
-    enable = lib.mkEnableOption "bat configuration" // {default = true;};
+    enable = lib.mkEnableOption "bat configuration" // {default = config.seth.enable;};
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/programs/default.nix b/users/seth/module/programs/default.nix
index 38556cf..bc18b6e 100644
--- a/users/seth/module/programs/default.nix
+++ b/users/seth/module/programs/default.nix
@@ -8,12 +8,16 @@
   cfg = config.seth.programs;
 in {
   options.seth.programs = {
-    basePrograms.enable = lib.mkEnableOption "Base programs and configurations" // {default = true;};
+    basePrograms.enable =
+      lib.mkEnableOption "base programs and configurations"
+      // {
+        default = config.seth.enable;
+      };
   };
 
-  imports = [
-    inputs.catppuccin.homeManagerModules.catppuccin
-    inputs.nix-index-database.hmModules.nix-index
+  imports = with inputs; [
+    catppuccin.homeManagerModules.catppuccin
+    nix-index-database.hmModules.nix-index
     ./bat.nix
     ./chromium.nix
     ./eza.nix
diff --git a/users/seth/module/programs/eza.nix b/users/seth/module/programs/eza.nix
index 32fd664..4dc07ee 100644
--- a/users/seth/module/programs/eza.nix
+++ b/users/seth/module/programs/eza.nix
@@ -6,7 +6,7 @@
   cfg = config.seth.programs.eza;
 in {
   options.seth.programs.eza = {
-    enable = lib.mkEnableOption "eza configuration" // {default = true;};
+    enable = lib.mkEnableOption "eza configuration" // {default = config.seth.enable;};
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/programs/git.nix b/users/seth/module/programs/git.nix
index 8ba6587..674b3c8 100644
--- a/users/seth/module/programs/git.nix
+++ b/users/seth/module/programs/git.nix
@@ -6,8 +6,8 @@
   cfg = config.seth.programs.git;
 in {
   options.seth.programs.git = {
-    enable = lib.mkEnableOption "Git configuration settings" // {default = true;};
-    gh.enable = lib.mkEnableOption "GitHub CLI support" // {default = true;};
+    enable = lib.mkEnableOption "Git configuration settings" // {default = config.seth.enable;};
+    gh.enable = lib.mkEnableOption "GitHub CLI support" // {default = cfg.enable;};
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/programs/gpg.nix b/users/seth/module/programs/gpg.nix
index b259525..b7b03c5 100644
--- a/users/seth/module/programs/gpg.nix
+++ b/users/seth/module/programs/gpg.nix
@@ -8,7 +8,7 @@
   cfg = config.seth.programs.gpg;
 in {
   options.seth.programs.gpg = {
-    enable = lib.mkEnableOption "GnuPG configuration" // {default = true;};
+    enable = lib.mkEnableOption "GnuPG configuration" // {default = config.seth.enable;};
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/programs/neovim.nix b/users/seth/module/programs/neovim.nix
index 8230c8d..c06d513 100644
--- a/users/seth/module/programs/neovim.nix
+++ b/users/seth/module/programs/neovim.nix
@@ -8,7 +8,7 @@
   cfg = config.seth.programs.neovim;
 in {
   options.seth.programs.neovim = {
-    enable = lib.mkEnableOption "Neovim configuration" // {default = true;};
+    enable = lib.mkEnableOption "Neovim configuration" // {default = config.seth.enable;};
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/programs/ssh.nix b/users/seth/module/programs/ssh.nix
index 48f167c..7872510 100644
--- a/users/seth/module/programs/ssh.nix
+++ b/users/seth/module/programs/ssh.nix
@@ -7,7 +7,7 @@
   cfg = config.seth.programs.ssh;
 in {
   options.seth.programs.ssh = {
-    enable = lib.mkEnableOption "SSH configuration" // {default = true;};
+    enable = lib.mkEnableOption "SSH configuration" // {default = config.seth.enable;};
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/programs/starship/default.nix b/users/seth/module/programs/starship/default.nix
index 8f6e78c..caad907 100644
--- a/users/seth/module/programs/starship/default.nix
+++ b/users/seth/module/programs/starship/default.nix
@@ -6,7 +6,7 @@
   cfg = config.seth.programs.starship;
 in {
   options.seth.programs.starship = {
-    enable = lib.mkEnableOption "Starship configuration" // {default = true;};
+    enable = lib.mkEnableOption "Starship configuration" // {default = config.seth.enable;};
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/programs/vim.nix b/users/seth/module/programs/vim.nix
index b8a198e..a67effa 100644
--- a/users/seth/module/programs/vim.nix
+++ b/users/seth/module/programs/vim.nix
@@ -7,7 +7,7 @@
   inherit (config.xdg) configHome dataHome stateHome;
 in {
   options.seth.programs.vim = {
-    enable = lib.mkEnableOption "Vim configuration" // {default = true;};
+    enable = lib.mkEnableOption "Vim configuration" // {default = config.seth.enable;};
   };
 
   config = lib.mkIf cfg.enable {