rob
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Various updates

This commit is contained in:
Rob Watson 2021-01-15 14:46:24 +01:00
parent 21a7eddf9f
commit 15c4583bfa
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tmux.conf
View File

@ -1,5 +1,6 @@
# https://gist.github.com/spicycode/1229612 # https://gist.github.com/spicycode/1229612
set -g default-terminal "screen-256color"
set -g base-index 1 set -g base-index 1
set-window-option -g automatic-rename off set-window-option -g automatic-rename off
@ -8,6 +9,7 @@ set-option -g set-titles on
set -g status-style 'fg=white, bg=colour8' set -g status-style 'fg=white, bg=colour8'
set -g window-status-current-style 'fg=black, bg=green' set -g window-status-current-style 'fg=black, bg=green'
set -g status-right '#[fg=black, bg=colour2] #(cut -d " " -f 1-3 /proc/loadavg) #[default] #[fg=white, bg=colour238] %H:%M #[default]' set -g status-right '#[fg=black, bg=colour2] #(cut -d " " -f 1-3 /proc/loadavg) #[default] #[fg=white, bg=colour238] %H:%M #[default]'
set -g status-justify centre
set-window-option -g mode-keys vi set-window-option -g mode-keys vi
set -g status-keys vi set -g status-keys vi

18
vimrc
View File

@ -51,7 +51,7 @@ set ttymouse=sgr
set mouse=a set mouse=a
set mousemodel=popup_setpos set mousemodel=popup_setpos
set lazyredraw set lazyredraw
set completeopt=menu,menuone,popup,noselect,noinsert set completeopt=menu,menuone,popup,longest
set timeoutlen=600 set timeoutlen=600
set ballooneval set ballooneval
set balloonevalterm set balloonevalterm
@ -75,8 +75,6 @@ augroup AutoSaveFolds
augroup end augroup end
" Key mappings: " Key mappings:
nnoremap j gj
nnoremap k gk
nmap <silent> ,/ :nohlsearch<CR> nmap <silent> ,/ :nohlsearch<CR>
map <up> <nop> map <up> <nop>
map <down> <nop> map <down> <nop>
@ -85,8 +83,13 @@ map <right> <nop>
map <c-t> <esc>:tabnew<cr> map <c-t> <esc>:tabnew<cr>
" Select just-pasted text: " Select just-pasted text:
nnoremap <Leader>0 `[v`] nnoremap <Leader>0 `[v`]
nnoremap Q @@ map <leader>m :marks<cr>
map <leader>R :registers<cr>
map <leader>v :vsplit<cr>
map <leader>h :split<cr>file browser
map <leader>! <esc>:only<cr>
" ctrl-c to unload a buffer
nnoremap <c-c> :bp\|bd #<cr>
function! ToggleQuickFix() function! ToggleQuickFix()
if empty(filter(getwininfo(), 'v:val.quickfix')) if empty(filter(getwininfo(), 'v:val.quickfix'))
@ -119,11 +122,6 @@ map <leader>T :CommandTFlush<CR>
map <Leader>r :CommandTMRU<CR> map <Leader>r :CommandTMRU<CR>
map <Leader>H :CommandTHelp<CR> map <Leader>H :CommandTHelp<CR>
map <Leader>c :CommandTCommand<CR> map <Leader>c :CommandTCommand<CR>
map <leader>m :marks<cr>
map <leader>R :registers<cr>
map <leader>v :vsplit<cr>
map <leader>h :split<cr>file browser
map <leader>! <esc>:only<cr>
let g:CommandTFileScanner="git" let g:CommandTFileScanner="git"
let g:CommandTGitScanSubmodules=1 let g:CommandTGitScanSubmodules=1
let g:CommandTGitIncludeUntracked=1 let g:CommandTGitIncludeUntracked=1

1
zshrc
View File

@ -129,6 +129,7 @@ git config --global alias.br branch
alias sysc="systemctl" alias sysc="systemctl"
alias hib="sudo systemctl hibernate" alias hib="sudo systemctl hibernate"
alias dcd="docker-compose -f docker-compose.yml -f docker-compose.development.yml" alias dcd="docker-compose -f docker-compose.yml -f docker-compose.development.yml"
# TODO add wg
# recursive grep with line numbers and colour, ignoring binary files: # recursive grep with line numbers and colour, ignoring binary files:
alias gnr="grep -nR -I --color" alias gnr="grep -nR -I --color"