diff --git a/common/.config/Code/User/settings.json b/common/.config/Code/User/settings.json index 8b0b31d..e6813a8 100644 --- a/common/.config/Code/User/settings.json +++ b/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, - "terminal.integrated.fontFamily": "FiraCode Nerd Font Mono", - "terminal.integrated.fontSize": 15, + "editor.fontSize": 16, + "terminal.integrated.fontFamily": "MonoLisa", + "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", diff --git a/common/.config/ghostty/config b/common/.config/ghostty/config index f7cb76d..74dad23 100644 --- a/common/.config/ghostty/config +++ b/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 diff --git a/common/.config/kitty/current-theme.conf b/common/.config/kitty/current-theme.conf index dda305c..dbd1987 100644 --- a/common/.config/kitty/current-theme.conf +++ b/common/.config/kitty/current-theme.conf @@ -1,80 +1,61 @@ # vim:ft=kitty -## name: Catppuccin-Mocha -## author: Pocco81 (https://github.com/Pocco81) -## license: MIT -## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf -## blurb: Soothing pastel theme for the high-spirited! +## name: GitHub Dark Dimmed +## author: GitHub +## license: MIT + +#: The basic colors + +foreground #adbac7 +background #22272e +selection_foreground #22272e +selection_background #539bf5 +#: Cursor colors -# The basic colors -foreground #CDD6F4 -background #1E1E2E -selection_foreground #1E1E2E -selection_background #F5E0DC +cursor #539bf5 -# Cursor colors -cursor #F5E0DC -cursor_text_color #1E1E2E -# URL underline color when hovering with mouse -url_color #F5E0DC +#: Tab bar colors -# Kitty window border colors -active_border_color #B4BEFE -inactive_border_color #6C7086 -bell_border_color #F9E2AF +tab_bar_background #1c2128 +active_tab_foreground #adbac7 +active_tab_background #22272e +inactive_tab_foreground #768390 +inactive_tab_background #1c2128 -# OS Window titlebar colors -wayland_titlebar_color system -macos_titlebar_color system -# Tab bar colors -active_tab_foreground #11111B -active_tab_background #CBA6F7 -inactive_tab_foreground #CDD6F4 -inactive_tab_background #181825 -tab_bar_background #11111B +#: The basic 16 colors -# Colors for marks (marked text in the terminal) -mark1_foreground #1E1E2E -mark1_background #B4BEFE -mark2_foreground #1E1E2E -mark2_background #CBA6F7 -mark3_foreground #1E1E2E -mark3_background #74C7EC +#: black +color0 #545d68 +color8 #636e7b -# The 16 terminal colors +#: red +color1 #f47067 +color9 #ff938a -# black -color0 #45475A -color8 #585B70 +#: green +color2 #57ab5a +color10 #6bc46d -# red -color1 #F38BA8 -color9 #F38BA8 +#: yellow +color3 #c69026 +color11 #daaa3f -# green -color2 #A6E3A1 -color10 #A6E3A1 +#: blue +color4 #539bf5 +color12 #6cb6ff -# yellow -color3 #F9E2AF -color11 #F9E2AF +#: magenta +color5 #b083f0 +color13 #dcbdfb -# blue -color4 #89B4FA -color12 #89B4FA +#: cyan +color6 #39c5cf +color14 #56d4dd -# magenta -color5 #F5C2E7 -color13 #F5C2E7 - -# cyan -color6 #94E2D5 -color14 #94E2D5 - -# white -color7 #BAC2DE -color15 #A6ADC8 +#: white +color7 #909dab +color15 #cdd9e5 diff --git a/common/.config/kitty/kitty.conf b/common/.config/kitty/kitty.conf index 3e3b6e9..5e46c78 100644 --- a/common/.config/kitty/kitty.conf +++ b/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 diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua index 92e9ba6..de32365 100644 --- a/common/.config/nvim/lua/plugins/code-generic.lua +++ b/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("catppuccin.groups.integrations.lsp_saga").custom_kind(), + kind = require("config.util").icons.kind_lspsaga, devicon = true, title = true, }, diff --git a/common/.config/nvim/lua/plugins/ui.lua b/common/.config/nvim/lua/plugins/ui.lua index bda6796..b29abc2 100644 --- a/common/.config/nvim/lua/plugins/ui.lua +++ b/common/.config/nvim/lua/plugins/ui.lua @@ -18,49 +18,19 @@ return { }, { - "catppuccin/nvim", - name = "catppuccin", + "projekt0n/github-nvim-theme", priority = 1000, config = function() - require("catppuccin").setup({ - compile_path = vim.fn.stdpath("cache") .. "/catppuccin", - - integrations = { - telescope = { - style = "nvchad", + require("github-theme").setup({ + options = { + terminal_colors = false, + styles = { + comments = "italic", + 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", }) - - require("nvim-navic").setup({ - highlight = true, - }) - vim.cmd("colorscheme catppuccin") + vim.cmd("colorscheme github_dark") end, }, diff --git a/common/.config/zed/settings.json b/common/.config/zed/settings.json index 0222cce..215e3bf 100644 --- a/common/.config/zed/settings.json +++ b/common/.config/zed/settings.json @@ -9,11 +9,9 @@ "csharp": false, "lua": false, "dockerfile": false, - "html": false, - "catppuccin": false + "html": 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, diff --git a/common/.vim/plugin_config.vim b/common/.vim/plugin_config.vim index 366a6cc..94c165b 100644 --- a/common/.vim/plugin_config.vim +++ b/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 e +" Changes the pwd and opens the VCS root +" Placed here because ideavim doesn't understand :tcd +nnoremap e :tcd %:h :NERDTreeToggleVCS + " Map easymotion Plugin to j nnoremap j (easymotion-s) diff --git a/common/.vim/plugins.vim b/common/.vim/plugins.vim index 94be89d..082d317 100644 --- a/common/.vim/plugins.vim +++ b/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' " + Plug 'sheerun/vim-polyglot' " Syntanx highlighting for many languages "------------Style Plugins------------" " Status Styles Plug 'itchyny/lightline.vim' - Plug 'tyrannicaltoucan/vim-deep-space' - Plug 'catppuccin/vim', { 'as': 'catppuccin' } + Plug 'joshdick/onedark.vim' call plug#end() diff --git a/common/.vim/vimrc b/common/.vim/vimrc index cd14abe..ddd3854 100644 --- a/common/.vim/vimrc +++ b/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" -"""""""""""""""""""""""""""""""" -" -" THEME -" -"""""""""""""""""""""""""""""""" -let g:lightline = { 'colorscheme': 'catppuccin_mocha' } -colorscheme catppuccin_mocha - -"""""""""""""""""""""""""""""""" -" -" VIM SPECIFIC CONFIG -" +" Vim-only configs +" Placed here cause Nvim sources the config.vim """""""""""""""""""""""""""""""" " Move the .viminfo file inside .vim directory