Merge branch 'richie'
This commit is contained in:
commit
5d6057ab98
3 changed files with 6 additions and 4 deletions
|
@ -10,8 +10,8 @@
|
||||||
|
|
||||||
|
|
||||||
# Set some defaults.
|
# Set some defaults.
|
||||||
export EDITOR="emacsclient -t"
|
export EDITOR="nvim"
|
||||||
export VISUAL="emacsclient -c -a emacs"
|
export VISUAL="nvim"
|
||||||
export ALTERNATE_EDITOR=""
|
export ALTERNATE_EDITOR=""
|
||||||
export PATH=".:~/bin:~/.local/bin:/usr/games:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
export PATH=".:~/bin:~/.local/bin:/usr/games:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||||
export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
|
export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
[user]
|
[user]
|
||||||
name = Andrew Davidson
|
name = Andrew Davidson
|
||||||
email = andrew@andr3w.net
|
email = amd@amd.im
|
||||||
signingkey = /home/amd/.ssh/id_rsa
|
signingkey = /home/amd/.ssh/id_rsa
|
||||||
|
|
||||||
[color]
|
[color]
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
" ==================== Plugins ====================
|
" ==================== Plugins ====================
|
||||||
call plug#begin()
|
call plug#begin()
|
||||||
|
|
||||||
|
|
||||||
" Git integration
|
" Git integration
|
||||||
Plug 'tpope/vim-fugitive'
|
Plug 'tpope/vim-fugitive'
|
||||||
Plug 'airblade/vim-gitgutter'
|
Plug 'airblade/vim-gitgutter'
|
||||||
|
@ -193,6 +192,9 @@ map q: :q
|
||||||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||||
cmap w!! w !sudo tee > /dev/null %
|
cmap w!! w !sudo tee > /dev/null %
|
||||||
|
|
||||||
|
" Disable F1 key
|
||||||
|
nmap <F1> <nop>
|
||||||
|
|
||||||
" Go shortcuts just for .go files
|
" Go shortcuts just for .go files
|
||||||
autocmd FileType go nmap <leader>r <Plug>(go-run)
|
autocmd FileType go nmap <leader>r <Plug>(go-run)
|
||||||
autocmd FileType go nmap <leader>t <Plug>(go-test)
|
autocmd FileType go nmap <leader>t <Plug>(go-test)
|
||||||
|
|
Loading…
Reference in a new issue