feat: Change theme from Catppuccin -> GitHub Dark

- Vim, Neovim, Kitty, VS Code, Ghostty, Zed

common/.config/Code/User/settings.json

@@ -30,15 +30,15 @@
     "explorer.confirmDragAndDrop": false,
 
     // Editor Typography
-    "editor.fontFamily": "FiraCode Nerd Font Mono",
+    "editor.fontFamily": "MonoLisa",
     "editor.fontLigatures": true,
-    "editor.fontSize": 15,
+    "editor.fontSize": 16,
-    "terminal.integrated.fontFamily": "FiraCode Nerd Font Mono",
+    "terminal.integrated.fontFamily": "MonoLisa",
-    "terminal.integrated.fontSize": 15,
+    "terminal.integrated.fontSize": 16,
 
     // Theme
     "workbench.iconTheme": "material-icon-theme",
-    "workbench.colorTheme": "Catppuccin Mocha",
+    "workbench.colorTheme": "GitHub Dark Dimmed",
     "workbench.colorCustomizations": {
         "tab.activeBackground": "#07f7af3f",
         "tab.activeBorder": "#ffffff",

common/.config/ghostty/config

@@ -37,7 +37,7 @@
 window-decoration = none
 background-opacity = 0.95
 background-blur = 70
-theme = catppuccin-mocha
+theme = GitHub-Dark-Dimmed
 window-theme = auto
 window-colorspace = display-p3
 

common/.config/kitty/current-theme.conf

@@ -1,80 +1,61 @@
 # vim:ft=kitty
 
-## name:     Catppuccin-Mocha
+## name: GitHub Dark Dimmed
-## author:   Pocco81 (https://github.com/Pocco81)
+## author: GitHub
 ## license: MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
+
-## blurb:    Soothing pastel theme for the high-spirited!
+#: The basic colors
+
+foreground #adbac7
+background #22272e
+selection_foreground #22272e
+selection_background #539bf5
 
 
+#: Cursor colors
 
-# The basic colors
+cursor #539bf5
-foreground              #CDD6F4
-background              #1E1E2E
-selection_foreground    #1E1E2E
-selection_background    #F5E0DC
 
-# Cursor colors
-cursor                  #F5E0DC
-cursor_text_color       #1E1E2E
 
-# URL underline color when hovering with mouse
+#: Tab bar colors
-url_color               #F5E0DC
 
-# Kitty window border colors
+tab_bar_background #1c2128
-active_border_color     #B4BEFE
+active_tab_foreground #adbac7
-inactive_border_color   #6C7086
+active_tab_background #22272e
-bell_border_color       #F9E2AF
+inactive_tab_foreground #768390
+inactive_tab_background #1c2128
 
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
 
-# Tab bar colors
+#: The basic 16 colors
-active_tab_foreground   #11111B
-active_tab_background   #CBA6F7
-inactive_tab_foreground #CDD6F4
-inactive_tab_background #181825
-tab_bar_background      #11111B
 
-# Colors for marks (marked text in the terminal)
+#: black
-mark1_foreground #1E1E2E
+color0 #545d68
-mark1_background #B4BEFE
+color8 #636e7b
-mark2_foreground #1E1E2E
-mark2_background #CBA6F7
-mark3_foreground #1E1E2E
-mark3_background #74C7EC
 
-# The 16 terminal colors
+#: red
+color1 #f47067
+color9 #ff938a
 
-# black
+#: green
-color0 #45475A
+color2 #57ab5a
-color8 #585B70
+color10 #6bc46d
 
-# red
+#: yellow
-color1 #F38BA8
+color3 #c69026
-color9 #F38BA8
+color11 #daaa3f
 
-# green
+#: blue
-color2  #A6E3A1
+color4 #539bf5
-color10 #A6E3A1
+color12 #6cb6ff
 
-# yellow
+#: magenta
-color3  #F9E2AF
+color5 #b083f0
-color11 #F9E2AF
+color13 #dcbdfb
 
-# blue
+#: cyan
-color4  #89B4FA
+color6 #39c5cf
-color12 #89B4FA
+color14 #56d4dd
 
-# magenta
+#: white
-color5  #F5C2E7
+color7 #909dab
-color13 #F5C2E7
+color15 #cdd9e5
-
-# cyan
-color6  #94E2D5
-color14 #94E2D5
-
-# white
-color7  #BAC2DE
-color15 #A6ADC8

common/.config/kitty/kitty.conf

@@ -2588,6 +2588,6 @@ map ctrl+shift+f send_text all \x1b[70;5u
 map ctrl+alt+, load_config_file
 
 # BEGIN_KITTY_THEME
-# Catppuccin-Mocha
+# GitHub Dark Dimmed
 include current-theme.conf
 # END_KITTY_THEME

common/.config/nvim/lua/plugins/code-generic.lua

@@ -154,8 +154,7 @@ return {
         config = function()
             require("lspsaga").setup({
                 ui = {
-                    -- kind = require("config.util").icons.kind_lspsaga,
+                    kind = require("config.util").icons.kind_lspsaga,
-                    kind = require("catppuccin.groups.integrations.lsp_saga").custom_kind(),
                     devicon = true,
                     title = true,
                 },

common/.config/nvim/lua/plugins/ui.lua

@@ -18,49 +18,19 @@ return {
     },
 
     {
-        "catppuccin/nvim",
+        "projekt0n/github-nvim-theme",
-        name = "catppuccin",
         priority = 1000,
         config = function()
-            require("catppuccin").setup({
+            require("github-theme").setup({
-                compile_path = vim.fn.stdpath("cache") .. "/catppuccin",
+                options = {
-
+                    terminal_colors = false,
-                integrations = {
+                    styles = {
-                    telescope = {
+                        comments = "italic",
-                        style = "nvchad",
+                        constants = "bold",
                     },
-
-                    -- These were disabled by default
-                    blink_cmp = true,
-                    diffview = true,
-                    fidget = true,
-                    lsp_saga = true,
-                    mason = true,
-                    neotest = true,
-                    noice = true,
-                    notify = true,
-                    dadbod_ui = true,
-                    nvim_surround = true,
-                    navic = {
-                        enabled = true,
                 },
-                    illuminate = {
-                        lsp = true,
-                    },
-                    snacks = true,
-                    which_key = true,
-
-                    -- These were enabled by default
-                    render_markdown = false,
-                },
-
-                flavour = "mocha",
             })
-
+            vim.cmd("colorscheme github_dark")
-            require("nvim-navic").setup({
-                highlight = true,
-            })
-            vim.cmd("colorscheme catppuccin")
         end,
     },
 

common/.config/zed/settings.json

@@ -9,11 +9,9 @@
         "csharp": false,
         "lua": false,
         "dockerfile": false,
-        "html": false,
+        "html": false
-        "catppuccin": false
     },
     "auto_install_extensions": {
-        "catppuccin": true,
         "catppuccin icons": true,
         "html": true,
         "dockerfile": true
@@ -24,9 +22,9 @@
     "theme": {
         "mode": "dark",
         "light": "One Light",
-        "dark": "Catppuccin Mocha"
+        "dark": "Github Dark Dimmed"
     },
-    "icon_theme": "Catppuccin Latte",
+    "icon_theme": "Modern Icons (Dark)",
     "tabs": { "file_icons": true, "git_status": true },
     "tab_bar": { "show_nav_history_buttons": false },
     "ui_font_size": 17,

common/.vim/plugin_config.vim

@@ -1,7 +1,16 @@
+" THEME
+let g:lightline = { 'colorscheme': 'onedark' }
+colorscheme onedark
+
 " NERDTree Plugin configurations
 let g:NERDTreeShowHidden = 1
 let g:NERDTreeWinSize = 25
 
+" Map nerdtree to <Leader>e
+" Changes the pwd and opens the VCS root
+" Placed here because ideavim doesn't understand :tcd
+nnoremap <leader>e :tcd %:h<CR> :NERDTreeToggleVCS<CR>
+
 " Map easymotion Plugin to <Leader>j
 nnoremap <leader>j <Plug>(easymotion-s)
 

common/.vim/plugins.vim

@@ -18,10 +18,10 @@ call plug#begin('~/.vim/plugged')
     Plug 'michaeljsmith/vim-indent-object'  " ai, ii, aI, iI <- select indent
     Plug 'unblevable/quick-scope'           " f, t <- Highlight unique letter on the line
     Plug 'mg979/vim-visual-multi'           " <Ctrl+n>
+    Plug 'sheerun/vim-polyglot'              " Syntanx highlighting for many languages
 
     "------------Style Plugins------------"
     " Status Styles
     Plug 'itchyny/lightline.vim'
-    Plug 'tyrannicaltoucan/vim-deep-space'
+    Plug 'joshdick/onedark.vim'
-    Plug 'catppuccin/vim', { 'as': 'catppuccin' }
 call plug#end()

common/.vim/vimrc

@@ -19,18 +19,8 @@ source $VIMDIR/autocommands.vim
 " Save session files to $HOME/.vim/session directory
 let g:session_dir="$VIMDIR/session"
 
-""""""""""""""""""""""""""""""""
+" Vim-only configs
-"
+" Placed here cause Nvim sources the config.vim
-" THEME
-"
-""""""""""""""""""""""""""""""""
-let g:lightline = { 'colorscheme': 'catppuccin_mocha' }
-colorscheme catppuccin_mocha
-
-""""""""""""""""""""""""""""""""
-"
-" VIM SPECIFIC CONFIG
-"
 """"""""""""""""""""""""""""""""
 
 " Move the .viminfo file inside .vim directory