jon/dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Testing conflict resolution

Browse Source
This commit is contained in:
jond
2018-06-24 15:27:25 -05:00
parent 36ce64ada6
commit f9777101cf
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bash/.bashrc
View File

@@ -24,6 +24,7 @@ alias ll='ls -lh'
alias p='ping' alias p='ping'
alias s='sudo' alias s='sudo'
alias ip='ip -c' alias ip='ip -c'
alias fart='/usr/bin/sleep'
#golang stuff #golang stuff
export GOPATH=$HOME/gopath export GOPATH=$HOME/gopath

2
vim/.vimrc
View File

@@ -27,7 +27,7 @@ hi cursorline cterm=none term=none ctermbg=236
set cursorline set cursorline
"enable relative line numbers "enable relative line numbers
set number relativenumber "set number relativenumber
"set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white "set highlight cursorcolumn cterm=NONE ctermbg=darkred ctermfg=white guibg=darkred guifg=white
nnoremap <Leader>c :set cursorline! cursorcolumn!<CR> nnoremap <Leader>c :set cursorline! cursorcolumn!<CR>