From 243c6008c65429d5dee7e16fe9a2237042ea1a3c Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Thu, 12 Mar 2026 20:20:26 -0600
Subject: [PATCH] de-catppuccining

---
 home-cli.nix  | 30 ++++++++++++++++++++++--------
 home-gui.nix  | 40 ++++++++++++++++++++--------------------
 home-nvim.nix | 22 ++--------------------
 3 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/home-cli.nix b/home-cli.nix
index 7fd475b..48a4288 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -16,7 +16,6 @@ in
   };
 
   imports = [
-    <catppuccin/modules/home-manager>
     nixvim.homeModules.nixvim
     ./home-nvim.nix
   ];
@@ -89,11 +88,6 @@ in
 
   xdg.enable = true;
 
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    zed.enable = false;
-  };
 
   programs.home-manager.enable = true;
 
@@ -117,12 +111,29 @@ in
       # open # highlight: o -> open; ctrl-o -> $EDITOR; S -> web search
       vim-tmux-navigator # ctrl-h, -j, -k, -l -> move between tmux and vim splits
       # extrakto # prefix tab -> fuzzy find text on screen; enter to copy; tab to paste
-      fingers # prefix F -> copy/open/edit items on screen by letter
+      # fingers # prefix F -> copy/open/edit items on screen by letter
     ];
     # Remove that SHELL thing when fixed upstream
     extraConfig = ''
       set -ag terminal-overrides ",xterm-256color:RGB"
       set -g default-command "$SHELL"
+
+      # Status bar - inherits terminal fg/bg so it follows light/dark mode
+      set -g status-style "bg=default,fg=default"
+      set -g status-justify centre
+      set -g status-left ""
+      set -g status-right ""
+      set -g window-status-format "  #I  "
+      set -g window-status-current-format "  #I  "
+      set -g window-status-current-style "bold,reverse"
+      set -g window-status-style "dim"
+
+      # Pane borders
+      set -g pane-border-style "fg=brightblack"
+      set -g pane-active-border-style "fg=white"
+
+      # Messages
+      set -g message-style "bg=default,fg=default,bold"
     '';
   };
 
@@ -159,7 +170,10 @@ in
   programs.nix-search-tv.enable = true;
   # programs.fzf.enable = true; # used by other apps, tmux, etc.
   programs.zoxide.enable = true;
-  programs.bat.enable = true;
+  programs.bat = {
+    enable = true;
+    config.theme = "ansi";
+  };
   programs.ripgrep.enable = true;
   programs.ripgrep-all.enable = true;
   programs.yazi.enable = true;
diff --git a/home-gui.nix b/home-gui.nix
index c41b663..41e68ae 100644
--- a/home-gui.nix
+++ b/home-gui.nix
@@ -31,35 +31,35 @@
       font-family = "Iosevka NFM";
       font-size = 12;
       font-thicken = true;
-      # theme = "dark:catppuccin-mocha,light:catppuccin-latte"; # TODO: waiting on all cli apps to handle auto switching too
-      theme = "catppuccin-mocha";
+      theme = "dark:One Half Dark,light:One Half Light";
       background-opacity = 0.95;
       background-blur-radius = 15;
       window-padding-x = 12;
       window-padding-y = 8;
       window-padding-balance = true;
       macos-titlebar-style = "tabs";
+      window-theme = "auto";
       macos-option-as-alt = "left";
       copy-on-select = "clipboard";
     };
   };
 
-  programs.zed-editor = {
-    enable = true;
-    userSettings = {
-      vim_mode = true;
-      theme = {
-        mode = "system";
-        light = "Catppuccin Latte";
-        dark = "Catppuccin Frappé";
-      };
-      buffer_font_size = 16;
-      buffer_font_family = "Iosevka Nerd Font Mono";
-      vim = {
-        enable_vim_sneak = true;
-        use_smartcase_find = true;
-      };
-      format_on_save = "off";
-    };
-  };
+  # programs.zed-editor = {
+  #   enable = true;
+  #   userSettings = {
+  #     vim_mode = true;
+  #     theme = {
+  #       mode = "system";
+  #       light = "Catppuccin Latte";
+  #       dark = "Catppuccin Frappé";
+  #     };
+  #     buffer_font_size = 16;
+  #     buffer_font_family = "Iosevka Nerd Font Mono";
+  #     vim = {
+  #       enable_vim_sneak = true;
+  #       use_smartcase_find = true;
+  #     };
+  #     format_on_save = "off";
+  #   };
+  # };
 }
diff --git a/home-nvim.nix b/home-nvim.nix
index b4d2350..ebc3284 100644
--- a/home-nvim.nix
+++ b/home-nvim.nix
@@ -8,10 +8,6 @@
     withNodeJs = true;
     withRuby = true;
 
-    colorschemes.catppuccin.enable = true;
-    colorschemes.catppuccin.settings.transparent_background = true;
-    colorschemes.catppuccin.settings.flavour = "auto";
-
     opts = {
       number = true;
       ignorecase = true;
@@ -91,7 +87,7 @@
       flash = {
         enable = true;
         settings.jump.autojump = true;
-        settings.modes.search.enabled = true;
+        # settings.modes.search.enabled = true;
       };
       gitsigns.enable = true;
       lazygit.enable = true;
@@ -144,6 +140,7 @@
         settings = {
           highlight = true;
           trim_on_write = false;
+          ft_blocklist = [ "dashboard" ];
         };
       };
       trouble.enable = true;
@@ -152,20 +149,5 @@
       web-devicons.enable = true;
       which-key.enable = true;
     };
-
-    # extraPlugins = [(pkgs.vimUtils.buildVimPlugin {
-    #   name = "vim-lumen";
-    #   src = pkgs.fetchFromGitHub {
-    #     owner = "f-person";
-    #     repo = "auto-dark-mode.nvim";
-    #     rev = "4531f8b2b09ed8f0b8875a706419f9cecda1d969";
-    #     hash = "sha256-JPoyRRwDJ9KOGWnqOEG4VkEX4rJHFhFYV3bwS9F2f9E=";
-    #   };
-    # })];
-
-    # extraConfigLua = ''
-    #   local auto_dark_mode = require('auto-dark-mode')
-    #   auto_dark_mode.setup()
-    # '';
   };
 }