Update Vim and zshrc
This commit is contained in:
parent
3b4d69b9a4
commit
94c7988c84
|
@ -1,4 +1,4 @@
|
||||||
nmap <leader>gb :GoBuild<cr>
|
nmap <leader>gb :up<bar>:GoBuild<cr>
|
||||||
nmap <leader>gr :GoRun<cr>
|
nmap <leader>gr :GoRun<cr>
|
||||||
nmap <leader>gc :GoCallers<cr>
|
nmap <leader>gc :GoCallers<cr>
|
||||||
nmap <leader>gi :GoImplements<cr>
|
nmap <leader>gi :GoImplements<cr>
|
||||||
|
@ -15,7 +15,8 @@ nmap <leader>gt <esc>:up<bar>:GoTest<cr>
|
||||||
nmap <leader>gf <esc>:up<bar>:GoTestFunc<cr>
|
nmap <leader>gf <esc>:up<bar>:GoTestFunc<cr>
|
||||||
nmap <leader>gat <esc>:GoAddTags<cr>
|
nmap <leader>gat <esc>:GoAddTags<cr>
|
||||||
nmap <leader>grt <esc>:GoRemoveTags<cr>
|
nmap <leader>grt <esc>:GoRemoveTags<cr>
|
||||||
nmap <leader>ge :GoIfErr<cr>
|
nmap <leader>gec <esc>:up<bar>:GoErrCheck<cr>
|
||||||
|
nmap <leader>gie :GoIfErr<cr>
|
||||||
|
|
||||||
nnoremap <silent> dr :GoDebugBreakpoint<cr>
|
nnoremap <silent> dr :GoDebugBreakpoint<cr>
|
||||||
nnoremap <silent> d! :GoDebugStart<cr>
|
nnoremap <silent> d! :GoDebugStart<cr>
|
||||||
|
|
21
vimrc
21
vimrc
|
@ -23,7 +23,7 @@ set shiftwidth=2
|
||||||
set shiftround
|
set shiftround
|
||||||
set tabstop=2
|
set tabstop=2
|
||||||
set expandtab
|
set expandtab
|
||||||
" set smarttab
|
set smarttab
|
||||||
set splitbelow
|
set splitbelow
|
||||||
set splitright
|
set splitright
|
||||||
set encoding=utf-8
|
set encoding=utf-8
|
||||||
|
@ -58,10 +58,10 @@ set lazyredraw
|
||||||
set timeoutlen=1000
|
set timeoutlen=1000
|
||||||
set ballooneval
|
set ballooneval
|
||||||
set balloonevalterm
|
set balloonevalterm
|
||||||
set scrolloff=5
|
set scrolloff=15
|
||||||
set dictionary=/usr/share/dict/words
|
set dictionary=/usr/share/dict/words
|
||||||
set shortmess+=I
|
set shortmess+=I
|
||||||
set updatetime=100
|
set updatetime=250
|
||||||
set pastetoggle=<f2>
|
set pastetoggle=<f2>
|
||||||
" See :help thesaurus
|
" See :help thesaurus
|
||||||
set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
|
set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
|
||||||
|
@ -78,7 +78,10 @@ if exists('+termguicolors')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Colour scheme:
|
" Colour scheme:
|
||||||
colorscheme iceberg
|
packadd! gruvbox
|
||||||
|
let g:gruvbox_contrast_dark='soft'
|
||||||
|
let g:gruvbox_contrast_light='soft'
|
||||||
|
colorscheme gruvbox
|
||||||
|
|
||||||
augroup vimrc
|
augroup vimrc
|
||||||
autocmd!
|
autocmd!
|
||||||
|
@ -89,6 +92,8 @@ augroup vimrc
|
||||||
" set cursor line highlight in insert mode.
|
" set cursor line highlight in insert mode.
|
||||||
autocmd InsertEnter * set cul
|
autocmd InsertEnter * set cul
|
||||||
autocmd InsertLeavePre * set nocul
|
autocmd InsertLeavePre * set nocul
|
||||||
|
" use tabs in .gitconfig
|
||||||
|
autocmd FileType gitconfig setlocal shiftwidth=2 tabstop=2 noexpandtab
|
||||||
augroup end
|
augroup end
|
||||||
|
|
||||||
" But, don't remember the current directory for a given file:
|
" But, don't remember the current directory for a given file:
|
||||||
|
@ -106,6 +111,8 @@ imap <up> <nop>
|
||||||
imap <down> <nop>
|
imap <down> <nop>
|
||||||
imap <left> <nop>
|
imap <left> <nop>
|
||||||
imap <right> <nop>
|
imap <right> <nop>
|
||||||
|
nmap ]q :cn<cr>
|
||||||
|
nmap [q :cp<cr>
|
||||||
|
|
||||||
nnoremap <silent> ,/ :nohlsearch<cr>
|
nnoremap <silent> ,/ :nohlsearch<cr>
|
||||||
map <c-t> <esc>:tabnew<cr>
|
map <c-t> <esc>:tabnew<cr>
|
||||||
|
@ -172,8 +179,11 @@ xmap ah <Plug>(GitGutterTextObjectOuterVisual)
|
||||||
let g:rustfmt_autosave = 1
|
let g:rustfmt_autosave = 1
|
||||||
|
|
||||||
" echodoc configuration:
|
" echodoc configuration:
|
||||||
set cmdheight=2
|
set cmdheight=1
|
||||||
|
set noshowmode
|
||||||
|
let g:echodoc#type='echo'
|
||||||
let g:echodoc#enable_at_startup = 1
|
let g:echodoc#enable_at_startup = 1
|
||||||
|
packadd! echodoc.vim
|
||||||
|
|
||||||
" ALE configuration:
|
" ALE configuration:
|
||||||
function SymbolSearch()
|
function SymbolSearch()
|
||||||
|
@ -259,7 +269,6 @@ runtime macros/matchit.vim
|
||||||
packadd! ale
|
packadd! ale
|
||||||
|
|
||||||
" load other plugins:
|
" load other plugins:
|
||||||
packadd! echodoc.vim
|
|
||||||
packadd! lightline.vim
|
packadd! lightline.vim
|
||||||
packadd! tmux-complete.vim
|
packadd! tmux-complete.vim
|
||||||
packadd! vim-commentary
|
packadd! vim-commentary
|
||||||
|
|
2
zshrc
2
zshrc
|
@ -161,7 +161,7 @@ setxkbmap -option caps:none
|
||||||
# Set zshfunctions dir as per https://github.com/alacritty/alacritty/blob/master/INSTALL.md#debianubuntu
|
# Set zshfunctions dir as per https://github.com/alacritty/alacritty/blob/master/INSTALL.md#debianubuntu
|
||||||
fpath+=${ZDOTDIR:-~}/.zsh_functions
|
fpath+=${ZDOTDIR:-~}/.zsh_functions
|
||||||
|
|
||||||
export BAT_THEME=Nord
|
export BAT_THEME=gruvbox-dark
|
||||||
|
|
||||||
# Vim keymap
|
# Vim keymap
|
||||||
bindkey -v
|
bindkey -v
|
||||||
|
|
Loading…
Reference in New Issue