chore(theme): switch back to Catppuccin

Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>

config/fish/themes/Catppuccin Latte.theme

@@ -0,0 +1,30 @@
+# name: 'Catppuccin Latte'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: eff1f5
+
+fish_color_normal 4c4f69
+fish_color_command 1e66f5
+fish_color_param dd7878
+fish_color_keyword d20f39
+fish_color_quote 40a02b
+fish_color_redirection ea76cb
+fish_color_end fe640b
+fish_color_comment 8c8fa1
+fish_color_error d20f39
+fish_color_gray 9ca0b0
+fish_color_selection --background=ccd0da
+fish_color_search_match --background=ccd0da
+fish_color_option 40a02b
+fish_color_operator ea76cb
+fish_color_escape e64553
+fish_color_autosuggestion 9ca0b0
+fish_color_cancel d20f39
+fish_color_cwd df8e1d
+fish_color_user 179299
+fish_color_host 1e66f5
+fish_color_host_remote 40a02b
+fish_color_status d20f39
+fish_pager_color_progress 9ca0b0
+fish_pager_color_prefix ea76cb
+fish_pager_color_completion 4c4f69
+fish_pager_color_description 9ca0b0

config/fish/themes/Catppuccin Mocha.theme

@@ -0,0 +1,30 @@
+# name: 'Catppuccin Mocha'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 1e1e2e
+
+fish_color_normal cdd6f4
+fish_color_command 89b4fa
+fish_color_param f2cdcd
+fish_color_keyword f38ba8
+fish_color_quote a6e3a1
+fish_color_redirection f5c2e7
+fish_color_end fab387
+fish_color_comment 7f849c
+fish_color_error f38ba8
+fish_color_gray 6c7086
+fish_color_selection --background=313244
+fish_color_search_match --background=313244
+fish_color_option a6e3a1
+fish_color_operator f5c2e7
+fish_color_escape eba0ac
+fish_color_autosuggestion 6c7086
+fish_color_cancel f38ba8
+fish_color_cwd f9e2af
+fish_color_user 94e2d5
+fish_color_host 89b4fa
+fish_color_host_remote a6e3a1
+fish_color_status f38ba8
+fish_pager_color_progress 6c7086
+fish_pager_color_prefix f5c2e7
+fish_pager_color_completion cdd6f4
+fish_pager_color_description 6c7086

config/nvim/lua/plugins/ui.lua

