diff --git a/cli/.config/nvim/lua/plugins.lua b/cli/.config/nvim/lua/plugins.lua index d405ddd..803cc42 100644 --- a/cli/.config/nvim/lua/plugins.lua +++ b/cli/.config/nvim/lua/plugins.lua @@ -7,17 +7,18 @@ vim.opt.rtp:prepend(lazypath) --[[ plugins list ]] require('lazy').setup { - {'kdheepak/lazygit.nvim', dependencies = {'nvim-lua/plenary.nvim'}}, {'ellisonleao/gruvbox.nvim', priority = 1000, config = true}, {'nvim-orgmode/orgmode', event = 'VeryLazy', ft = {'org'}}, - {'nvim-telescope/telescope.nvim', dependencies = {'nvim-lua/plenary.nvim'}}, - {'nvim-treesitter/nvim-treesitter', cmd = 'TSUpdate'}, {'w0rp/ale', cmd = 'ALEEnable', ft = {'bash', 'go', 'lua', 'python', 'sh', 'zsh'}}, + 'kdheepak/lazygit.nvim', + 'nvim-telescope/telescope.nvim', + 'nvim-treesitter/nvim-treesitter', 'lewis6991/gitsigns.nvim', 'lifepillar/vim-cheat40', 'nvim-lualine/lualine.nvim', 'tpope/vim-rsi', 'tpope/vim-vinegar', + {'nvim-lua/plenary.nvim', lazy = true}, } --[[ plugin configs and maps ]] @@ -47,8 +48,6 @@ map('n', 'L', 'Lazy') map('n', '?', 'Cheat40') map('n', '.', 'Telescope git_files') map('n', ',', 'Telescope buffers') -map('n', 'T', 'colorscheme solarized8|set bg=light') -map('n', 't', 'colorscheme gruvbox8|set bg=dark') --[[ theme ]] vim.o.termguicolors = true diff --git a/cli/.config/zsh/settings.zsh b/cli/.config/zsh/settings.zsh index 121689c..9f3293f 100644 --- a/cli/.config/zsh/settings.zsh +++ b/cli/.config/zsh/settings.zsh @@ -11,7 +11,6 @@ export LESS='i M R' export PAGER=less export EDITOR=nvim export TIME_STYLE=long-iso -export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock" export ALTERNATE_EDITOR= bindkey -e diff --git a/cli/.vimplugrc b/cli/.vimplugrc index 1aa1f5d..1b8ab2b 100644 --- a/cli/.vimplugrc +++ b/cli/.vimplugrc @@ -4,7 +4,7 @@ autocmd BufRead *vimplugrc set ft=vim execute 'source' fnameescape(g:plug) plug#begin(g:plugdir) Plug 'junegunn/vim-plug' -Plug 'lifepillar/vim-solarized8' +Plug 'lifepillar/vim-gruvbox8' Plug 'hashivim/vim-terraform' Plug 'itchyny/lightline.vim' @@ -32,7 +32,7 @@ nmap ft :Filetypes # lightline g:lightline = { - colorscheme: 'solarized', + colorscheme: 'gruvbox8', separator: { left: '', right: ''}, subseparator: { left: '\u2022', right: '\u2022'} } @@ -45,9 +45,9 @@ if has('gui_running') map! endif -g:solarized_extra_hi_groups = 1 +g:gruvbox_plugin_hi_groups = 1 &t_8f = "\u1b[38;2;%lu;%lu;%lum" &t_8b = "\u1b[48;2;%lu;%lu;%lum" +&bg = 'dark' &tgc = 1 -&bg = 'light' -colorscheme solarized8 +colorscheme gruvbox8 diff --git a/gui/.config/kitty/kitty.conf b/gui/.config/kitty/kitty.conf index 96b1021..82a4d6a 100644 --- a/gui/.config/kitty/kitty.conf +++ b/gui/.config/kitty/kitty.conf @@ -1,7 +1,7 @@ # Use Ctrl+Alt+F5 to reload -font_family Cascadia Mono PL +font_family Fantasque Sans Mono modify_font underline_position 1 -font_size 14 +font_size 15 cursor_blink_interval 0 term xterm-256color diff --git a/gui/.config/wezterm/overrides.lua b/gui/.config/wezterm/overrides.lua index a248ebe..81cc8f8 100644 --- a/gui/.config/wezterm/overrides.lua +++ b/gui/.config/wezterm/overrides.lua @@ -13,11 +13,11 @@ local cursor_bg = '#cb4b16' -- fonts local fonts = wt.config_builder() -fonts.font = wt.font('Fantasque Sans Mono') -fonts.harfbuzz_features = {'calt=0'} +fonts.font = wt.font('Cascadia Mono PL') +fonts.harfbuzz_features = {'ss01', 'ss19', 'ss20'} fonts.font_size = fn.set_by_os{ - Darwin = 15, - others = 12 + Darwin = 14, + others = 11 } -- theme diff --git a/gui/.config/wezterm/wezterm.lua b/gui/.config/wezterm/wezterm.lua index b7b854c..7a14246 100644 --- a/gui/.config/wezterm/wezterm.lua +++ b/gui/.config/wezterm/wezterm.lua @@ -20,8 +20,8 @@ cfg.check_for_updates = false -- fonts & text cfg.cursor_blink_rate = 0 cfg.bold_brightens_ansi_colors = false -cfg.font = wt.font('Cascadia Mono PL') -cfg.harfbuzz_features = {'ss01', 'ss19', 'ss20'} +cfg.font = wt.font('IBM Plex Mono') +cfg.harfbuzz_features = {'ss03'} cfg.font_size = fn.set_by_os{ Darwin = 14, others = 11 diff --git a/lnx/.Xresources b/lnx/.Xresources index 7024895..cbc84b9 100644 --- a/lnx/.Xresources +++ b/lnx/.Xresources @@ -5,7 +5,7 @@ Xft.lcdfilter: true Xft.rgba: rgb Xft.hinting: true Xft.hintstyle: hintslight -Xft.dpi: 192 +Xft.dpi: 96 #define FONT xft:VascadiaMod:size=12