3 files changed, 43 insertions, 36 deletions
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index fc6ae12..8d63dfc 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -5,19 +5,9 @@
   inputs,
   ...
 }:
-let
-  cfg = config.seth.programs;
-in
 {
-  options.seth.programs = {
-    basePrograms.enable = lib.mkEnableOption "base programs and configurations" // {
-      default = config.seth.enable;
-    };
-  };
-
-  imports = with inputs; [
-    catppuccin.homeManagerModules.catppuccin
-    nix-index-database.hmModules.nix-index
+  imports = [
+    inputs.nix-index-database.hmModules.nix-index
 
     ./bash.nix
     ./chromium.nix
@@ -39,39 +29,26 @@ in
     ./zsh.nix
   ];
 
-  config = lib.mkIf cfg.basePrograms.enable {
-    home.packages = with pkgs; [
-      fd
-      nix-output-monitor
-      nurl
-      rclone
-      restic
-    ];
-
-    catppuccin = {
-      enable = true;
-      flavor = "mocha";
-    };
-
+  config = lib.mkIf config.seth.enable {
     programs = {
-      bat.enable = true;
-      btop.enable = true;
-
-      eza = {
-        enable = true;
-        icons = "auto";
-      };
+      bat.enable = lib.mkDefault true;
+      btop.enable = lib.mkDefault true;
 
       direnv = {
-        enable = true;
+        enable = lib.mkDefault true;
         nix-direnv = {
           enable = true;
-          package = pkgs.nix-direnv.override { nix = pkgs.lix; };
+          package = lib.mkDefault (pkgs.nix-direnv.override { nix = pkgs.lix; });
         };
       };
 
-      ripgrep.enable = true;
+      eza = {
+        enable = lib.mkDefault true;
+        icons = "auto";
+      };
 
+      fd.enable = lib.mkDefault true;
+      ripgrep.enable = lib.mkDefault true;
       nix-index-database.comma.enable = true;
     };
 
diff --git a/users/seth/tweaks/catppuccin.nix b/users/seth/tweaks/catppuccin.nix
new file mode 100644
index 0000000..2b84ba3
--- /dev/null
+++ b/users/seth/tweaks/catppuccin.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  lib,
+  inputs,
+  ...
+}:
+let
+  cfg = config.seth.tweaks.catppuccin;
+in
+{
+  options.seth.tweaks.catppuccin = {
+    enable = lib.mkEnableOption "catppuccin themeing" // {
+      default = config.seth.enable;
+      defaultText = "config.seth.enable";
+    };
+  };
+
+  imports = [
+    inputs.catppuccin.homeManagerModules.catppuccin
+  ];
+
+  config = lib.mkIf cfg.enable {
+    catppuccin = {
+      enable = true;
+      accent = "mavue";
+      flavor = "mocha";
+    };
+  };
+}
diff --git a/users/seth/tweaks/default.nix b/users/seth/tweaks/default.nix
index cb8f15c..6d4360e 100644
--- a/users/seth/tweaks/default.nix
+++ b/users/seth/tweaks/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
     ./adwaita-ize.nix
+    ./catppuccin.nix
   ];
 }