commit ee471c847fec9a66ad7618d408c04f80b0b7c40b parent d081e9a9537cdad588d19dc4ed597082cf91761c Author: Bharatvaj <bharatvaj@yahoo.com> Date: Mon, 17 Apr 2023 14:36:38 +0530 Merge branch 'main' of getsh.org:dotfiles Diffstat:
45 files changed, 93 insertions(+), 183 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,17 +29,15 @@ 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 packadd vim-fugitive packadd vim-ninja-feet packadd vim-surround @@ -48,6 +46,7 @@ function! s:load_plugins(t) abort packadd vim-xcode lua require"dapui".setup() + lua require"lspconfig".clangd.setup{} lua require"unstaged" endfunction 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 @@ -11,7 +11,9 @@ endif set nocompatible set mouse= set cursorline -set cursorlineopt=number +if has('cursorlineopt') + set cursorlineopt=number +endif set exrc " Turn backup off @@ -90,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,99 +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-surround"] - path = .local/share/vim/pack/general/start/vim-surround - url = https://git::@github.com/tpope/vim-surround.git -[submodule ".local/share/vim/pack/general/opt/vim-fugitive"] - path = .local/share/vim/pack/general/opt/vim-ninja-feet/vim-fugitive - url = https://git::@github.com/tpope/vim-fugitive.git [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/vim/pack/general/start/vim-unimpaired"] - path = .local/share/vim/pack/general/opt/vim-ninja-feet/vim-unimpaired - url = https://github.com/tpope/vim-unimpaired -[submodule ".local/share/vim/pack/general/start/vim-repeat"] - path = .local/share/vim/pack/general/start/vim-repeat - url = https://git::@github.com/tpope/vim-repeat.git -[submodule ".local/share/vim/pack/general/start/vim-tmux-navigator"] - path = .local/share/vim/pack/general/opt/vim-ninja-feet/vim-tmux-navigator - url = https://github.com/christoomey/vim-tmux-navigator -[submodule ".local/share/vim/pack/general/start/vim-dispatch"] - path = .local/share/vim/pack/general/start/vim-dispatch - url = https://github.com/tpope/vim-dispatch -[submodule ".local/share/vim/pack/general/start/mru"] - path = .local/share/vim/pack/general/opt/vim-ninja-feet/mru - url = https://github.com/yegappan/mru [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/start/nvim-dap"] - path = .local/share/nvim/pack/dev/opt/nvim-dap - url = https://github.com/mfussenegger/nvim-dap -[submodule ".local/share/nvim/pack/general/start/nvim-comment"] - path = .local/share/nvim/pack/general/start/nvim-comment - url = https://github.com/terrortylor/nvim-comment -[submodule ".local/share/nvim/pack/development/opt/vimspector"] - path = .local/share/vim/pack/dev/opt/vimspector - url = https://github.com/puremourning/vimspector -[submodule ".local/share/vim/pack/general/start/vim-checklist"] - path = .local/share/vim/pack/general/start/vim-checklist - url = https://github.com/evansalter/vim-checklist [submodule ".config/nvim/vim-vinegar"] path = .config/nvim/vim-vinegar url = https://github.com/tpope/vim-vinegar -[submodule ".local/share/nvim/pack/general/start/vim-vinegar"] - path = .local/share/vim/pack/general/start/vim-vinegar - url = https://github.com/tpope/vim-vinegar -[submodule ".local/share/vim/pack/general/opt/birck.vim"] - path = .local/share/vim/pack/general/opt/vim-ninja-feet/birck.vim - url = https://git.sr.ht/~torresjrjr/birck.vim -[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/general/start/vim-minisnip"] - path = .local/share/vim/pack/general/start/vim-minisnip - url = https://github.com/joereynolds/vim-minisnip/ -[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/general/start/vim-pbxproj"] - path = .local/share/vim/pack/general/start/vim-pbxproj - url = https://github.com/cfdrake/vim-pbxproj -[submodule ".local/share/vimcommon/pack/dev/opt/vim-submode"] - path = .local/share/vim/pack/general/start/vim-submode - url = https://github.com/kana/vim-submode -[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/nvim/pack/dev/opt/nvim-dap-ui"] - path = .local/share/nvim/pack/dev/opt/nvim-dap-ui - url = https://github.com/rcarriga/nvim-dap-ui -[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/vimcommon/pack/general/opt/fzf.vim"] - path = .local/share/vim/pack/general/start/fzf.vim - url = https://github.com/junegunn/fzf.vim -[submodule ".local/share/vimcommon/pack/general/start/gitignore"] - path = .local/share/vim/pack/general/start/gitignore - url = https://github.com/vim-scripts/gitignore -[submodule ".local/share/nvim/pack/dev/start/nvim-lspconfig"] - path = .local/share/nvim/pack/dev/opt/nvim-lspconfig - url = https://github.com/neovim/nvim-lspconfig [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 diff --git a/.local/share/.gitignore b/.local/share/.gitignore @@ -1,17 +1,5 @@ !vim/ -!vim/pack/ -!vim/pack/* !nvim/ -!nvim/pack/ -!nvim/pack/** - - -!vimcommon/ -!vimcommon/* -!vimcommon/pack/ -!vimcommon/pack/** -!vimcommon/minisnip/ -!vimcommon/minisnip/* tags diff --git a/.local/share/nvim/pack/dev/opt/nvim-dap b/.local/share/nvim/pack/dev/opt/nvim-dap @@ -1 +0,0 @@ -Subproject commit 61643680dcb771a29073cd432894e2f81a7c2ae3 diff --git a/.local/share/nvim/pack/dev/opt/nvim-dap-ui b/.local/share/nvim/pack/dev/opt/nvim-dap-ui @@ -1 +0,0 @@ -Subproject commit 0f385f7f5268f408a546772c049271121b0d71c9 diff --git a/.local/share/nvim/pack/dev/opt/nvim-lspconfig b/.local/share/nvim/pack/dev/opt/nvim-lspconfig @@ -1 +0,0 @@ -Subproject commit 7b98aadc6e85db4fc3af6c1ec22c4774d965506e diff --git a/.local/share/nvim/plugins b/.local/share/nvim/plugins @@ -0,0 +1,3 @@ +mfussenegger/nvim-dap +rcarriga/nvim-dap-ui +neovim/nvim-lspconfig diff --git a/.local/share/vim/.gitignore b/.local/share/vim/.gitignore @@ -1 +1,2 @@ !pack/**/start/** +pack/voom/ 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,13 +31,15 @@ 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 -set fillchars=vert:\│ +if has('fillchars') + set fillchars=vert:\│ +endif hi! VertSplit term=NONE cterm=NONE gui=NONE hi! SignColumn ctermbg=NONE guibg=NONE 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 844b85677d52d932432eb115236d9173ebe3664d 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 4766d9a225c433e7ce2625bcc6263bfd028c4a50 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-maildir b/.local/share/vim/pack/general/opt/vim-maildir @@ -1 +0,0 @@ -Subproject commit 5fffc4b5ef0059dc07ed06970d7b14a581a3e35c diff --git a/.local/share/vim/pack/general/opt/vim-ninja-feet/birck.vim b/.local/share/vim/pack/general/opt/vim-ninja-feet/birck.vim @@ -1 +0,0 @@ -Subproject commit e316a915b34f42f448966df7f79d10d8a49706c5 diff --git a/.local/share/vim/pack/general/opt/vim-ninja-feet/mru b/.local/share/vim/pack/general/opt/vim-ninja-feet/mru @@ -1 +0,0 @@ -Subproject commit 8e8220a005d070dbd01caae86e3139d83fc444c4 diff --git a/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-fugitive b/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-fugitive @@ -1 +0,0 @@ -Subproject commit 6f07d7e6cd23b7a76dc461fdfb1984717d233806 diff --git a/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-ninja-feet b/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-ninja-feet @@ -1 +0,0 @@ -Subproject commit cb9b448dd468a338255aed474e6113ed115612c1 diff --git a/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-tmux-navigator b/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-tmux-navigator @@ -1 +0,0 @@ -Subproject commit afb45a55b452b9238159047ce7c6e161bd4a9907 diff --git a/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-unimpaired b/.local/share/vim/pack/general/opt/vim-ninja-feet/vim-unimpaired @@ -1 +0,0 @@ -Subproject commit e4006d68cd4f390efef935bc09be0ce3bd022e72 diff --git a/.local/share/vim/pack/general/start/fzf.vim b/.local/share/vim/pack/general/start/fzf.vim @@ -1 +0,0 @@ -Subproject commit 9ceac718026fd39498d95ff04fa04d3e40c465d7 diff --git a/.local/share/vim/pack/general/start/gitignore b/.local/share/vim/pack/general/start/gitignore @@ -1 +0,0 @@ -Subproject commit 061c5c756713f42b92b6b69b0a081075319a60d0 diff --git a/.local/share/vim/pack/general/start/vim-checklist b/.local/share/vim/pack/general/start/vim-checklist @@ -1 +0,0 @@ -Subproject commit a63f22fdd1acfff7f4db3f79641135b9dc9a36fb diff --git a/.local/share/vim/pack/general/start/vim-dispatch b/.local/share/vim/pack/general/start/vim-dispatch @@ -1 +0,0 @@ -Subproject commit 00e77d90452e3c710014b26dc61ea919bc895e92 diff --git a/.local/share/vim/pack/general/start/vim-minisnip b/.local/share/vim/pack/general/start/vim-minisnip @@ -1 +0,0 @@ -Subproject commit 1897727298c658dde9ec9deda0e56b608c8b2f32 diff --git a/.local/share/vim/pack/general/start/vim-pbxproj b/.local/share/vim/pack/general/start/vim-pbxproj @@ -1 +0,0 @@ -Subproject commit d230f2cc70faf47ec0b97ffefa8235991438aca8 diff --git a/.local/share/vim/pack/general/start/vim-repeat b/.local/share/vim/pack/general/start/vim-repeat @@ -1 +0,0 @@ -Subproject commit 24afe922e6a05891756ecf331f39a1f6743d3d5a diff --git a/.local/share/vim/pack/general/start/vim-submode b/.local/share/vim/pack/general/start/vim-submode @@ -1 +0,0 @@ -Subproject commit d29de4f55c40a7a03af1d8134453a703d6affbd2 diff --git a/.local/share/vim/pack/general/start/vim-surround b/.local/share/vim/pack/general/start/vim-surround @@ -1 +0,0 @@ -Subproject commit f51a26d3710629d031806305b6c8727189cd1935 diff --git a/.local/share/vim/pack/general/start/vim-vinegar b/.local/share/vim/pack/general/start/vim-vinegar @@ -1 +0,0 @@ -Subproject commit bb1bcddf43cfebe05eb565a84ab069b357d0b3d6 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 @@ -0,0 +1,33 @@ +ntpeters/vim-better-whitespace.git +tpope/vim-commentary.git +tpope/vim-surround.git +tpope/vim-fugitive +tommcdo/vim-ninja-feet.git +tpope/vim-unimpaired +pope/vim-repeat.git +christoomey/vim-tmux-navigator +tpope/vim-dispatch +yegappan/mru +radenling/vim-dispatch-neovim +evansalter/vim-checklist +tpope/vim-vinegar +tpope/vim-vinegar +ferranpm/vim-maildir +joereynolds/vim-minisnip/ +keith/swift.vim +preservim/tagbar +cfdrake/vim-pbxproj +kana/vim-submode +jerrymarino/xcodebuild.vim +gfontenot/vim-xcode +junegunn/fzf.vim +vim-scripts/gitignore +OmniSharp/omnisharp-vim + + +# https://git.sr.ht/~torresjrjr/birck.vim +# rcarriga/nvim-dap-ui +# mfussenegger/nvim-dap +# terrortylor/nvim-comment +# neovim/nvim-lspconfig +# puremourning/vimspector diff --git a/.profile b/.profile @@ -97,8 +97,8 @@ chance "${XDG_CONFIG_HOME}/sh/unstaged" # Theme # Hyper Red -export LESS_TERMCAP_us=$'\E[0;31m' -export LESS_TERMCAP_ue=$'\E[0m' +export LESS_TERMCAP_so=$'\e[31m' +export LESS_TERMCAP_se=$'\e[0m' export CLICOLOR=1 export LSCOLORS="xxexcxdxbxegxdxbagxcxd" export LS_COLORS="di=0:ln=34:so=32:pi=33:ex=31:bd=34;46:cd=0;43:su=0;41:sg=30;46:tw=0;42:ow=0;43"