aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.shenanigans.sh4
-rw-r--r--.vimrc6
2 files changed, 3 insertions, 7 deletions
diff --git a/.shenanigans.sh b/.shenanigans.sh
index ab8d5ab..8d92252 100755
--- a/.shenanigans.sh
+++ b/.shenanigans.sh
@@ -48,7 +48,8 @@ if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
48 export HISTSIZE= 48 export HISTSIZE=
49 export HISTFILESIZE= 49 export HISTFILESIZE=
50 export HISTFILE=~/.bash_history_infinite 50 export HISTFILE=~/.bash_history_infinite
51 PROMPT_COMMAND="history -a; history -n; ${PROMPT_COMMAND}" 51 PROMPT_COMMAND="history -a; ${PROMPT_COMMAND}"
52 # PROMPT_COMMAND="history -a; history -n; ${PROMPT_COMMAND}"
52 bind '"\e[A": history-search-backward' 53 bind '"\e[A": history-search-backward'
53 bind '"\e[B": history-search-forward' 54 bind '"\e[B": history-search-forward'
54 export HSTR_CONFIG=hicolor 55 export HSTR_CONFIG=hicolor
@@ -96,5 +97,4 @@ worldclocks() {
96 printf "%-18s %s\n" "Brisbane:" "$(TZ='Australia/Brisbane' date +'%a %H:%M')" 97 printf "%-18s %s\n" "Brisbane:" "$(TZ='Australia/Brisbane' date +'%a %H:%M')"
97 printf "%-18s %s\n" "San Francisco:" "$(TZ='America/Los_Angeles' date +'%a %H:%M')" 98 printf "%-18s %s\n" "San Francisco:" "$(TZ='America/Los_Angeles' date +'%a %H:%M')"
98 printf "%-18s %s\n" "New York:" "$(TZ='America/New_York' date +'%a %H:%M')" 99 printf "%-18s %s\n" "New York:" "$(TZ='America/New_York' date +'%a %H:%M')"
99
100} 100}
diff --git a/.vimrc b/.vimrc
index 1fc7921..01f79ef 100644
--- a/.vimrc
+++ b/.vimrc
@@ -13,7 +13,7 @@ set encoding=utf8 spelllang=en_us laststatus=2 tabstop=4 shiftwidth=4
13set number autoindent cursorline ignorecase hlsearch incsearch signcolumn=yes 13set number autoindent cursorline ignorecase hlsearch incsearch signcolumn=yes
14set hidden nowrap nobackup noswapfile noundofile autoread updatetime=300 14set hidden nowrap nobackup noswapfile noundofile autoread updatetime=300
15set backspace=indent,eol,start completeopt=menuone path+=** 15set backspace=indent,eol,start completeopt=menuone path+=**
16set foldmethod=syntax foldlevel=99 foldopen= lazyredraw 16set foldmethod=syntax foldlevel=99 foldopen= lazyredraw scrolloff=10
17set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/vendor,tags,*.o,*.a,*.so 17set wildignore+=*/.git/*,*/.hg/*,*/.svn/*,*/vendor,tags,*.o,*.a,*.so
18set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case 18set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case
19colorscheme wildcharm 19colorscheme wildcharm
@@ -35,17 +35,13 @@ nnoremap <Leader>d :bd<CR>
35nnoremap <leader>t :term<CR> 35nnoremap <leader>t :term<CR>
36nnoremap <Leader>q :nohlsearch<CR> 36nnoremap <Leader>q :nohlsearch<CR>
37nnoremap <Leader>e :ALEPopulateQuickfix<CR>:sleep 100m<CR>:copen<CR> 37nnoremap <Leader>e :ALEPopulateQuickfix<CR>:sleep 100m<CR>:copen<CR>
38" nnoremap <leader>w :vimgrep /<C-r><C-w>/gj **/*<CR>:copen<CR>
39
40nnoremap <leader>w :silent! grep! <cword> \| cwindow \| redraw!<CR> 38nnoremap <leader>w :silent! grep! <cword> \| cwindow \| redraw!<CR>
41 39
42
43nmap <silent> gr :ALEFindReferences -quickfix<CR>:sleep 100m<CR>:copen<CR> 40nmap <silent> gr :ALEFindReferences -quickfix<CR>:sleep 100m<CR>:copen<CR>
44nmap <silent> gd :ALEGoToDefinition<CR> 41nmap <silent> gd :ALEGoToDefinition<CR>
45nmap <silent> re :ALERename<CR> 42nmap <silent> re :ALERename<CR>
46 43
47let g:ctrlp_use_caching = 0 44let g:ctrlp_use_caching = 0
48" let g:ctrlp_working_path_mode = ''
49let g:ctrlp_working_path_mode = 'ra' 45let g:ctrlp_working_path_mode = 'ra'
50let g:ale_hover_to_floating_preview = 1 46let g:ale_hover_to_floating_preview = 1
51let g:ale_detail_to_floating_preview = 1 47let g:ale_detail_to_floating_preview = 1