Merge branch 'master' of https://gitlab.com/keanegit/dotfiles
This commit is contained in:
Ian Keane
commit
2b7f1f5e8f
6 changed files with 245 additions and 130 deletions
|
|
@ -12,3 +12,5 @@ export DISPLAY=:0
|
||||||
export LIBGL_ALWAYS_INDIRECT=1
|
export LIBGL_ALWAYS_INDIRECT=1
|
||||||
export FZF_DEFAULT_COMMAD="find -L"
|
export FZF_DEFAULT_COMMAD="find -L"
|
||||||
export PATH="$PATH:/opt/mssql-tools/bin"
|
export PATH="$PATH:/opt/mssql-tools/bin"
|
||||||
|
|
||||||
|
stty -ixon # disable ctrl-s terminal freeze
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,13 @@
|
||||||
:100070000C943E020C943E020C943E020C943E0200
|
:100070000C943E020C943E020C943E020C943E0200
|
||||||
:100080000C943E020C943E020C943E020C943E02F0
|
:100080000C943E020C943E020C943E020C943E02F0
|
||||||
:100090000C943E020C943E020C943E020C943E02E0
|
:100090000C943E020C943E020C943E020C943E02E0
|
||||||
:1000A0000C943E020C943E020C943E022B6D140004
|
:1000A0000C943E020C943E020C943E02296D140006
|
||||||
:1000B0001A000800150017002F002961040016001F
|
:1000B0001A000800150017002F002B61040016001D
|
||||||
:1000C000070009000A00260226621D001B00060028
|
:1000C000070009000A002602D75C1D001B0006007D
|
||||||
:1000D000190005000351000000000000E200E300E9
|
:1000D000190005000351000000000000E200E300E9
|
||||||
:1000E000025149002A00130012000C0018001C00E5
|
:1000E000025849002A00130012000C0018001C00DE
|
||||||
:1000F0003000340033000F000E000D000B0027020B
|
:1000F0003000280033000F000E000D000B00270217
|
||||||
:1001000028003800370036001000110001580000A8
|
:10010000340038003700360010001100015800009C
|
||||||
:1001100000000000055146002C0004512B0036025F
|
:1001100000000000055146002C0004512B0036025F
|
||||||
:10012000520037020000000000002900500051007A
|
:10012000520037020000000000002900500051007A
|
||||||
:100130004F00000000000000000000000000B200BE
|
:100130004F00000000000000000000000000B200BE
|
||||||
|
|
@ -27,15 +27,15 @@
|
||||||
:1001A00000004E004A0000000000000000000000B7
|
:1001A00000004E004A0000000000000000000000B7
|
||||||
:1001B00000004B00000000000000000000000000F4
|
:1001B00000004B00000000000000000000000000F4
|
||||||
:1001C000010000002A004C000000000000000000B8
|
:1001C000010000002A004C000000000000000000B8
|
||||||
:1001D000000000004F0052005100500000000000DD
|
:1001D0000000000000004F005200510050000000DD
|
||||||
:1001E000000000000000000000000000000000000F
|
:1001E000000000000000000000000000000000000F
|
||||||
:1001F00000000000000000000000000035001E02AA
|
:1001F00000000000000000000000000035001E02AA
|
||||||
:100200001F02200221022202000000003A003B00EF
|
:100200001F02200221022202000000003A003B00EF
|
||||||
:100210003C003D003E000000000000000000000027
|
:100210003C003D003E000000000000000000000027
|
||||||
:1002200000000000000000000000000000000000CE
|
:1002200000000000000000000000000000000000CE
|
||||||
:10023000000000002D024500440025022402230294
|
:10023000000000002D024500440025022402230294
|
||||||
:100240000000310043004200410040003F00000038
|
:100240000000000043004200410040003F00000069
|
||||||
:10025000000000000000000000000000000000009E
|
:10025000000031000000000000000000000000006D
|
||||||
:10026000000000000000000000000100000000008D
|
:10026000000000000000000000000100000000008D
|
||||||
:10027000000000000000000000000000000000007E
|
:10027000000000000000000000000000000000007E
|
||||||
:10028000BE000000000000000000000000000000B0
|
:10028000BE000000000000000000000000000000B0
|
||||||
|
|
@ -389,8 +389,8 @@
|
||||||
:1018400006C00E947E148F290E945A0BAACF113025
|
:1018400006C00E947E148F290E945A0BAACF113025
|
||||||
:10185000C1F70E947E148F290E948414A2CF111117
|
:10185000C1F70E947E148F290E948414A2CF111117
|
||||||
:1018600006C00E948D148F2D0E94610B9ACF1130FB
|
:1018600006C00E948D148F2D0E94610B9ACF1130FB
|
||||||
:1018700009F497CFF6CF002329F0163008F091CF66
|
:1018700009F497CFF6CF002329F0133008F091CF69
|
||||||
:101880008F2DE2CF153008F08CCFEDCF112359F317
|
:101880008F2DE2CF123008F08CCFEDCF112359F31A
|
||||||
:10189000FD81F93349F42FEF47EE53E021504040EA
|
:10189000FD81F93349F42FEF47EE53E021504040EA
|
||||||
:1018A0005040E1F700C000008D810E941F0B79CFEE
|
:1018A0005040E1F700C000008D810E941F0B79CFEE
|
||||||
:1018B0008981837009F050C0011173CF4D81429529
|
:1018B0008981837009F050C0011173CF4D81429529
|
||||||
|
|
@ -420,8 +420,8 @@
|
||||||
:101A3000E1F0713F41F1002309F445C0111198CE46
|
:101A3000E1F0713F41F1002309F445C0111198CE46
|
||||||
:101A400089818F7124C08D81833F49F1843F99F74B
|
:101A400089818F7124C08D81833F49F1843F99F74B
|
||||||
:101A5000002379F199819F719983892F0E94441203
|
:101A5000002379F199819F719983892F0E94441203
|
||||||
:101A600063E089810E94CD149CCE002341F01530A3
|
:101A600063E089810E94CD149CCE002341F01230A6
|
||||||
:101A700008F097CE89818F710E94AA1292CE1630FB
|
:101A700008F097CE89818F710E94AA1292CE1330FE
|
||||||
:101A800008F08FCEF7CF89818F71002349F20E9431
|
:101A800008F08FCEF7CF89818F71002349F20E9431
|
||||||
:101A9000441287CE89818F710023C9F3C1CF0023FF
|
:101A9000441287CE89818F710023C9F3C1CF0023FF
|
||||||
:101AA00029F089818F710E941F127BCE0E941A1229
|
:101AA00029F089818F710E941F127BCE0E941A1229
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
"layout":"LAYOUT",
|
"layout":"LAYOUT",
|
||||||
"layers":[
|
"layers":[
|
||||||
[
|
[
|
||||||
"LCAG_T(KC_TAB)",
|
"LCAG_T(KC_ESC)",
|
||||||
"KC_Q",
|
"KC_Q",
|
||||||
"KC_W",
|
"KC_W",
|
||||||
"KC_E",
|
"KC_E",
|
||||||
|
|
@ -21,7 +21,7 @@
|
||||||
"KC_O",
|
"KC_O",
|
||||||
"KC_P",
|
"KC_P",
|
||||||
"KC_BSPC",
|
"KC_BSPC",
|
||||||
"LCTL_T(KC_ESC)",
|
"LCTL_T(KC_TAB)",
|
||||||
"KC_A",
|
"KC_A",
|
||||||
"KC_S",
|
"KC_S",
|
||||||
"KC_D",
|
"KC_D",
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
"KC_K",
|
"KC_K",
|
||||||
"KC_L",
|
"KC_L",
|
||||||
"KC_SCLN",
|
"KC_SCLN",
|
||||||
"KC_QUOT",
|
"KC_ENT",
|
||||||
"KC_LSPO",
|
"KC_LSPO",
|
||||||
"KC_Z",
|
"KC_Z",
|
||||||
"KC_X",
|
"KC_X",
|
||||||
|
|
@ -48,10 +48,10 @@
|
||||||
"KC_COMM",
|
"KC_COMM",
|
||||||
"KC_DOT",
|
"KC_DOT",
|
||||||
"KC_SLSH",
|
"KC_SLSH",
|
||||||
"KC_ENT",
|
"KC_QUOT",
|
||||||
"KC_LALT",
|
"KC_LALT",
|
||||||
"KC_LGUI",
|
"KC_LGUI",
|
||||||
"MO(2)",
|
"TT(2)",
|
||||||
"KC_INS",
|
"KC_INS",
|
||||||
"MO(4)",
|
"MO(4)",
|
||||||
"KC_SPC",
|
"KC_SPC",
|
||||||
|
|
@ -190,25 +190,25 @@
|
||||||
"KC_F8",
|
"KC_F8",
|
||||||
"KC_F9",
|
"KC_F9",
|
||||||
"KC_F10",
|
"KC_F10",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
|
"KC_NO",
|
||||||
"KC_BSLS",
|
"KC_BSLS",
|
||||||
"KC_NO",
|
"KC_NO",
|
||||||
"KC_NO",
|
"KC_NO",
|
||||||
"KC_NO",
|
"KC_NO",
|
||||||
"KC_NO",
|
"KC_NO",
|
||||||
"KC_NO",
|
"KC_NO",
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_NO",
|
|
||||||
"KC_TRNS",
|
"KC_TRNS",
|
||||||
"KC_NO",
|
"KC_NO",
|
||||||
"KC_NO",
|
"KC_NO",
|
||||||
|
|
|
||||||
236
vim/.vimrc
236
vim/.vimrc
|
|
@ -29,40 +29,37 @@
|
||||||
" Plug 'kovisoft/paredit'
|
" Plug 'kovisoft/paredit'
|
||||||
Plug 'sainnhe/vim-color-forest-night'
|
Plug 'sainnhe/vim-color-forest-night'
|
||||||
Plug 'justinmk/vim-sneak'
|
Plug 'justinmk/vim-sneak'
|
||||||
Plug 'christoomey/vim-tmux-navigator'
|
Plug 'axvr/zepl.vim'
|
||||||
Plug 'ap/vim-css-color'
|
" Plug 'kovisoft/slimv'
|
||||||
|
Plug 'tpope/vim-vinegar'
|
||||||
|
Plug 'preservim/nerdtree'
|
||||||
|
Plug 'vimwiki/vimwiki'
|
||||||
|
Plug 'simnalamburt/vim-mundo'
|
||||||
|
Plug 'tpope/vim-dadbod'
|
||||||
|
Plug 'junegunn/gv.vim'
|
||||||
|
Plug 'rbong/vim-flog'
|
||||||
|
Plug 'tpope/vim-unimpaired'
|
||||||
|
" Clojure
|
||||||
|
Plug 'guns/vim-clojure-static' " syntax
|
||||||
|
Plug 'tpope/vim-fireplace'
|
||||||
|
Plug 'guns/vim-sexp'
|
||||||
|
Plug 'tpope/vim-sexp-mappings-for-regular-people'
|
||||||
Plug 'dylanaraps/wal.vim'
|
Plug 'dylanaraps/wal.vim'
|
||||||
Plug 'sjl/tslime.vim'
|
Plug 'alvan/vim-closetag'
|
||||||
" TODO setup
|
Plug 'mattn/emmet-vim'
|
||||||
Plug 'roxma/vim-tmux-clipboard'
|
" Plug 'tpope/vim-salve'
|
||||||
" TODO setup
|
Plug 'chrisbra/colorizer'
|
||||||
Plug 'melonmanchan/vim-tmux-resizer'
|
" cljfold
|
||||||
" Plug 'roman/golden-ratio'
|
|
||||||
Plug 'kovisoft/slimv'
|
|
||||||
|
|
||||||
" Todo:
|
" " Todo:
|
||||||
" GV
|
" "
|
||||||
" Gundo (or undotree?)
|
|
||||||
" Emmett
|
|
||||||
" Fugitive
|
|
||||||
" Vimwiki
|
|
||||||
" Plug 'ryanss/vim-hackernews'
|
|
||||||
" Plug 'mbbill/undotree' or Plug 'sjl/gundo.vim'
|
|
||||||
" Plug 'tpope/vim-projectionist'
|
|
||||||
" Plug 'mileszs/ack.vim'
|
|
||||||
" Plug 'vim-pandoc/vim-pandoc'
|
|
||||||
" Plug 'alfredodeza/pytest.vim'
|
|
||||||
" Plug 'docker/docker'
|
|
||||||
" Plug vim-scripts/indentpython.vim
|
|
||||||
"
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" appearance {{{
|
" appearance {{{
|
||||||
|
" colorscheme zenburn
|
||||||
colorscheme zenburn
|
colorscheme wal
|
||||||
" colorscheme wal
|
|
||||||
syntax on " Enable syntax
|
syntax on " Enable syntax
|
||||||
set encoding=utf-8 " Keep utf-8 encoding
|
set encoding=utf-8 " Keep utf-8 encoding
|
||||||
set scrolloff=2 " Keep at least 3 lines above and below cursor
|
set scrolloff=2 " Keep at least 3 lines above and below cursor
|
||||||
|
|
@ -78,9 +75,16 @@
|
||||||
hi CursorLineNr cterm=bold
|
hi CursorLineNr cterm=bold
|
||||||
|
|
||||||
" Lightline
|
" Lightline
|
||||||
let g:lightline = { 'colorscheme': 'sceaduhelm', }
|
let g:lightline = { 'colorscheme': 'sceaduhelm' }
|
||||||
set fillchars+=vert:│
|
set fillchars+=vert:│
|
||||||
|
|
||||||
|
command! LightlineReload call LightlineReload()
|
||||||
|
|
||||||
|
function! LightlineReload()
|
||||||
|
call lightline#init()
|
||||||
|
call lightline#colorscheme()
|
||||||
|
call lightline#update()
|
||||||
|
endfunction
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" Movement {{{
|
" Movement {{{
|
||||||
|
|
@ -106,13 +110,14 @@
|
||||||
set lazyredraw " Redraw only when necessary
|
set lazyredraw " Redraw only when necessary
|
||||||
set updatetime=100 " Make updates happen faster (gitgutter)
|
set updatetime=100 " Make updates happen faster (gitgutter)
|
||||||
set splitright " Make split to right by default
|
set splitright " Make split to right by default
|
||||||
|
set splitbelow
|
||||||
set winheight=30 " Soft minimum window height (active)
|
set winheight=30 " Soft minimum window height (active)
|
||||||
set winminheight=10 " Hard minimum window height (inactive)
|
"set winminheight=10 " Hard minimum window height (inactive)
|
||||||
set winwidth=80 " Window width for current window
|
set winwidth=85 " Window width for current window
|
||||||
set winminwidth=30 " Hard minimum for window width
|
set winminwidth=30 " Hard minimum for window width
|
||||||
set timeoutlen=1000
|
set t_vb= " No visual bell ever
|
||||||
set ttimeoutlen=0
|
let g:sneak#use_ic_scs=1
|
||||||
|
set virtualedit=block
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" searching {{{
|
" searching {{{
|
||||||
|
|
@ -125,10 +130,6 @@
|
||||||
" Nnoremap <tab> %
|
" Nnoremap <tab> %
|
||||||
" Vnoremap <tab> %
|
" Vnoremap <tab> %
|
||||||
" Remap tab to jump by window
|
" Remap tab to jump by window
|
||||||
nnoremap <tab> :tabn<CR>
|
|
||||||
vnoremap <tab> :tabn<CR>
|
|
||||||
nnoremap <S-tab> :tabp<CR>
|
|
||||||
vnoremap <S-tab> :tabp<CR>
|
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
|
|
@ -151,10 +152,10 @@
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" long line handling {{{
|
" long line handling {{{
|
||||||
set textwidth=79
|
" set textwidth=79
|
||||||
set fo=t
|
" set fo=t
|
||||||
" set colorcolumn=85
|
" set colorcolumn=85
|
||||||
"
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" leaders {{{
|
" leaders {{{
|
||||||
|
|
@ -198,17 +199,37 @@
|
||||||
nnoremap k gk
|
nnoremap k gk
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
"
|
|
||||||
" slimv{{{
|
" slimv{{{
|
||||||
let g:slimv_repl_split=2
|
" let g:slimv_repl_split=2
|
||||||
let g:slimv_repl_split_size=10
|
" let g:slimv_repl_split_size=10
|
||||||
"
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
|
" {{{ web dev
|
||||||
|
autocmd FileType html set softtabstop=2
|
||||||
|
autocmd FileType html set ts=2
|
||||||
|
autocmd FileType html set shiftwidth=2
|
||||||
|
autocmd FileType css set softtabstop=2
|
||||||
|
autocmd FileType css set ts=2
|
||||||
|
autocmd FileType html set shiftwidth=2
|
||||||
|
|
||||||
|
" Emmet tab size
|
||||||
|
let g:user_emmet_settings = {
|
||||||
|
\ 'indentation' : ' '
|
||||||
|
\}
|
||||||
|
" }}}
|
||||||
|
|
||||||
|
" clojure {{{
|
||||||
|
" TODO: make only work in clojure files
|
||||||
|
nnoremap <leader>e :Eval<CR> " eval form
|
||||||
|
nnoremap <leader>E :%Eval<CR> " eval file
|
||||||
|
" }}}
|
||||||
|
|
||||||
" split pane navigation {{{
|
" split pane navigation {{{
|
||||||
" Map vertical split to \ w, switch to it, open explorer, prompt for filename
|
" Map vertical split to \ w, switch to it, open explorer, prompt for filename
|
||||||
" TODO: make new window prompt use fzf
|
" TODO: make new window prompt use fzf
|
||||||
nnoremap <leader>w <C-w>v<C-w>l:e <C-S-d><BS><BS>open
|
" nnoremap <leader>w <C-w>v<C-w>l:e <C-S-d><BS><BS>open
|
||||||
" Switch panes wit ctrl + h/j/k/l
|
" Switch panes wit ctrl + h/j/k/l
|
||||||
nnoremap <C-h> <C-w>h
|
nnoremap <C-h> <C-w>h
|
||||||
nnoremap <C-j> <C-w>j
|
nnoremap <C-j> <C-w>j
|
||||||
|
|
@ -216,11 +237,16 @@
|
||||||
nnoremap <C-l> <C-w>l
|
nnoremap <C-l> <C-w>l
|
||||||
nnoremap <C-c> :close <cr>
|
nnoremap <C-c> :close <cr>
|
||||||
nnoremap <C-n> :bn <cr>
|
nnoremap <C-n> :bn <cr>
|
||||||
nnoremap <C-x> :bd <cr>
|
" Term mode
|
||||||
" Map resize pane
|
tnoremap <C-h> <C-w>h
|
||||||
|
tnoremap <C-j> <C-w>j
|
||||||
|
tnoremap <C-k> <C-w>k
|
||||||
|
tnoremap <C-l> <C-w>l
|
||||||
|
tnoremap <C-c> :close <cr>
|
||||||
|
tnoremap <C-n> :bn <cr>
|
||||||
|
tnoremap <Esc> <C-\><C-n>
|
||||||
|
|
||||||
" TODO: remap pane resize to something else (leader?)
|
" TODO: remap pane resize to something else (leader?)
|
||||||
map + :vertical resize +5<CR>
|
|
||||||
map - :vertical resize -5<CR>
|
|
||||||
" quick-scope
|
" quick-scope
|
||||||
" Trigger a highlight in the appropriate direction when pressing these keys:
|
" Trigger a highlight in the appropriate direction when pressing these keys:
|
||||||
let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
|
let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
|
||||||
|
|
@ -231,10 +257,7 @@
|
||||||
autocmd ColorScheme * highlight QuickScopeSecondary guifg='#5fffff' gui=underline ctermfg=81 cterm=underline
|
autocmd ColorScheme * highlight QuickScopeSecondary guifg='#5fffff' gui=underline ctermfg=81 cterm=underline
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
"}}}
|
nnoremap <c-s> gt
|
||||||
|
|
||||||
" launch love game, check youtube love2d roguelike+rpg day 1 if broken {{{
|
|
||||||
" map ,t :! /Applications/love.app/Contents/MacOS/love . <CR>
|
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
|
|
@ -298,38 +321,109 @@
|
||||||
nmap ga <Plug>(EasyAlign)
|
nmap ga <Plug>(EasyAlign)
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
"
|
|
||||||
" git commands {{{
|
" git commands {{{
|
||||||
" TODO: map fugitive commands
|
|
||||||
" TODO: check out gv etc
|
|
||||||
" TODO: bind hunk committing
|
|
||||||
" Gitgutter hunk view
|
|
||||||
nmap ghv <Plug>(GitGutterPreviewHunk)
|
nmap ghv <Plug>(GitGutterPreviewHunk)
|
||||||
nmap ghn <Plug>(GitGutterNextHunk)
|
nmap ghn <Plug>(GitGutterNextHunk)
|
||||||
nmap ghp <Plug>(GitGutterPrevHunk)
|
nmap ghp <Plug>(GitGutterPrevHunk)
|
||||||
nmap ghf <Plug>(GitGutterFold)
|
nmap ghf <Plug>(GitGutterFold)
|
||||||
|
nmap ghs <Plug>(GitGutterStageHunk)
|
||||||
" Controls fugitive diff split direction
|
" Controls fugitive diff split direction
|
||||||
set diffopt=vertical
|
set diffopt=vertical
|
||||||
|
command! Gundo !git reset --soft HEAD~1
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" plugin modification {{{
|
" fold search {{{
|
||||||
"
|
|
||||||
|
" command to fold everything except what you searched for
|
||||||
|
command! -nargs=* Fs
|
||||||
|
\ if <q-args> != '' |
|
||||||
|
\ exe "normal /".<q-args>."\<CR>" |
|
||||||
|
\ endif |
|
||||||
|
\ if @/ != '' |
|
||||||
|
\ setlocal
|
||||||
|
\ foldexpr=FoldRegex(v:lnum,@/,2)
|
||||||
|
\ foldmethod=expr
|
||||||
|
\ foldlevel=0 |
|
||||||
|
\ endif
|
||||||
|
|
||||||
|
function! FoldRegex(lnum,pat,context)
|
||||||
|
" get start/end positions for context lines
|
||||||
|
let startline=a:lnum-a:context
|
||||||
|
while startline < 1
|
||||||
|
let startline+=1
|
||||||
|
endwhile
|
||||||
|
let endline=a:lnum+a:context
|
||||||
|
while endline > line('$')
|
||||||
|
let endline-=1
|
||||||
|
endwhile
|
||||||
|
|
||||||
|
let returnval = 2
|
||||||
|
|
||||||
|
let pos=getpos('.')
|
||||||
|
|
||||||
|
" search from current line to get matches ON the line
|
||||||
|
call cursor(a:lnum, 1)
|
||||||
|
let matchline=search(a:pat,'cW',endline)
|
||||||
|
if matchline==a:lnum
|
||||||
|
let returnval = 0
|
||||||
|
elseif matchline > 0
|
||||||
|
" if current line didn't match, there could have been a match within
|
||||||
|
" trailing context lines
|
||||||
|
let returnval = 1
|
||||||
|
else
|
||||||
|
" if no match at current line, search leading context lines for a match
|
||||||
|
call cursor(startline, 1)
|
||||||
|
let matchline=search(a:pat,'cW',a:lnum)
|
||||||
|
if matchline > 0
|
||||||
|
let returnval = 1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
call setpos('.',pos)
|
||||||
|
|
||||||
|
return returnval
|
||||||
|
endfun
|
||||||
|
|
||||||
|
" }}}
|
||||||
|
|
||||||
|
" copy matches {{{
|
||||||
|
|
||||||
|
function! CopyMatches(reg)
|
||||||
|
let hits = []
|
||||||
|
%s//\=len(add(hits, submatch(0))) ? submatch(0) : ''/gne
|
||||||
|
let reg = empty(a:reg) ? '+' : a:reg
|
||||||
|
execute 'let @'.reg.' = join(hits, "\n") . "\n"'
|
||||||
|
endfunction
|
||||||
|
command! -register CopyMatches call CopyMatches(<q-reg>)
|
||||||
|
|
||||||
|
" }}}
|
||||||
|
|
||||||
|
" vimrc {{{
|
||||||
|
" source $MYVIMRC reloads the saved $MYVIMRC
|
||||||
|
:nmap <Leader>s :source $MYVIMRC
|
||||||
|
|
||||||
|
" opens $MYVIMRC for editing, or use :tabedit $MYVIMRC
|
||||||
|
:nmap <Leader>v :e $MYVIMRC
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" gvim {{{
|
|
||||||
set guioptions=Ace
|
|
||||||
|
|
||||||
|
" zepl {{{
|
||||||
|
augroup zepl
|
||||||
|
autocmd!
|
||||||
|
autocmd FileType python let b:repl_config = { 'cmd': 'python3' }
|
||||||
|
autocmd FileType javascript let b:repl_config = { 'cmd': 'python3' }
|
||||||
|
autocmd FileType clojure let b:repl_config = { 'cmd': 'clj' }
|
||||||
|
autocmd FileType scheme let b:repl_config = { 'cmd': 'rlwrap csi' }
|
||||||
|
autocmd FileType lisp let b:repl_config = { 'cmd': 'sbcl' }
|
||||||
|
autocmd FileType julia let b:repl_config = { 'cmd': 'julia' }
|
||||||
|
" autocmd FileType cs let b:repl_config = { 'cmd': '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"' }
|
||||||
|
autocmd FileType cs let b:repl_config = { 'cmd': 'cmd' }
|
||||||
|
augroup END
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" tmux {{{
|
" TODO: rebind c-n
|
||||||
" tslime
|
" TODO: change ,k to ,n and add notes to version control
|
||||||
let g:tslime_ensure_trailing_newlines = 1
|
|
||||||
let g:tslime_ensure_trailing_newlines = 1
|
|
||||||
let g:tslime_normal_mapping = '<leader>t'
|
|
||||||
let g:tslime_visual_mapping = '<leader>t'
|
|
||||||
let g:tslime_vars_mapping = '<leader>T'
|
|
||||||
|
|
||||||
"}}}
|
|
||||||
|
|
||||||
" folding options, this must be last in file
|
" folding options, this must be last in file
|
||||||
" vim:foldmethod=marker:foldlevel=0
|
" vim:foldmethod=marker:foldlevel=0
|
||||||
|
|
|
||||||
68
vim/_vimrc
68
vim/_vimrc
|
|
@ -11,7 +11,6 @@
|
||||||
|
|
||||||
Plug 'junegunn/vim-easy-align'
|
Plug 'junegunn/vim-easy-align'
|
||||||
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin --all' }
|
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin --all' }
|
||||||
Plug 'junegunn/fzf.vim'
|
|
||||||
Plug 'tpope/vim-surround'
|
Plug 'tpope/vim-surround'
|
||||||
Plug 'tpope/vim-commentary'
|
Plug 'tpope/vim-commentary'
|
||||||
Plug 'w0rp/ale'
|
Plug 'w0rp/ale'
|
||||||
|
|
@ -31,32 +30,28 @@
|
||||||
Plug 'sainnhe/vim-color-forest-night'
|
Plug 'sainnhe/vim-color-forest-night'
|
||||||
Plug 'justinmk/vim-sneak'
|
Plug 'justinmk/vim-sneak'
|
||||||
Plug 'axvr/zepl.vim'
|
Plug 'axvr/zepl.vim'
|
||||||
Plug 'kovisoft/slimv'
|
" Plug 'kovisoft/slimv'
|
||||||
Plug 'tpope/vim-vinegar'
|
Plug 'tpope/vim-vinegar'
|
||||||
" Plug 'preservim/nerdtree'
|
Plug 'preservim/nerdtree'
|
||||||
Plug 'vimwiki/vimwiki'
|
Plug 'vimwiki/vimwiki'
|
||||||
Plug 'simnalamburt/vim-mundo'
|
Plug 'simnalamburt/vim-mundo'
|
||||||
Plug 'tpope/vim-dadbod'
|
Plug 'tpope/vim-dadbod'
|
||||||
Plug 'junegunn/gv.vim'
|
Plug 'junegunn/gv.vim'
|
||||||
Plug 'rbong/vim-flog'
|
Plug 'rbong/vim-flog'
|
||||||
Plug 'tpope/vim-unimpaired'
|
Plug 'tpope/vim-unimpaired'
|
||||||
Plug 'junegunn/goyo.vim'
|
" Clojure
|
||||||
|
Plug 'guns/vim-clojure-static' " syntax
|
||||||
|
Plug 'tpope/vim-fireplace'
|
||||||
|
Plug 'guns/vim-sexp'
|
||||||
|
Plug 'tpope/vim-sexp-mappings-for-regular-people'
|
||||||
|
Plug 'dylanaraps/wal.vim'
|
||||||
|
Plug 'alvan/vim-closetag'
|
||||||
|
Plug 'mattn/emmet-vim'
|
||||||
|
" Plug 'tpope/vim-salve'
|
||||||
|
Plug 'chrisbra/colorizer'
|
||||||
|
" cljfold
|
||||||
|
|
||||||
" Todo:
|
" Todo:
|
||||||
" GV
|
|
||||||
" Gundo (or undotree?)
|
|
||||||
" Emmett
|
|
||||||
" Fugitive
|
|
||||||
" Vimwiki
|
|
||||||
" Plug 'ryanss/vim-hackernews'
|
|
||||||
" Plug 'mbbill/undotree' or Plug 'sjl/gundo.vim'
|
|
||||||
" Plug 'tpope/vim-projectionist'
|
|
||||||
" Plug 'mileszs/ack.vim'
|
|
||||||
" Plug 'vim-pandoc/vim-pandoc'
|
|
||||||
" Plug 'alfredodeza/pytest.vim'
|
|
||||||
" Plug 'docker/docker'
|
|
||||||
" Plug vim-scripts/indentpython.vim
|
|
||||||
"
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
@ -176,6 +171,7 @@
|
||||||
nnoremap <leader>d k :r !date <cr>
|
nnoremap <leader>d k :r !date <cr>
|
||||||
|
|
||||||
nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
|
nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
|
||||||
|
tnoremap <leader><esc> <C-\><C-n>
|
||||||
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
|
|
@ -205,11 +201,31 @@
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" slimv{{{
|
" slimv{{{
|
||||||
let g:slimv_repl_split=2
|
" let g:slimv_repl_split=2
|
||||||
let g:slimv_repl_split_size=10
|
" let g:slimv_repl_split_size=10
|
||||||
"
|
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
|
" {{{ web dev
|
||||||
|
autocmd FileType html set softtabstop=2
|
||||||
|
autocmd FileType html set ts=2
|
||||||
|
autocmd FileType html set shiftwidth=2
|
||||||
|
autocmd FileType css set softtabstop=2
|
||||||
|
autocmd FileType css set ts=2
|
||||||
|
autocmd FileType html set shiftwidth=2
|
||||||
|
|
||||||
|
" Emmet tab size
|
||||||
|
let g:user_emmet_settings = {
|
||||||
|
\ 'indentation' : ' '
|
||||||
|
\}
|
||||||
|
" }}}
|
||||||
|
|
||||||
|
" clojure {{{
|
||||||
|
" TODO: make only work in clojure files
|
||||||
|
nnoremap <leader>e :Eval<CR> " eval form
|
||||||
|
nnoremap <leader>E :%Eval<CR> " eval file
|
||||||
|
" }}}
|
||||||
|
|
||||||
" split pane navigation {{{
|
" split pane navigation {{{
|
||||||
" Map vertical split to \ w, switch to it, open explorer, prompt for filename
|
" Map vertical split to \ w, switch to it, open explorer, prompt for filename
|
||||||
" TODO: make new window prompt use fzf
|
" TODO: make new window prompt use fzf
|
||||||
|
|
@ -308,15 +324,15 @@
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" git commands {{{
|
" git commands {{{
|
||||||
" TODO: map fugitive commands
|
|
||||||
" TODO: check out gv etc
|
|
||||||
" TODO: bind hunk committing
|
|
||||||
" Gitgutter hunk view
|
" Gitgutter hunk view
|
||||||
nmap ghv <Plug>(GitGutterPreviewHunk)
|
nmap ghv <Plug>(GitGutterPreviewHunk)
|
||||||
nmap ghn <Plug>(GitGutterNextHunk)
|
nmap ghn <Plug>(GitGutterNextHunk)
|
||||||
nmap ghp <Plug>(GitGutterPrevHunk)
|
nmap ghp <Plug>(GitGutterPrevHunk)
|
||||||
nmap ghf <Plug>(GitGutterFold)
|
nmap ghf <Plug>(GitGutterFold)
|
||||||
|
nmap ghs <Plug>(GitGutterStageHunk)
|
||||||
|
" Controls fugitive diff split direction
|
||||||
|
set diffopt=vertical
|
||||||
|
command! Gundo !git reset --soft HEAD~1
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
" fold search {{{
|
" fold search {{{
|
||||||
|
|
@ -407,6 +423,8 @@ command! -register CopyMatches call CopyMatches(<q-reg>)
|
||||||
augroup END
|
augroup END
|
||||||
"}}}
|
"}}}
|
||||||
|
|
||||||
|
" TODO: rebind c-n
|
||||||
|
" TODO: change ,k to ,n and add notes to version control
|
||||||
|
|
||||||
" folding options, this must be last in file
|
" folding options, this must be last in file
|
||||||
" vim:foldmethod=marker:foldlevel=0
|
" vim:foldmethod=marker:foldlevel=0
|
||||||
|
|
|
||||||
|
|
@ -83,3 +83,4 @@ man() {
|
||||||
command man "$@"
|
command man "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stty -ixon # remove ctrl-s terminal freeze
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue