diff options
| -rw-r--r-- | .config/nvim/README.md | 14 | ||||
| -rw-r--r-- | .config/nvim/coc-settings.json | 3 | ||||
| -rw-r--r-- | .config/nvim/init.vim | 11 | ||||
| -rw-r--r-- | .config/nvim/plug-config/far.vim | 9 | ||||
| -rw-r--r-- | .config/nvim/plug-config/goyo.vim | 2 | ||||
| -rw-r--r-- | .config/nvim/plug-config/highlightedyank.vim | 1 | ||||
| -rw-r--r-- | .config/nvim/plug-config/quickscope.vim | 6 | ||||
| -rw-r--r-- | .config/nvim/plug-config/rust.vim | 5 | ||||
| -rw-r--r-- | .config/nvim/plug-config/vim-commentary.vim | 8 | ||||
| -rw-r--r-- | .config/nvim/vim-plug/plugins.vim | 24 | ||||
| -rw-r--r-- | .config/zsh/aliases.zsh | 40 | ||||
| -rw-r--r-- | .zshrc | 1 | ||||
| -rw-r--r-- | README.md | 19 |
13 files changed, 98 insertions, 45 deletions
diff --git a/.config/nvim/README.md b/.config/nvim/README.md index f70cefd..f67a747 100644 --- a/.config/nvim/README.md +++ b/.config/nvim/README.md @@ -5,6 +5,20 @@ Must have neovim >= 0.5 ## Installation +### Lazy git + +brew install lazygit + +sudo add-apt-repository ppa:lazygit-team/release +sudo apt-get update +sudo apt-get install lazygit + +https://aur.archlinux.org/packages/lazygit/ + +### Coc-explorer + +`:CocInstall coc-explorer` + ### Ranger pip3 install ranger-fm pynvim diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index aabee92..5dd3fbf 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -27,5 +27,6 @@ "open" ], "v": "open:vsplit" - } + }, + "snippets.userSnippetsDirectory": "~/.config/nvim/snips" } diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index d4d0290..c45e5f1 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,4 +1,3 @@ - " ____ _ __ _ " / _/___ (_) /__ __(_)___ ___ " / // __ \/ / __/ | / / / __ `__ \ @@ -8,8 +7,18 @@ source $HOME/.config/nvim/plug-config/polyglot.vim source $HOME/.config/nvim/vim-plug/plugins.vim source $HOME/.config/nvim/general/settings.vim + source $HOME/.config/nvim/keys/mappings.vim +source $HOME/.config/nvim/keys/which-key.vim + + source $HOME/.config/nvim/plug-config/rnvimr.vim +source $HOME/.config/nvim/plug-config/highlightedyank.vim +source $HOME/.config/nvim/plug-config/far.vim +source $HOME/.config/nvim/plug-config/vim-commentary.vim +source $HOME/.config/nvim/plug-config/quickscope.vim +source $HOME/.config/nvim/plug-config/rust.vim +source $HOME/.config/nvim/plug-config/goyo.vim source $HOME/.config/nvim/plug-config/ranger.vim source $HOME/.config/nvim/plug-config/barbar.vim source $HOME/.config/nvim/plug-config/floaterm.vim diff --git a/.config/nvim/plug-config/far.vim b/.config/nvim/plug-config/far.vim new file mode 100644 index 0000000..cab863b --- /dev/null +++ b/.config/nvim/plug-config/far.vim @@ -0,0 +1,9 @@ +let g:far#source='rgnvim' + +set lazyredraw " improve scrolling performance when navigating through large results + +let g:far#window_width=50 +" Use %:p with buffer option only +let g:far#file_mask_favorites=['%:p', '**/*.*', '**/*.js', '**/*.py', '**/*.java', '**/*.css', '**/*.html', '**/*.vim', '**/*.cpp', '**/*.c', '**/*.h', ] +let g:far#window_min_content_width=30 +let g:far#enable_undo=1 diff --git a/.config/nvim/plug-config/goyo.vim b/.config/nvim/plug-config/goyo.vim new file mode 100644 index 0000000..cb894f7 --- /dev/null +++ b/.config/nvim/plug-config/goyo.vim @@ -0,0 +1,2 @@ +autocmd! User GoyoEnter lua require('galaxyline').disable_galaxyline() +autocmd! User GoyoLeave lua require('galaxyline').galaxyline_augroup() diff --git a/.config/nvim/plug-config/highlightedyank.vim b/.config/nvim/plug-config/highlightedyank.vim new file mode 100644 index 0000000..9a4a4b0 --- /dev/null +++ b/.config/nvim/plug-config/highlightedyank.vim @@ -0,0 +1 @@ +let g:highlightedyank_highlight_duration = 500 diff --git a/.config/nvim/plug-config/quickscope.vim b/.config/nvim/plug-config/quickscope.vim new file mode 100644 index 0000000..7950dc7 --- /dev/null +++ b/.config/nvim/plug-config/quickscope.vim @@ -0,0 +1,6 @@ +" Trigger a highlight in the appropriate direction when pressing these keys: +let g:qs_highlight_on_keys = ['f', 'F', 't', 'T'] + +highlight QuickScopePrimary guifg='#00C7DF' gui=underline ctermfg=155 cterm=underline +highlight QuickScopeSecondary guifg='#eF5F70' gui=underline ctermfg=81 cterm=underline +let g:qs_max_chars=150 diff --git a/.config/nvim/plug-config/rust.vim b/.config/nvim/plug-config/rust.vim new file mode 100644 index 0000000..3b7519d --- /dev/null +++ b/.config/nvim/plug-config/rust.vim @@ -0,0 +1,5 @@ +if has('macunix') + let g:rust_clip_command = 'pbcopy' +else + let g:rust_clip_command = 'xclip -selection clipboard' +endif diff --git a/.config/nvim/plug-config/vim-commentary.vim b/.config/nvim/plug-config/vim-commentary.vim new file mode 100644 index 0000000..b6758b3 --- /dev/null +++ b/.config/nvim/plug-config/vim-commentary.vim @@ -0,0 +1,8 @@ +function! Comment() + if (mode() == "n" ) + execute "Commentary" + else + execute "'<,'>Commentary" + endif + endfunction +vnoremap <silent> <space>/ :call Comment() diff --git a/.config/nvim/vim-plug/plugins.vim b/.config/nvim/vim-plug/plugins.vim index c716004..1d15601 100644 --- a/.config/nvim/vim-plug/plugins.vim +++ b/.config/nvim/vim-plug/plugins.vim @@ -10,6 +10,12 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Better Syntax Support Plug 'sheerun/vim-polyglot' + " Better Comments + Plug 'tpope/vim-commentary' + + Plug 'machakann/vim-highlightedyank' + + Plug 'brooth/far.vim' " Auto pairs for '(' '[' '{' Plug 'jiangmiao/auto-pairs' @@ -52,7 +58,8 @@ call plug#begin('~/.config/nvim/autoload/plugged') " Stable version of coc Plug 'neoclide/coc.nvim', {'branch': 'release'} - + Plug 'honza/vim-snippets' + Plug 'kevinhwang91/rnvimr' " Colorizer @@ -70,6 +77,21 @@ call plug#begin('~/.config/nvim/autoload/plugged') "Sneak Plug 'justinmk/vim-sneak' + " Display available key bindings + Plug 'liuchengxu/vim-which-key' + + " Zen mode + Plug 'junegunn/goyo.vim' + + " Rust Lang support + Plug 'rust-lang/rust.vim' + + " Text Navigation + Plug 'unblevable/quick-scope' + + " Intuitive buffer closing + Plug 'moll/vim-bbye' + call plug#end() diff --git a/.config/zsh/aliases.zsh b/.config/zsh/aliases.zsh index 72f5265..977ae69 100644 --- a/.config/zsh/aliases.zsh +++ b/.config/zsh/aliases.zsh @@ -9,43 +9,3 @@ alias vi='nvim' alias vim='nvim' alias config='/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME' -if command -v exa > /dev/null; then - alias ls='exa -al --color=always --group-directories-first' # my preferred listing - alias la='exa -a --color=always --group-directories-first' # all files and dirs - alias ll='exa -l --color=always --group-directories-first' # long format - alias lt='exa -aT --color=always --group-directories-first' # tree listing - alias l.='exa -a | egrep "^\."' -else - echo "install exa" -fi - -if command -v bat > /dev/null; then - alias cat='bat' -else - echo "install bat" -fi - -if command -v rg > /dev/null; then - alias grep='rg' -else - echo "install ripgrep" -fi - -if command -v fd > /dev/null; then - alias find='fd' -else - echo "install fd" -fi - - -if ! command -v tokei > /dev/null; then - echo "install tokei" -fi - - -if command -v procs > /dev/null; then - alias ps='procs' -else - echo "install procs" -fi - @@ -7,4 +7,5 @@ [ -f $HOME/.config/zsh/history.zsh ] && source $HOME/.config/zsh/history.zsh [ -f $HOME/.config/zsh/antigen_pkgs.zsh ] && source $HOME/.config/zsh/antigen_pkgs.zsh [ -f $HOME/.config/zsh/keybindings.zsh ] && source $HOME/.config/zsh/keybindings.zsh +[ -f $HOME/.config/zsh/programs.zsh ] && source $HOME/.config/zsh/programs.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh @@ -1,9 +1,24 @@ # Dotfiles -## Nvim -Installation of dependencies described here. Most of the config is stolen from https://github.com/ChristianChiarulli/nvim +## Lazy +### Docker + +https://github.com/jesseduffield/lazydocker + +### Git + +https://github.com/jesseduffield/lazygit + + + + +## NCDU + +`sudo apt-get install ncdu` + +`brew install ncdu` ## zsh |