Use catppuccin-mocha

simonrw · Sep 19, 2024 · 9421166 · 9421166
1 parent 9396017
commit 9421166
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/home/colours.nix b/home/colours.nix
@@ -1047,6 +1047,19 @@
           ];
           delta.options.features = "catppuccin-macchiato";
         };
+      catppuccin-mocha =
+        if cfg.delta.diff-so-fancy
+        then {
+          delta.options.diff-so-fancy = true;
+        }
+        else {
+          includes = [
+            {
+              path = "${inputs.catppuccin-delta}/catppuccin.gitconfig";
+            }
+          ];
+          delta.options.features = "catppuccin-mocha";
+        };
     }
     .${cfg.theme};
 

diff --git a/home/home.nix b/home/home.nix
@@ -100,7 +100,7 @@ in {
         enable = true;
         enableFishIntegration = true;
       };
-      theme = "catppuccin-macchiato";
+      theme = "catppuccin-mocha";
       vscode-theme = "Dracula";
       defaults = {
         browser = "brave";

diff --git a/home/nixvim/base.nix b/home/nixvim/base.nix
@@ -1,4 +1,5 @@
-{pkgs, ...}: let
+{pkgs, ...}: 
+let
   keymap = {
     key,
     action,
@@ -11,6 +12,29 @@
       silent = true;
     };
   };
+
+# TOOD: unify with home configuration
+colour-theme = "catppuccin-mocha";
+
+theme-lua = {
+  catppuccin-macchiato = ''
+    -- remove underline from bottom of highlight section
+    vim.cmd([[
+      set background=dark
+      colorscheme catppuccin-macchiato
+    ]])
+    vim.cmd.highlight({ 'TreesitterContextBottom', 'gui=none' })
+    '';
+  catppuccin-mocha = ''
+    -- remove underline from bottom of highlight section
+    vim.cmd([[
+      set background=dark
+      colorscheme catppuccin-mocha
+    ]])
+    vim.cmd.highlight({ 'TreesitterContextBottom', 'gui=none' })
+    '';
+  }.${colour-theme};
+
 in {
   editorconfig.enable = false;
   opts = {
@@ -259,14 +283,7 @@ in {
     nvim-nio
     catppuccin-nvim
   ];
-  extraConfigLua = ''
-    -- remove underline from bottom of highlight section
-    vim.cmd([[
-      set background=dark
-      colorscheme catppuccin-macchiato
-    ]])
-    vim.cmd.highlight({ 'TreesitterContextBottom', 'gui=none' })
-  '';
+  extraConfigLua = theme-lua;
   extraFiles = {
     "colors/lucius.vim".source = ./colors/lucius.vim;
     "colors/srw256.vim".source = ./colors/srw256.vim;