diff --git a/.config/nvim/colors/dln-light.vim b/.config/nvim/colors/dln-light.vim index 12b528e..965f1d5 100644 --- a/.config/nvim/colors/dln-light.vim +++ b/.config/nvim/colors/dln-light.vim @@ -310,9 +310,10 @@ call hi("Bold", "", "", "bold") call hi("Italic", "", "", "italic") call hi("Boolean", s:deep_orange_900, "", "") call hi("Character", "", "", "") -call hi("Pmenu", s:light_green_50, s:blue_grey_800, "none") +call hi("CocFloating", s:green_900, s:lime_200, "none") +call hi("Pmenu", s:black_1000, s:blue_grey_200, "none") call hi("PmenuSbar", s:light_green_50, s:blue_grey_800, "none") -call hi("PmenuSel", s:yellow_50, s:deep_purple_900, "") +call hi("PmenuSel", s:black_1000, s:amber_300, "") call hi("Comment", s:blue_grey_400, "", "italic") call hi("Conditional", "", "", "") call hi("Constant", "", "", "") diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index f54aaa3..7269ac6 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -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 w nnoremap ghw inoremap ghw +"" Align +" Start interactive EasyAlign in visual mode (e.g. vipga) +xmap ga (EasyAlign) +" Start interactive EasyAlign for a motion/text object (e.g. gaip) +nmap ga (EasyAlign) + "" Comments map :TComment imap @@ -385,6 +392,9 @@ function! s:check_back_space() abort return !col || getline('.')[col - 1] =~# '\s' endfunction +" Remap for rename current word +nmap rn (coc-rename) + " Use for trigger completion. inoremap coc#refresh() @@ -405,6 +415,10 @@ nmap gr (coc-references) " Use K for show documentation in preview window nnoremap K :call show_documentation() +" Use U to show documentation in preview window +nnoremap U :call show_documentation() + + function! s:show_documentation() if &filetype == 'vim' execute 'h '.expand('') @@ -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 rn (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 diff --git a/.config/systemd/user/ssh-agent.service b/.config/systemd/user/ssh-agent.service index 77e41ec..36eff44 100644 --- a/.config/systemd/user/ssh-agent.service +++ b/.config/systemd/user/ssh-agent.service @@ -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 diff --git a/.gitconfig b/.gitconfig index 85b6b9d..9ed8f11 100644 --- a/.gitconfig +++ b/.gitconfig @@ -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 diff --git a/.inputrc b/.inputrc index 4e8a9cf..62734f4 100644 --- a/.inputrc +++ b/.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 diff --git a/.ripgreprc b/.ripgreprc index f47f92c..62d919e 100644 --- a/.ripgreprc +++ b/.ripgreprc @@ -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 diff --git a/.tmux.conf b/.tmux.conf index 7f01d3e..c8f0ebe 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -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: diff --git a/.xinitrc b/.xinitrc index fa72f9b..22e3f98 100755 --- a/.xinitrc +++ b/.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 diff --git a/.zshrc b/.zshrc index cd396c0..a980fdc 100644 --- a/.zshrc +++ b/.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