life moves on...
This commit is contained in:
Daniel Lundin
parent
413bbdb7f7
commit
a282db3c4b
9 changed files with 42 additions and 25 deletions
|
|
@ -310,9 +310,10 @@ call <sid>hi("Bold", "", "", "bold")
|
|||
call <sid>hi("Italic", "", "", "italic")
|
||||
call <sid>hi("Boolean", s:deep_orange_900, "", "")
|
||||
call <sid>hi("Character", "", "", "")
|
||||
call <sid>hi("Pmenu", s:light_green_50, s:blue_grey_800, "none")
|
||||
call <sid>hi("CocFloating", s:green_900, s:lime_200, "none")
|
||||
call <sid>hi("Pmenu", s:black_1000, s:blue_grey_200, "none")
|
||||
call <sid>hi("PmenuSbar", s:light_green_50, s:blue_grey_800, "none")
|
||||
call <sid>hi("PmenuSel", s:yellow_50, s:deep_purple_900, "")
|
||||
call <sid>hi("PmenuSel", s:black_1000, s:amber_300, "")
|
||||
call <sid>hi("Comment", s:blue_grey_400, "", "italic")
|
||||
call <sid>hi("Conditional", "", "", "")
|
||||
call <sid>hi("Constant", "", "", "")
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@ call plug#begin('~/.local/share/nvim/plugged')
|
|||
" Plug 'ncm2/ncm2-path'
|
||||
" Plug 'ncm2/ncm2-go'
|
||||
" Plug 'ncm2/ncm2-racer'
|
||||
Plug 'neoclide/coc.nvim', {'tag': '*', 'do': { -> coc#util#install()}}
|
||||
" Plug 'neoclide/coc.nvim', {'tag': '*', 'do': { -> coc#util#install()}}
|
||||
Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile', 'branch': 'master'}
|
||||
|
||||
" Plugin outside ~/.vim/plugged with post-update hook
|
||||
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
|
||||
|
|
@ -252,6 +253,12 @@ vnoremap <C-S-Right> w
|
|||
nnoremap <C-S-Right> gh<C-O>w
|
||||
inoremap <C-S-Right> <C-\><C-O>gh<C-O>w
|
||||
|
||||
"" Align
|
||||
" Start interactive EasyAlign in visual mode (e.g. vipga)
|
||||
xmap ga <Plug>(EasyAlign)
|
||||
" Start interactive EasyAlign for a motion/text object (e.g. gaip)
|
||||
nmap ga <Plug>(EasyAlign)
|
||||
|
||||
"" Comments
|
||||
map <silent> <c-/> :TComment<cr>
|
||||
imap <silent> <c-/> <c--><c-->
|
||||
|
|
@ -385,6 +392,9 @@ function! s:check_back_space() abort
|
|||
return !col || getline('.')[col - 1] =~# '\s'
|
||||
endfunction
|
||||
|
||||
" Remap for rename current word
|
||||
nmap <leader>rn <Plug>(coc-rename)
|
||||
|
||||
" Use <c-space> for trigger completion.
|
||||
inoremap <silent><expr> <c-space> coc#refresh()
|
||||
|
||||
|
|
@ -405,6 +415,10 @@ nmap <silent> gr <Plug>(coc-references)
|
|||
" Use K for show documentation in preview window
|
||||
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||
|
||||
" Use U to show documentation in preview window
|
||||
nnoremap <silent> U :call <SID>show_documentation()<CR>
|
||||
|
||||
|
||||
function! s:show_documentation()
|
||||
if &filetype == 'vim'
|
||||
execute 'h '.expand('<cword>')
|
||||
|
|
@ -414,7 +428,8 @@ function! s:show_documentation()
|
|||
endfunction
|
||||
|
||||
" Highlight symbol under cursor on CursorHold
|
||||
autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||
" autocmd CursorHold * silent call CocActionAsync('highlight')
|
||||
autocmd CursorHold * silent call CocActionAsync('doHover')
|
||||
|
||||
" Remap for rename current word
|
||||
nmap <leader>rn <Plug>(coc-rename)
|
||||
|
|
@ -506,9 +521,9 @@ let g:go_highlight_operators = 1
|
|||
let g:go_highlight_structs = 1
|
||||
let g:go_highlight_types = 1
|
||||
let g:go_auto_sameids = 1
|
||||
" let g:go_def_mapping_enabled = 0
|
||||
let g:go_info_mode = 'guru'
|
||||
let g:go_updatetime = 20
|
||||
let g:go_def_mode='gopls'
|
||||
let g:go_info_mode='gopls'
|
||||
let g:go_updatetime = 200
|
||||
let g:go_snippet_engine = "neosnippet"
|
||||
" Let coc.nvim handle GoDef.
|
||||
let g:go_def_mapping_enabled = 0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Description=SSH key agent
|
|||
Type=forking
|
||||
Environment=SSH_AUTH_SOCK=%h/.ssh/ssh_auth_sock
|
||||
ExecStartPre=/usr/bin/rm -f $SSH_AUTH_SOCK
|
||||
ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK
|
||||
ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK -t 3600
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[core]
|
||||
excludesfile = "~/.gitignore"
|
||||
editor = nvim
|
||||
pager = diff-so-fancy | less -+R -nBJFXRgiM -h512 -x4
|
||||
#pager = diff-so-fancy | less -+R -nBJFXRgiM -h512 -x4
|
||||
|
||||
[user]
|
||||
name = Daniel Lundin
|
||||
|
|
|
|||
12
.inputrc
12
.inputrc
|
|
@ -6,18 +6,6 @@ set visible-stats on
|
|||
set show-all-if-ambiguous on
|
||||
set completion-query-items 150
|
||||
|
||||
#"\es": menu-complete
|
||||
#"\eo": "\C-p\C-a\ef "
|
||||
"\C-p": history-search-backward
|
||||
"\C-n": history-search-forward
|
||||
# "\e[A": history-search-backward
|
||||
# "\e[B": history-search-forward
|
||||
|
||||
# those two are for rxvt
|
||||
"\e[7~":beginning-of-line
|
||||
"\e[8~":end-of-line
|
||||
|
||||
# on some xterm
|
||||
"\e[H": beginning-of-line
|
||||
"\e[F": end-of-line
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
--glob=!/vendor/
|
||||
--glob=!/.git/
|
||||
--glob=!/.terraform/
|
||||
--pretty
|
||||
--colors=path:fg:100,150,210
|
||||
--colors=match:style:nobold
|
||||
--colors=match:bg:180,150,40
|
||||
|
|
|
|||
|
|
@ -113,5 +113,10 @@ selectw -t 1
|
|||
run-shell ~/.tmux/plugins/tmux-battery/battery.tmux
|
||||
|
||||
# source /usr/lib/python3.6/site-packages/powerline/bindings/tmux/powerline.conf
|
||||
#
|
||||
# if -F "#{==:#{session_windows},1}" "set -g status off" "set -g status on"
|
||||
# set-hook -g window-linked 'if -F "#{==:#{session_windows},1}" "set -g status off" "set -g status on"'
|
||||
# set-hook -g window-unlinked 'if -F "#{==:#{session_windows},1}" "set -g status off" "set -g status on"'
|
||||
|
||||
#set-hook -g session-window-changed 'if -F "#{==:#{window_index},1}" "set -g status off" "set -g status on"'
|
||||
# vim:set ft=tmux:
|
||||
|
|
|
|||
6
.xinitrc
6
.xinitrc
|
|
@ -1,11 +1,11 @@
|
|||
#!/bin/bash
|
||||
xsetroot -solid \#99aab0 -cursor_name left_ptr
|
||||
xmodmap $HOME/.Xmodmap
|
||||
compton --daemon -c -t -25 -l -25 --shadow-radius=25 --inactive-opacity 0.99 --inactive-dim 0.2 -e 0.7
|
||||
#compton --daemon -c -t -25 -l -25 --shadow-radius=25 --inactive-opacity 0.99 --inactive-dim 0.2 -e 0.7
|
||||
setxkbmap -option ctrl:nocaps,grp:switch,grp_led:scroll us,se
|
||||
xcalib $HOME/.config/B140QAN02_0.icm
|
||||
alacritty -e tmux attach -t0 &
|
||||
# exec $HOME/bin/dwm
|
||||
xrdb $HOME/.Xresources
|
||||
hsetroot -solid \#99aab0
|
||||
exec $HOME/bin/2bwm
|
||||
#exec $HOME/bin/2bwm
|
||||
exec $HOME/bin/dwm
|
||||
|
|
|
|||
9
.zshrc
9
.zshrc
|
|
@ -11,7 +11,6 @@ export PATH=$HOME/bin:$PATH:/bin:/sbin:/usr/sbin:/usr/local/sbin
|
|||
|
||||
export EDITOR=nvim
|
||||
#export DISPLAY=:0
|
||||
export GOPATH=$HOME
|
||||
export GDK_SCALE=2
|
||||
|
||||
fpath=(~/.zsh/functions $fpath)
|
||||
|
|
@ -283,6 +282,14 @@ export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
|
|||
|
||||
export BAZEL_PYTHON=python2
|
||||
|
||||
## Golang
|
||||
|
||||
export GOPATH=$HOME
|
||||
export GO111MODULE=on
|
||||
GOPROXY=https://proxy.golang.org/
|
||||
|
||||
## Ansible
|
||||
export ANSIBLE_NOCOWS=1
|
||||
|
||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue