From 1ec692c24c5b3345e6d7fe1445f2a51b1e322f03 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Fri, 10 May 2024 21:03:13 -0400
Subject: seth: use global catppuccin.enable

---
 users/seth/shell/fish.nix |  3 +--
 users/seth/shell/zsh.nix  | 16 ++--------------
 2 files changed, 3 insertions(+), 16 deletions(-)

(limited to 'users/seth/shell')

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
@@ -84,18 +83,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;
@@ -121,7 +108,8 @@ in {
           }
         ];
 
-        enableSyntaxHighlighting = true;
+        autosuggestion.enable = true;
+        syntaxHighlighting.enable = true;
       })
     ];
   };
-- 
cgit v1.2.3