theming: catppuccin all over the place

home-manager/modules/bat/default.nix

@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
 with lib;
 let
   cfg = config.eboskma.programs.bat;
@@ -11,8 +16,19 @@ in
   config = mkIf cfg.enable {
     programs.bat = {
       enable = true;
+      themes = {
+        catppuccin = {
+          src = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "bat";
+            rev = "b19bea35a85a32294ac4732cad5b0dc6495bed32";
+            sha256 = "POoW2sEM6jiymbb+W/9DKIjDM1Buu1HAmrNP0yC2JPg=";
+          };
+          file = "themes/Catppuccin Mocha.tmTheme";
+        };
+      };
       config = {
-        theme = "Monokai Extended Bright";
+        theme = "catppuccin";
         pager = "less -FR";
         map-syntax = [ "*.heex:HTML (EEx)" ];
       };

home-manager/modules/emacs/config.org

@@ -409,15 +409,23 @@ I like the [[https://draculatheme.com][dracula theme]]
 #+begin_src emacs-lisp :tangle no
   (use-package dracula-theme
     :init
-    (load-theme 'dracula t))
+    (load-theme 'dracula :no-confirm))
 #+end_src
 
 [[https://github.com/belak/emacs-monokai-pro-theme][Monokai Pro]] is also pretty.
 
-#+begin_src emacs-lisp 
+#+begin_src emacs-lisp :tangle no
   (use-package monokai-pro-theme
     :init
-    (load-theme 'monokai-pro-spectrum t))
+    (load-theme 'monokai-pro-spectrum :no-confirm))
+#+end_src
+
+So is [[https://github.com/catppuccin/emacs][Catppuccin]]
+
+#+begin_src emacs-lisp
+  (use-package catppuccin-theme
+    :init
+    (load-theme 'catppuccin :no-confirm))
 #+end_src
 
 Set fonts.

home-manager/modules/neovim/config/init.lua

@@ -41,6 +41,9 @@ packer.startup(function()
   -- Monokai theme
   use 'tanvirtin/monokai.nvim'
 
+  -- Catppuccin theme
+  use { 'catppuccin/nvim', as = 'catppuccin' }
+
   -- Airline
   use 'vim-airline/vim-airline'
   use 'vim-airline/vim-airline-themes'

home-manager/modules/neovim/config/lua/settings.lua

@@ -36,13 +36,15 @@ local api = vim.api
 -- ]]]
 
 -- Theme [[[
-  cmd 'colorscheme monokai'
+  -- cmd 'colorscheme monokai'
-  o.termguicolors = true
+  -- o.termguicolors = true
-  o.background = 'dark'
+  -- o.background = 'dark'
+  cmd 'colorscheme catppuccin'
 -- ]]]
 
 -- Airline [[[
-  g.airline_theme = 'molokai'
+  -- g.airline_theme = 'molokai'
+  g.airline_theme = 'catppuccin'
   g.airline_powerline_fonts = 1
 -- ]]]
 

home-manager/modules/tmux/default.nix

@@ -25,18 +25,39 @@ in
         sensible
         tmux-fzf
         {
-          plugin = dracula;
+          plugin = catppuccin;
           extraConfig = ''
-            set -g @dracula-refresh-rate 10
+            set -g @catppuccin_window_left_separator "█"
-            set -g @dracula-show-powerline true
+            set -g @catppuccin_window_right_separator "█ "
-            set -g @dracula-show-fahrenheit false
+            set -g @catppuccin_window_number_position "right"
-            set -g @dracula-show-left-icon session
+            set -g @catppuccin_window_middle_separator "  █"
-            set -g @dracula-network-bandwith "enp4s0"
+
-            set -g @dracula-military-time true
+            set -g @catppuccin_window_default_fill "number"
-            set -g @dracula-day-month true
+
-            set -g @dracula-plugins "time cpu-usage ram-usage network network-bandwith"
+            set -g @catppuccin_window_current_fill "number"
+            set -g @catppuccin_window_current_text "#{pane_current_path}"
+
+            set -g @catppuccin_status_modules_right "application session date_time"
+            set -g @catppuccin_status_left_separator  ""
+            set -g @catppuccin_status_right_separator " "
+            set -g @catppuccin_status_right_separator_inverse "yes"
+            set -g @catppuccin_status_fill "all"
+            set -g @catppuccin_status_connect_separator "no"
           '';
         }
+        # {
+        #   plugin = dracula;
+        #   extraConfig = ''
+        #     set -g @dracula-refresh-rate 10
+        #     set -g @dracula-show-powerline true
+        #     set -g @dracula-show-fahrenheit false
+        #     set -g @dracula-show-left-icon session
+        #     set -g @dracula-network-bandwith "enp4s0"
+        #     set -g @dracula-military-time true
+        #     set -g @dracula-day-month true
+        #     set -g @dracula-plugins "time cpu-usage ram-usage network network-bandwith"
+        #   '';
+        # }
       ];
 
       extraConfig = ''

users/erwin/home.nix

@@ -11,11 +11,6 @@ let
   homeCfg = config.home-manager.users.erwin;
   bt = config.eboskma.bluetooth;
 
-  gtkTheme = {
-    name = "io.elementary.stylesheet.slate";
-    package = pkgs.pantheon.elementary-gtk-theme;
-  };
-
   ewwDaemon =
     let
       path = lib.makeBinPath (
@@ -265,8 +260,8 @@ in
           ]);
 
         pointerCursor = {
-          name = "elementary";
+          name = "Catppuccin-Mocha-Dark-Cursors";
-          package = gtkTheme.package;
+          package = pkgs.catppuccin-cursors.mochaDark;
           gtk.enable = true;
           x11.enable = true;
         };
@@ -313,10 +308,10 @@ in
           createDirectories = true;
         };
 
-        configFile."gtk-4.0/gtk.css" = lib.mkForce {
+        configFile = {
-          text = ''
+          "gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets";
-            @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
+          "gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css";
-          '';
+          "gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css";
         };
       };
 
@@ -337,7 +332,17 @@ in
 
       gtk = {
         enable = true;
-        theme = gtkTheme;
+        theme = {
+          name = "Catppuccin-Mocha-Compact-Dark";
+          package = pkgs.catppuccin-gtk.override {
+            size = "compact";
+            tweaks = [
+              "rimless"
+              "black"
+            ];
+            variant = "mocha";
+          };
+        };
 
         iconTheme = {
           name = "elementary";
@@ -348,13 +353,13 @@ in
           bookmarks = [ "file:///home/erwin/workspace" ];
           extraConfig = {
             gtk-application-prefer-dark-theme = 1;
-            gtk-cursor-theme-name = "elementary";
+            gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
           };
         };
 
         gtk4.extraConfig = {
           gtk-application-prefer-dark-theme = 1;
-          gtk-cursor-theme-name = "elementary";
+          gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
         };
       };
 

users/erwin/work.nix

@@ -9,11 +9,6 @@ with lib;
 let
   cfg = config.eboskma.users.erwin;
 
-  gtkTheme = {
-    name = "io.elementary.stylesheet.slate";
-    package = pkgs.pantheon.elementary-gtk-theme;
-  };
-
   ewwDaemon =
     let
       path = lib.makeBinPath (
@@ -305,8 +300,8 @@ in
           ]);
 
         pointerCursor = {
-          name = "elementary";
+          name = "Catppuccin-Mocha-Dark-Cursors";
-          package = gtkTheme.package;
+          package = pkgs.catppuccin-cursors.mochaDark;
           gtk.enable = true;
           x11.enable = true;
         };
@@ -348,10 +343,10 @@ in
           createDirectories = true;
         };
 
-        configFile."gtk-4.0/gtk.css" = lib.mkForce {
+        configFile = {
-          text = ''
+          "gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets";
-            @import url("file://${gtkTheme.package}/share/themes/${gtkTheme.name}/gtk-4.0/gtk-dark.css");
+          "gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css";
-          '';
+          "gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css";
         };
       };
 
@@ -363,7 +358,17 @@ in
 
       gtk = {
         enable = true;
-        theme = gtkTheme;
+        theme = {
+          name = "Catppuccin-Mocha-Compact-Dark";
+          package = pkgs.catppuccin-gtk.override {
+            size = "compact";
+            tweaks = [
+              "rimless"
+              "black"
+            ];
+            variant = "mocha";
+          };
+        };
 
         iconTheme = {
           name = "elementary";
@@ -374,14 +379,14 @@ in
           bookmarks = [ "file:///home/erwin/workspace" ];
           extraConfig = {
             gtk-application-prefer-dark-theme = 1;
-            # gtk-cursor-theme-name = "elementary";
+            gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
           };
         };
 
         gtk4 = {
           extraConfig = {
             gtk-application-prefer-dark-theme = 1;
-            # gtk-cursor-theme-name = "elementary";
+            gtk-cursor-theme-name = "Catppuccin-Mocha-Dark-Cursors";
           };
         };
       };