@@ -1,31 +1,112 @@
 return {
   {
-    'neanias/everforest-nvim',
+    'catppuccin/nvim',
-    version = false,
+    name = 'catppuccin',
-    lazy = false,
+    priority = 1000,
-    priority = 1000, -- make sure to load this before all the other start plugins
     config = function()
-      require('everforest').setup {
+      require('catppuccin').setup {
-        background = 'medium', -- hard, medium, soft
+        flavour = 'auto', -- latte, frappe, macchiato, mocha
-        transparent_background_level = 2, -- 0, 1, 2
+        background = { -- :h background
-        sign_column_background = 'grey', -- none, grey
+          light = 'latte',
-        disable_italic_comments = false,
+          dark = 'mocha',
-        diagnostic_virtual_text = 'coloured', -- coloured, gray, underline, none
+        },
-        diagnostic_line_highlight = true,
+        transparent_background = false,
-        diagnostic_line_highlight_background = 'dimmed', -- dimmed, normal
+        float = {
-        diagnostic_text_highlight = true,
+          transparent = true, -- enable transparent floating windows
-        ui_contrast = 'low', -- high, low
+          solid = false, -- use solid styling for floating windows, see |winborder|
-        italics = true,
+        },
-        spell_foreground = true,
+        show_end_of_buffer = false, -- shows the '~' characters after the end of buffers
-        show_eob = true,
+        term_colors = false, -- sets terminal colors (e.g. `g:terminal_color_0`)
-        colours_override = function() end,
+        dim_inactive = {
-        float_style = 'dim',
+          enabled = true, -- dims the background color of inactive window
-        on_highlights = function(_, _) end,
+          shade = 'dark',
-        dim_inactive_windows = true,
+          percentage = 0.15, -- percentage of the shade to apply to the inactive window
-        inlay_hints_background = 'dimmed',
+        },
+        no_italic = false, -- Force no italic
+        no_bold = false, -- Force no bold
+        no_underline = false, -- Force no underline
+        styles = { -- Handles the styles of general hi groups (see `:h highlight-args`):
+          comments = { 'italic' }, -- Change the style of comments
+          conditionals = { 'italic' },
+          loops = {},
+          functions = {},
+          keywords = {},
+          strings = {},
+          variables = {},
+          numbers = {},
+          booleans = {},
+          properties = {},
+          types = {},
+          operators = {},
+          -- miscs = {}, -- Uncomment to turn off hard-coded styles
+        },
+        lsp_styles = { -- Handles the style of specific lsp hl groups (see `:h lsp-highlight`).
+          virtual_text = {
+            errors = { 'italic' },
+            hints = { 'italic' },
+            warnings = { 'italic' },
+            information = { 'italic' },
+            ok = { 'italic' },
+          },
+          underlines = {
+            errors = { 'underline' },
+            hints = { 'underline' },
+            warnings = { 'underline' },
+            information = { 'underline' },
+            ok = { 'underline' },
+          },
+          inlay_hints = {
+            background = true,
+          },
+        },
+        color_overrides = {},
+        custom_highlights = {},
+        default_integrations = true,
+        auto_integrations = false,
+        integrations = {
+          cmp = true,
+          gitsigns = true,
+          nvimtree = true,
+          notify = false,
+          mini = {
+            enabled = true,
+            indentscope_color = '',
+          },
+          -- For more plugins integrations please scroll down (https://github.com/catppuccin/nvim#integrations)
+        },
       }
+
+      -- setup must be called before loading
+      vim.cmd.colorscheme 'catppuccin'
     end,
   },
+  -- {
+  --   'neanias/everforest-nvim',
+  --   version = false,
+  --   lazy = false,
+  --   priority = 1000, -- make sure to load this before all the other start plugins
+  --   config = function()
+  --     require('everforest').setup {
+  --       background = 'medium', -- hard, medium, soft
+  --       transparent_background_level = 2, -- 0, 1, 2
+  --       sign_column_background = 'grey', -- none, grey
+  --       disable_italic_comments = false,
+  --       diagnostic_virtual_text = 'coloured', -- coloured, gray, underline, none
+  --       diagnostic_line_highlight = true,
+  --       diagnostic_line_highlight_background = 'dimmed', -- dimmed, normal
+  --       diagnostic_text_highlight = true,
+  --       ui_contrast = 'low', -- high, low
+  --       italics = true,
+  --       spell_foreground = true,
+  --       show_eob = true,
+  --       colours_override = function() end,
+  --       float_style = 'dim',
+  --       on_highlights = function(_, _) end,
+  --       dim_inactive_windows = true,
+  --       inlay_hints_background = 'dimmed',
+  --     }
+  --   end,
+  -- },
 
   -- Automatic dark mode
   -- https://github.com/f-person/auto-dark-mode.nvim
@@ -60,37 +141,37 @@ return {
 
   -- Remove all background colors to make nvim transparent
   -- https://github.com/xiyaowong/nvim-transparent
-  {
+  -- {
-    'xiyaowong/nvim-transparent',
+  --   'xiyaowong/nvim-transparent',
-    lazy = false,
+  --   lazy = false,
-    enabled = true,
+  --   enabled = true,
-    config = function()
+  --   config = function()
-      local t = require 'transparent'
+  --     local t = require 'transparent'
-      t.setup {
+  --     t.setup {
-        extra_groups = {
+  --       extra_groups = {
-          'NormalNC',
+  --         'NormalNC',
-          'NormalFloat',
+  --         'NormalFloat',
-          'EndOfBuffer',
+  --         'EndOfBuffer',
-          'FloatTitle',
+  --         'FloatTitle',
-          'FloatBorder',
+  --         'FloatBorder',
-          'NotifyDEBUGBorder',
+  --         'NotifyDEBUGBorder',
-          'NotifyERRORBorder',
+  --         'NotifyERRORBorder',
-          'NotifyINFOBorder',
+  --         'NotifyINFOBorder',
-          'NotifyINFOBorder73',
+  --         'NotifyINFOBorder73',
-          'NotifyINFOBorder75',
+  --         'NotifyINFOBorder75',
-          'NotifyINFOBorder101',
+  --         'NotifyINFOBorder101',
-          'NotifyTRACEBorder',
+  --         'NotifyTRACEBorder',
-          'NotifyWARNBorder',
+  --         'NotifyWARNBorder',
-          'NotifyBackground',
+  --         'NotifyBackground',
-          'TelescopeBorder',
+  --         'TelescopeBorder',
-          'TelescopePromptBorder',
+  --         'TelescopePromptBorder',
-          'TelescopeResultsBorder',
+  --         'TelescopeResultsBorder',
-          'TelescopePreviewBorder',
+  --         'TelescopePreviewBorder',
-        },
+  --       },
-      }
+  --     }
-      t.clear_prefix 'NeoTree'
+  --     t.clear_prefix 'NeoTree'
-    end,
+  --   end,
-  },
+  -- },
 
   -- Display a character as the colorcolumn
   -- https://github.com/lukas-reineke/virt-column.nvim

config/tmux/theme-dark.conf

@@ -1,46 +1,3 @@
-# Everforest dark theme for tmux
+set -g @catppuccin_flavor "mocha"
-# Generated from template - do not edit manually
+set -g @catppuccin_window_status_style "basic"
 
-# Enable proper color support
-set -g default-terminal "tmux-256color"
-set -as terminal-features ",*:RGB"
-
-set -g pane-border-style            "bg=default,fg=#859289"
-set -g pane-active-border-style     "bg=default,fg=#a7c080"
-
-# Window tabs
-set -g window-style                 "bg=default,fg=default,dim"
-set -g window-status-style          "bg=default,fg=default,dim"
-set -g window-status-current-style  "bg=default,fg=#d3c6aa"
-set -g window-status-activity-style "bg=default,fg=#dbbc7f,nodim"
-set -g window-status-bell-style     "bg=default,fg=yellow,nodim"
-set -g window-status-last-style     "bg=default,fg=#a7c080"
-set -g window-status-format         " #I:#W "
-
-# Messages
-set -g message-style                "bg=default,fg=#d3c6aa"
-set -g message-command-style        "bg=default,fg=#d3c6aa"
-
-# Status bar
-set -g status-style                 "bg=default,fg=default"
-set -g status-left                  " #[default]"
-set -g status-right                 " #[fg=#a7c080]#S@#[fg=#859289]#h #[fg=#7fbbb3]%H:%M #[fg=#dbbc7f]%d.%m "
-set -g status-left-style            "bg=default,fg=white"
-set -g status-right-style           "bg=default,fg=white"
-
-set -g menu-style                   "bg=default,fg=white"
-set -g menu-selected-style          "bg=default,fg=#a7c080"
-set -g menu-border-style            "fg=#a7c080"
-set -g menu-border-lines            "single"
-
-set -g popup-style                  "bg=default,fg=white"
-set -g popup-border-style           "fg=#a7c080"
-set -g popup-border-lines           "single"
-
-set -g display-panes-colour         "blue"
-set -g display-panes-active-colour  "red"
-set -g display-panes-time           1000 # milliseconds
-
-set -g pane-border-indicators       "arrows"
-set -g pane-border-lines            "single"
-set -g clock-mode-style             "24"

config/tmux/theme-light.conf

@@ -1,6 +1,2 @@
-set-option -g status-style 'fg=#4c4f69,bg=default'
+set -g @catppuccin_flavor "latte"
-set-window-option -g window-status-style 'fg=#4c4f69,bg=default dim'
+set -g @catppuccin_window_status_style "basic"
-set-window-option -g window-status-current-style 'fg=#8839ef,bg=default'
-set-window-option -g window-status-activity-style 'fg=#4c4f69,bg=default nodim'
-set-window-option -g window-status-bell-style 'fg=#4c4f69,bg=default'
-set -g message-style 'fg=#8839ef bg=#e6e9ef bold' # fg magenta, bg black

config/tmux/tmux.conf

@@ -18,6 +18,10 @@
 set -ag terminal-overrides ",xterm-256color:RGB"
 set -ag terminal-features 'xterm-256color:RGB'
 
+# Enable proper color support
+set -g default-terminal "tmux-256color"
+set -as terminal-features ",*:RGB"
+
 set -g default-terminal "tmux-256color" # Set default terminal to 256 colors
 set -g detach-on-destroy off            # don't detach tmux when killing a session
 set -g display-time 0                   # Hide clock
@@ -51,17 +55,15 @@ if-shell '[ "$DEBUG" = "1" ]' 'set -g debug-file ~/.cache/tmux-debug.log'
 #  │ Theme                                                    │
 #  ╰──────────────────────────────────────────────────────────╯
 
-set -g pane-active-border-style "bg=default,fg=#7aa2f7"
-set -g pane-border-style "bg=default,fg=#31748f"
-set -g status-style "bg=default"
 set -g status-justify "left"
 set -g status-left ''
 set -g status-left-length "0"
 set -g status-position "bottom"
 set -g status-right "#S@#h #{tmux_mode_indicator}"
-set -g status-right-length "30"
+set -g status-right-length "50"
 set -g window-status-current-format ' #I:#W#{?window_zoomed_flag, ◈ ,} '
 set -g window-status-format ' #I:#W '
+set -g @catppuccin_status_background 'none'
 
 #  ╭──────────────────────────────────────────────────────────╮
 #  │ Bindings                                                 │
@@ -142,7 +144,7 @@ bind-key "N" display-popup -E "sesh ui"
 ##  A plugin to name your tmux windows smartly.
 ## https://github.com/ofirgall/tmux-window-name
 ### Maximum name length of a window
-set -g @tmux_window_name_max_name_len "20"
+set -g @tmux_window_name_max_name_len "25"
 ### Replace $HOME with ~ in window names
 set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
 set -g @tmux_window_name_ignored_programs "['sqlite3', 'antidote', 'direnv', 'md5']" # Default is []
@@ -189,5 +191,6 @@ run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-current-pane-hostname/curren
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-fzf-url/fzf-url.tmux"
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-resurrect/resurrect.tmux"
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-continuum/continuum.tmux"
+run-shell "$HOME/.dotfiles/config/tmux/plugins/catppuccin/tmux/catppuccin.tmux"
 
 run-shell "$HOME/.dotfiles/config/tmux/plugins/tmux-dark-notify/main.tmux"

config/wezterm/wezterm.lua

@@ -66,9 +66,11 @@ config.scrollback_lines = 3000
 -- Function to detect the theme based on appearance
 function Scheme_for_appearance(appearance)
   if appearance:find 'Dark' then
-    return 'Everforest Dark (Medium)'
+    return 'Catppuccin Mocha'
+    -- return 'Everforest Dark (Medium)'
   else
-    return 'Everforest Light (Medium)'
+    return 'Catppuccin Latte'
+    -- return 'Everforest Light (Medium)'
   end
 end