seth: use global catppuccin.enable

4 files changed, 12 insertions, 43 deletions

diff --git a/users/seth/programs/bat.nix b/users/seth/programs/bat.nix
deleted file mode 100644
index a046be2..0000000
--- a/users/seth/programs/bat.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.seth.programs.bat;
-in {
-  options.seth.programs.bat = {
-    enable = lib.mkEnableOption "bat configuration" // {default = config.seth.enable;};
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.bat = {
-      enable = true;
-      catppuccin.enable = true;
-    };
-  };
-}
diff --git a/users/seth/programs/default.nix b/users/seth/programs/default.nix
index ad29b83..9fa1936 100644
--- a/users/seth/programs/default.nix
+++ b/users/seth/programs/default.nix
@@ -19,9 +19,7 @@ in {
     catppuccin.homeManagerModules.catppuccin
     nix-index-database.hmModules.nix-index
 
-    ./bat.nix
     ./chromium.nix
-    ./eza.nix
     ./firefox
     ./git.nix
     ./gpg.nix
@@ -42,12 +40,18 @@ in {
       restic
     ];
 
-    catppuccin.flavour = "mocha";
+    catppuccin = {
+      enable = true;
+      flavour = "mocha";
+    };
 
     programs = {
-      btop = {
+      bat.enable = true;
+      btop.enable = true;
+
+      eza = {
         enable = true;
-        catppuccin.enable = true;
+        icons = true;
       };
 
       direnv = {
@@ -55,8 +59,6 @@ in {
         nix-direnv.enable = true;
       };
 
-      glamour.catppuccin.enable = true;
-
       ripgrep.enable = true;
 
       nix-index-database.comma.enable = true;
diff --git a/users/seth/programs/eza.nix b/users/seth/programs/eza.nix
deleted file mode 100644
index 6280651..0000000
--- a/users/seth/programs/eza.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.seth.programs.eza;
-in {
-  options.seth.programs.eza = {
-    enable = lib.mkEnableOption "eza configuration" // {default = config.seth.enable;};
-  };
-
-  config = lib.mkIf cfg.enable {
-    programs.eza = {
-      enable = true;
-      icons = true;
-    };
-  };
-}
diff --git a/users/seth/programs/starship/default.nix b/users/seth/programs/starship/default.nix
index ca3a99b..b6082c1 100644
--- a/users/seth/programs/starship/default.nix
+++ b/users/seth/programs/starship/default.nix
@@ -13,6 +13,9 @@ in {
     programs.starship = {
       enable = true;
 
+      # i do this manually
+      catppuccin.enable = false;
+
       enableBashIntegration = false;
       enableZshIntegration = false;