commit 51c9c0dbab434d6916c30b2ed74c3947e7a50815
parent e1621de478dc48f106e525e616b698a8a1c00fb8
Author: Bharatvaj <bharatvaj@yahoo.com>
Date: Tue, 11 Apr 2023 00:14:12 +0530
parent e1621de478dc48f106e525e616b698a8a1c00fb8
Author: Bharatvaj <bharatvaj@yahoo.com>
Date: Tue, 11 Apr 2023 00:14:12 +0530
Move opt submodules to vim/plugins Use voom shell script to download plugins Using voom eliminates the submodule headache Remove alacritty/font.yml - use modified github theme as alacritty light theme for clarity, don't use custom fonts too. System default FTW! Don't expose voom env variables - rather use vim_plug and nvim_plug functions Remove gruvbox theme for nvim/vim - just fallback to default when hyper red fails
25 files changed, 46 insertions(+), 108 deletions(-)
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml @@ -1,11 +1,6 @@ -mouse: - hide_when_typing: true - import: - - ~/.config/alacritty/hyper-dark.yml - - ~/.config/alacritty/font.yml - - ~/.config/alacritty/windows.yml - ~/.config/alacritty/mac.yml + - ~/.config/alacritty/windows.yml - ~/.config/alacritty/bindings.yml - ~/.config/alacritty/unstaged.yml @@ -16,3 +11,7 @@ bell: selection: save_to_clipboard: true + +# No title bar, use shortcuts +window: + decorations: none
diff --git a/.config/alacritty/font.yml b/.config/alacritty/font.yml @@ -1,17 +0,0 @@ -font: - normal: - family: Fira Mono - style: Regular - - bold: - family: Fira Mono - - style: Bold - - italic: - family: Fira Mono - style: Oblique - - bold_italic: - family: Fira Mono - style: Bold Oblique
diff --git a/.config/alacritty/hyper-light.yml b/.config/alacritty/hyper-light.yml @@ -1,25 +1,32 @@ +# github Alacritty Colors colors: + # Default colors primary: background: '0xffffff' foreground: '0x000000' + # Normal colors normal: - black: '0x000000' - red: '0xff0000' - green: '0xff00ff' - yellow: '0xaaaa10' - blue: '0x0000ff' - magenta: '0xa00095' - cyan: '0x3e953a' - white: '0xa5a5a5' + black: '0x24292f' + red: '0xcf222e' + green: '0x116329' + yellow: '0x4d2d00' + blue: '0x0969da' + magenta: '0x8250df' + cyan: '0x1b7c83' + white: '0x6e7781' + # Bright colors bright: - black: '0x000000' - red: '0xff0000' - green: '0x3e953a' - yellow: '0xcccc10' - blue: '0x0000aa' - magenta: '0xa00095' - cyan: '0x3e953a' - white: '0xffffff' + black: '0x57606a' + red: '0xa40e26' + green: '0x1a7f37' + yellow: '0x633c01' + blue: '0x218bff' + magenta: '0xa475f9' + cyan: '0x3192aa' + white: '0x8c959f' + indexed_colors: + - { index: 16, color: '0xd18616' } + - { index: 17, color: '0xa40e26' }
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua @@ -29,15 +29,12 @@ set.shortmess="Iat" g.netrw_banner = 0 g.netrw_liststyle = 3 -require'nvim_comment'.setup() - vim.cmd([[ " TODO use lua api source $XDG_DATA_HOME/vim/vimrc function! s:load_plugins(t) abort packadd fzf.vim - packadd gruvbox-material packadd nvim-dap packadd nvim-dap-ui packadd nvim-lspconfig
diff --git a/.config/sh/functions b/.config/sh/functions @@ -58,3 +58,15 @@ download() { find_() { find . -name "*$**" } + +vim_plug() { + export VIM_PLUGINS_DIR="$XDG_DATA_HOME"/vim/pack/voom/opt + export VIM_DIR="$XDG_DATA_HOME"/vim + voom $@ +} + +nvim_plug() { + export VIM_PLUGINS_DIR="$XDG_DATA_HOME"/nvim/pack/voom/opt + export VIM_DIR="$XDG_DATA_HOME"/nvim + voom $@ +}
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf @@ -44,7 +44,7 @@ bind P paste-buffer # Themes set-option -g status-style "bg=default" set -g status-fg default -set -g window-status-current-style "fg=red,bold" +set -g window-status-current-style "fg=default,bold" set -g pane-active-border-style "bg=default,fg=red" set -g pane-border-lines single set -g pane-border-status off
diff --git a/.config/vim/vimrc b/.config/vim/vimrc @@ -92,7 +92,6 @@ function! s:load_plugins(t) abort packadd vim-fugitive packadd vim-unimpaired packadd vim-better-whitespace - packadd gruvbox-material endfunction augroup user_cmds
diff --git a/.gitmodules b/.gitmodules @@ -1,54 +1,12 @@ -[submodule ".local/share/vim/pack/general/opt/vim-better-whitespace"] - path = .local/share/vim/pack/general/opt/vim-better-whitespace - url = https://git::@github.com/ntpeters/vim-better-whitespace.git -[submodule ".local/share/vim/pack/general/opt/vim-commentary"] - path = .local/share/vim/pack/general/opt/vim-commentary - url = https://git::@github.com/tpope/vim-commentary.git -[submodule ".local/share/vim/pack/general/opt/vim-fugitive"] - path = .local/share/vim/pack/general/opt/vim-fugitive - url = https://github.com/tpope/vim-fugitive [submodule ".local/share/vim/pack/general/opt/vim-ninja-feet"] path = .local/share/vim/pack/general/opt/vim-ninja-feet/vim-ninja-feet url = https://git::@github.com/tommcdo/vim-ninja-feet.git -[submodule ".local/share/vimcommon/pack/ui/opt/gruvbox-material"] - path = .local/share/vim/pack/ui/opt/gruvbox-material - url = https://git::@github.com/sainnhe/gruvbox-material.git [submodule ".local/share/nvim/pack/general/start/vim-dispatch-neovim"] path = .local/share/nvim/pack/general/start/vim-dispatch-neovim url = https://github.com/radenling/vim-dispatch-neovim -[submodule ".local/share/nvim/pack/development/opt/vimspector"] - path = .local/share/vim/pack/dev/opt/vimspector - url = https://github.com/puremourning/vimspector [submodule ".config/nvim/vim-vinegar"] path = .config/nvim/vim-vinegar url = https://github.com/tpope/vim-vinegar -[submodule ".local/share/vim/pack/general/opt/vim-maildir"] - path = .local/share/vim/pack/general/opt/vim-maildir - url = https://github.com/ferranpm/vim-maildir -[submodule ".local/share/vimcommon/pack/dev/opt/clang_complete"] - path = .local/share/vim/pack/dev/opt/clang_complete - url = https://github.com/xavierd/clang_complete -[submodule ".local/share/vimcommon/pack/dev/opt/swift.vim"] - path = .local/share/vim/pack/dev/opt/swift.vim - url = https://github.com/keith/swift.vim -[submodule ".local/share/vimcommon/pack/dev/opt/tagbar"] - path = .local/share/vim/pack/dev/opt/tagbar - url = https://github.com/preservim/tagbar -[submodule ".local/share/vimcommon/pack/dev/opt/xcodebuild.vim"] - path = .local/share/vim/pack/dev/opt/xcodebuild.vim - url = https://github.com/jerrymarino/xcodebuild.vim -[submodule ".local/share/vimcommon/pack/dev/opt/vim-xcode"] - path = .local/share/vim/pack/dev/opt/vim-xcode - url = https://github.com/gfontenot/vim-xcode [submodule ".local/share/vim/pack/dev/start/omnisharp-vim"] path = .local/share/vim/pack/dev/start/omnisharp-vim url = https://github.com/OmniSharp/omnisharp-vim -[submodule ".local/share/vim/pack/general/opt/vim-fugitive"] - path = .local/share/vim/pack/general/opt/vim-fugitive - url = https://github.com/OmniSharp/omnisharp-vim -[submodule ".local/share/vim/pack/dev/opt/vim-cmake"] - path = .local/share/vim/pack/dev/opt/vim-cmake - url = https://github.com/cdelledonne/vim-cmake -[submodule ".local/share/vim/pack/dev/opt/vim-msbuild"] - path = .local/share/vim/pack/dev/opt/vim-msbuild - url = https://github.com/heaths/vim-msbuild
diff --git a/.local/share/nvim/plugins b/.local/share/nvim/plugins @@ -1,4 +1,3 @@ mfussenegger/nvim-dap rcarriga/nvim-dap-ui neovim/nvim-lspconfig -
diff --git a/.local/share/vim/hyper-red.vim b/.local/share/vim/hyper-red.vim @@ -21,8 +21,8 @@ if &background == "dark" hi! PreProc ctermfg=DarkGray guifg=DarkGray hi! MatchParen ctermbg=NONE cterm=underline ctermfg=LightMagenta else - hi! LineNr cterm=NONE gui=NONE guibg=NONE ctermbg=NONE guifg=LightGray ctermfg=LightGray - hi! StatusLineNC guibg=DarkGray ctermbg=DarkGray guifg=White ctermfg=White + hi! LineNr cterm=NONE gui=NONE guibg=NONE ctermbg=NONE guifg=DarkGray ctermfg=DarkGray + hi! StatusLineNC guibg=Black ctermbg=Black guifg=White ctermfg=White hi! Statement ctermfg=Red guifg=Red hi! Constant ctermfg=Green guifg=Green hi! String ctermfg=DarkBlue guifg=DarkBlue @@ -31,10 +31,10 @@ else hi! IncSearch ctermbg=Black ctermfg=Yellow guibg=Black guifg=Yellow hi! Search ctermbg=Blue ctermfg=White guibg=Blue guifg=White hi! Todo cterm=underline,bold ctermbg=NONE ctermfg=Yellow guibg=NONE guifg=Yellow - hi! Comment ctermfg=LightGray guifg=LightGray + hi! Comment ctermfg=DarkGray guifg=DarkGray hi! Visual ctermbg=Black ctermfg=white guibg=Black guifg=white - hi! Type ctermfg=DarkGray guifg=DarkGray - hi! PreProc ctermfg=LightGray guifg=LightGray + hi! Type ctermfg=Black guifg=Black + hi! PreProc ctermfg=DarkGray guifg=DarkGray hi! MatchParen guibg=NONE ctermbg=NONE gui=underline cterm=underline guifg=DarkMagenta ctermfg=DarkMagenta endif if has('fillchars')
diff --git a/.local/share/vim/pack/dev/opt/clang_complete b/.local/share/vim/pack/dev/opt/clang_complete @@ -1 +0,0 @@ -Subproject commit e25b6a54e5cf648eb36d5be5b82c1bbb22260fde
diff --git a/.local/share/vim/pack/dev/opt/swift.vim b/.local/share/vim/pack/dev/opt/swift.vim @@ -1 +0,0 @@ -Subproject commit 3e0529e1a97e3da24aabd18daf8ed92c6da8c68b
diff --git a/.local/share/vim/pack/dev/opt/tagbar b/.local/share/vim/pack/dev/opt/tagbar @@ -1 +0,0 @@ -Subproject commit 83933d557409639df53fd2ca21484279b5854c1e
diff --git a/.local/share/vim/pack/dev/opt/vim-cmake b/.local/share/vim/pack/dev/opt/vim-cmake @@ -1 +0,0 @@ -Subproject commit 3799c45b576213e1959184783f54045f097df63f
diff --git a/.local/share/vim/pack/dev/opt/vim-msbuild b/.local/share/vim/pack/dev/opt/vim-msbuild @@ -1 +0,0 @@ -Subproject commit 3799c45b576213e1959184783f54045f097df63f
diff --git a/.local/share/vim/pack/dev/opt/vim-xcode b/.local/share/vim/pack/dev/opt/vim-xcode @@ -1 +0,0 @@ -Subproject commit 2adc409bd7bb58499218f4f487c825e55306e46d
diff --git a/.local/share/vim/pack/dev/opt/vimspector b/.local/share/vim/pack/dev/opt/vimspector @@ -1 +0,0 @@ -Subproject commit 5c328b513485675c061558d2f25a98ee503cb243
diff --git a/.local/share/vim/pack/dev/opt/xcodebuild.vim b/.local/share/vim/pack/dev/opt/xcodebuild.vim @@ -1 +0,0 @@ -Subproject commit d62fa4cf952b4b8a1650778bdec284c35e468279
diff --git a/.local/share/vim/pack/general/opt/vim-better-whitespace b/.local/share/vim/pack/general/opt/vim-better-whitespace @@ -1 +0,0 @@ -Subproject commit c5afbe91d29c5e3be81d5125ddcdc276fd1f1322
diff --git a/.local/share/vim/pack/general/opt/vim-commentary b/.local/share/vim/pack/general/opt/vim-commentary @@ -1 +0,0 @@ -Subproject commit 349340debb34f6302931f0eb7139b2c11dfdf427
diff --git a/.local/share/vim/pack/general/opt/vim-fugitive b/.local/share/vim/pack/general/opt/vim-fugitive @@ -1 +0,0 @@ -Subproject commit 6f07d7e6cd23b7a76dc461fdfb1984717d233806
diff --git a/.local/share/vim/pack/general/opt/vim-maildir b/.local/share/vim/pack/general/opt/vim-maildir @@ -1 +0,0 @@ -Subproject commit 5fffc4b5ef0059dc07ed06970d7b14a581a3e35c
diff --git a/.local/share/vim/pack/ui/opt/gruvbox-material b/.local/share/vim/pack/ui/opt/gruvbox-material @@ -1 +0,0 @@ -Subproject commit 2807579bd0a9981575dbb518aa65d3206f04ea02
diff --git a/.local/share/vim/plugins b/.local/share/vim/plugins @@ -3,7 +3,6 @@ tpope/vim-commentary.git tpope/vim-surround.git tpope/vim-fugitive tommcdo/vim-ninja-feet.git -sainnhe/gruvbox-material.git tpope/vim-unimpaired pope/vim-repeat.git christoomey/vim-tmux-navigator
diff --git a/.profile b/.profile @@ -59,8 +59,6 @@ export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle export SQLITE_HISTORY="$XDG_DATA_HOME/sqlite_history" export MYSQL_HISTFILE="$XDG_DATA_HOME/mysql_history" export SONGDL_HOME="${XDG_DATA_HOME}/music/" -export VIM_PLUGINS_DIR="$XDG_DATA_HOME"/vim/pack/voom/start -export VIM_DIR="$XDG_DATA_HOME"/vim export PSQL_HISTORY="$XDG_CACHE_HOME/pg/psql_history" export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages