seth: use global catppuccin.enable

6 files changed, 15 insertions, 59 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;
 
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix
index 0b37273..b20eb40 100644
--- a/users/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
@@ -15,7 +15,6 @@ in {
     programs.fish = lib.mkMerge [
       {
         enable = true;
-        catppuccin.enable = true;
 
         interactiveShellInit = ''
           set -l nixfile ${config.home.homeDirectory}/.nix-profile/etc/profile.d/nix.fish
@@ -39,7 +38,7 @@ in {
 
       (lib.mkIf cfg.withPlugins {
         plugins = let
-          mkFishPlugins = builtins.map (plugin: {
+          mkFishPlugins = map (plugin: {
             name = plugin;
             inherit (pkgs.fishPlugins.${plugin}) src;
           });
diff --git a/users/seth/shell/zsh.nix b/users/seth/shell/zsh.nix
index b3f31b9..4ce116a 100644
--- a/users/seth/shell/zsh.nix
+++ b/users/seth/shell/zsh.nix
@@ -15,7 +15,6 @@ in {
     programs.zsh = lib.mkMerge [
       {
         enable = true;
-        enableAutosuggestions = true;
 
         completionInit = ''
           autoload -Uz bashcompinit compinit
@@ -85,18 +84,6 @@ in {
       (lib.mkIf cfg.withPlugins {
         plugins = [
           {
-            name = "cattppuccin-zsh-syntax-highlighting";
-            src = pkgs.fetchFromGitHub {
-              owner = "catppuccin";
-              repo = "zsh-syntax-highlighting";
-              rev = "06d519c20798f0ebe275fc3a8101841faaeee8ea";
-              sha256 = "sha256-Q7KmwUd9fblprL55W0Sf4g7lRcemnhjh4/v+TacJSfo=";
-            };
-
-            file = "themes/catppuccin_mocha-zsh-syntax-highlighting.zsh";
-          }
-
-          {
             name = "nix-zsh-completions";
             src = pkgs.nix-zsh-completions;
             file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh";
@@ -121,7 +108,8 @@ in {
           }
         ];
 
-        enableSyntaxHighlighting = true;
+        autosuggestion.enable = true;
+        syntaxHighlighting.enable = true;
       })
     ];
   };