From c56e355895852caa928ebbaea92ca0c2db630394 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Thu, 16 May 2024 22:13:09 +0100
Subject: [PATCH] Shell updates

zsh: remove oh-my-zsh, update syntax highlighters

Remove carapace

Add some more symbols to starship config
---
 programs/shell/default.nix | 70 ++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/programs/shell/default.nix b/programs/shell/default.nix
index 1f2ff39..7a65371 100644
--- a/programs/shell/default.nix
+++ b/programs/shell/default.nix
@@ -24,7 +24,6 @@
       enable = true;
       config.theme = "catppuccinMocha";
     };
-    carapace.enable = true;
     eza = {
       enable = true;
       enableAliases = true;
@@ -32,13 +31,6 @@
       icons = true;
       extraOptions = ["--octal-permissions"];
     };
-    readline = {
-      enable = true;
-      includeSystemConfig = true;
-      extraConfig = ''
-        set completion-ignore-case On
-      '';
-    };
     direnv = {
       enable = true;
       nix-direnv.enable = true;
@@ -92,6 +84,7 @@
       enableTransience = true;
       settings = {
         add_newline = false;
+        c = {symbol = " ";};
         character = {
           success_symbol = "[󰁔 ](bold green)";
           error_symbol = "[󰁔 ](bold red)";
@@ -136,12 +129,45 @@
         jobs = {symbol = "󰈏 ";};
         line_break = {disabled = false;};
         localip = {disabled = false;};
+        lua = {symbol = " ";};
         memory_usage = {disabled = false;};
+        nodejs = {symbol = " ";};
         os = {
           disabled = false;
           format = "on [$symbol]($style) ";
+          symbols = {
+            Alpine = " ";
+            Arch = " ";
+            Artix = " ";
+            CentOS = " ";
+            Debian = " ";
+            EndeavourOS = " ";
+            Fedora = " ";
+            FreeBSD = " ";
+            Gentoo = " ";
+            Illumos = " ";
+            Linux = " ";
+            Macos = " ";
+            Manjaro = " ";
+            Mint = " ";
+            NixOS = " ";
+            OpenBSD = " ";
+            openSUSE = " ";
+            Pop = " ";
+            Raspbian = " ";
+            Redhat = " ";
+            RedHatEnterprise = " ";
+            Solus = " ";
+            SUSE = " ";
+            Ubuntu = " ";
+            Unknown = " ";
+            Windows = " ";
+          };
+        };
+        python = {
+          python_binary = "python3";
+          symbol = " ";
         };
-        python = {python_binary = "python3";};
         shell = {
           disabled = false;
           format = "using [$indicator ]($style)";
@@ -164,32 +190,34 @@
       enable = true;
       enableCompletion = true;
       enableAutosuggestions = true;
-      syntaxHighlighting.enable = true;
       enableVteIntegration = true;
       autocd = true;
+      defaultKeymap = "emacs";
+      syntaxHighlighting = {
+        enable = true;
+        highlighters = ["brackets" "cursor"];
+      };
       historySubstringSearch.enable = true;
       history = {
         extended = true;
+        share = true;
         ignoreDups = true;
+        ignoreAllDups = true;
         ignoreSpace = true;
+        expireDuplicatesFirst = true;
       };
       shellAliases = {
         nixos-upgrade = "systemctl start nixos-upgrade.service";
         nixos-status = "systemctl status nixos-upgrade.service";
       };
-      oh-my-zsh = {
-        enable = true;
-        plugins = ["colored-man-pages" "lol" "rand-quote"];
-        theme = "";
-      };
-      completionInit = ''
-        autoload -Uz +X compinit && compinit
+      initExtra = ''
+        ## completion config and styling
+        zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+        zstyle ':completion:*' menu 'select=long-list'
 
-        ## case insensitive path-completion
-        zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
-        zstyle ':completion:*' menu select
+        ## transient prompt
+        source ${./transient.zsh}
       '';
-      initExtra = "source ${./transient.zsh}\n";
     };
   };
 }