this repo has no description
Cleanup cruft
+74
-95
-2
nvim/after/ftplugin/dirvish.vim
-2
nvim/after/ftplugin/dirvish.vim
+1
-1
nvim/after/ftplugin/elixir.vim
+1
-1
nvim/after/ftplugin/elixir.vim
-1
nvim/after/ftplugin/gina-blame.vim
-1
nvim/after/ftplugin/gina-blame.vim
···
1
-
let b:deoplete_disable_auto_complete = 1
+1
-1
nvim/after/ftplugin/gitcommit.vim
+1
-1
nvim/after/ftplugin/gitcommit.vim
-4
nvim/after/ftplugin/haskell.vim
-4
nvim/after/ftplugin/haskell.vim
···
1
1
" Tab specific option
2
2
setlocal tabstop=8 "A tab is 8 spaces
3
3
setlocal expandtab "Always uses spaces instead of tabs
4
-
setlocal softtabstop=4 "Insert 4 spaces when tab is pressed
5
-
setlocal shiftwidth=4 "An indent is 4 spaces
6
-
setlocal smarttab "Indent instead of tab at start of line
7
4
setlocal shiftround "Round spaces to nearest shiftwidth multiple
8
5
setlocal nojoinspaces "Don't convert spaces to tabs
9
-
setlocal conceallevel=2
-2
nvim/after/ftplugin/markdown.vim
-2
nvim/after/ftplugin/markdown.vim
+7
nvim/after/ftplugin/qf.vim
+7
nvim/after/ftplugin/qf.vim
···
1
1
nnoremap <buffer><silent> q :cclose<CR>
2
2
nnoremap <buffer><silent> O <CR>:cclose<CR>
3
+
4
+
let &l:statusline = ""
5
+
let &l:statusline .= " "
6
+
let &l:statusline .= "» %{statusline#quickfix_name()} «%<"
7
+
let &l:statusline .= "%="
8
+
let &l:statusline .= "%{statusline#quickfix()}%4c:%l"
9
+
let &l:statusline .= " "
+5
-25
nvim/after/ftplugin/rust.vim
+5
-25
nvim/after/ftplugin/rust.vim
···
1
1
compiler cargo
2
2
3
+
setlocal iskeyword+=!
3
4
setlocal formatprg=rustfmt\ --write-mode=display
4
5
let g:rustfmt_autosave = 1
5
-
6
-
" let g:neomake_rust_cargo_maker = {
7
-
" \ 'append_file': 0,
8
-
" \ 'args': ['check'],
9
-
" \ 'errorformat':
10
-
" \ '%-G%f:%s:,' .
11
-
" \ '%f:%l:%c: %trror: %m,' .
12
-
" \ '%f:%l:%c: %tarning: %m,' .
13
-
" \ '%f:%l:%c: %m,'.
14
-
" \ '%f:%l: %trror: %m,'.
15
-
" \ '%f:%l: %tarning: %m,'.
16
-
" \ '%f:%l: %m',
17
-
" \ }
18
-
19
-
" let g:neomake_rust_rustc_maker = {
20
-
" \ 'args': ['-Z', 'parse-only'],
21
-
" \ 'errorformat':
22
-
" \ '%-G%f:%s:,' .
23
-
" \ '%f:%l:%c: %trror: %m,' .
24
-
" \ '%f:%l:%c: %tarning: %m,' .
25
-
" \ '%f:%l:%c: %m,'.
26
-
" \ '%f:%l: %trror: %m,'.
27
-
" \ '%f:%l: %tarning: %m,'.
28
-
" \ '%f:%l: %m',
29
-
" \ }
6
+
let g:racer_experimental_completer = 1
30
7
31
8
inoreabbrev excr extern crate
9
+
10
+
nnoremap <buffer> K <Plug>(rust-doc)
11
+
nnoremap <buffer> <C-]> <Plug>(rust-def)
32
12
33
13
ClearSwapList
34
14
+1
-1
nvim/after/ftplugin/terraform.vim
+1
-1
nvim/after/ftplugin/terraform.vim
-1
nvim/after/ftplugin/vim.vim
-1
nvim/after/ftplugin/vim.vim
···
1
-
command! Update source % | PlugInstall
+5
-1
nvim/autoload/statusline.vim
+5
-1
nvim/autoload/statusline.vim
···
8
8
endfunction
9
9
10
10
function! statusline#repo()
11
-
return gina#component#repo#branch() . ' ' .gina#component#status#preset('fancy')
11
+
return gina#component#repo#branch()
12
+
endfunction
13
+
14
+
function! statusline#quickfix_name()
15
+
return qf#IsQfWindow(winnr()) ? 'QuickFix' : 'Location'
12
16
endfunction
+52
-32
nvim/init.vim
+52
-32
nvim/init.vim
···
8
8
" }}}
9
9
10
10
" Plugins {{{
11
-
command! PackUpdate packadd minpac | source $MYVIMRC | call minpac#update()
12
-
command! PackClean packadd minpac | source $MYVIMRC | call minpac#clean()
11
+
command! -bar PackUpdate packadd minpac | source $MYVIMRC | call minpac#update()
12
+
command! -bar PackClean packadd minpac | source $MYVIMRC | call minpac#clean()
13
13
14
14
set packpath^=~/.local/share/nvim
15
15
···
61
61
call minpac#add('AndrewRadev/splitjoin.vim')
62
62
call minpac#add('hauleth/sad.vim')
63
63
" }}}
64
-
" Task running {{{
64
+
" Task running & quickfix {{{
65
65
call minpac#add('skywind3000/asyncrun.vim')
66
66
call minpac#add('romainl/vim-qf')
67
+
call minpac#add('romainl/vim-qlist')
67
68
" }}}
68
69
" Utils {{{
69
70
call minpac#add('wellle/targets.vim')
···
118
119
let &laststatus = 2
119
120
let &statusline = ""
120
121
let &statusline .= " "
121
-
let &statusline .= "%{statusline#repo()}"
122
+
let &statusline .= "» %f%{statusline#modified()} «%<"
122
123
let &statusline .= "%="
123
-
let &statusline .= "» %f%{statusline#modified()} «"
124
-
let &statusline .= "%="
124
+
let &statusline .= "%{statusline#repo()}"
125
+
let &statusline .= " "
125
126
let &statusline .= "%{statusline#quickfix()}%4c:%l"
126
127
let &statusline .= " "
127
128
" }}}
···
130
131
" Smart case searches
131
132
set ignorecase smartcase inccommand=nosplit
132
133
" }}}
133
-
" Backup, swap & undo {{{
134
-
" Turn backup off, since most stuff is in SVN, git etc. anyway... {{{
135
-
set nobackup noswapfile
136
-
" }}}
137
-
" Keep undo history across sessions, by storing in file {{{
138
-
if !isdirectory($HOME . '/.cache/backups')
139
-
silent !mkdir -p ~/.cache/backups > /dev/null 2>&1
140
-
endif
141
-
let &undodir=$HOME . '/.cache/backups'
134
+
" Permanent undo {{{
142
135
set undofile
143
-
set undolevels=1000
144
-
set undoreload=10000
145
-
" }}}
146
136
" }}}
147
137
" Mappings {{{
148
138
" Fuzzy file search {{{
149
139
nnoremap <Space><Space> :<C-u>SK<CR>
150
140
" }}}
151
141
" Git shortcuts {{{
142
+
nnoremap U <nop>
152
143
nnoremap Up :<C-u>Gina push<CR>
153
144
nnoremap Us :<C-u>keepalt Gina status -s<CR>
154
145
nnoremap Ud :<C-u>keepalt Gina diff :<CR>
···
168
159
cabbr Git! Gina!
169
160
" }}}
170
161
" Sad changes {{{
171
-
nmap c <Plug>(sad-change-forward)
172
-
vmap c <Plug>(sad-change-forward)
173
-
nmap C <Plug>(sad-change-forward)$
174
-
nnoremap cc cc
175
-
nnoremap <Space>c c
176
-
nnoremap <Space>C C
177
-
vnoremap <Space>c c
162
+
" nmap c <Plug>(sad-change-forward)
163
+
" vmap c <Plug>(sad-change-forward)
164
+
" nmap C <Plug>(sad-change-forward)$
165
+
" nnoremap cc cc
166
+
" nnoremap <Space>c c
167
+
" nnoremap <Space>C C
168
+
" vnoremap <Space>c c
178
169
" }}}
179
-
" Asynchronous make {{{
170
+
" Asynchronous commands {{{
180
171
command! -bang -nargs=* -complete=file Make AsyncRun -program=make @ <args>
172
+
command! -bang -nargs=* -complete=file Grep AsyncRun -program=grep @ <args>
181
173
" }}}
182
174
" Expand abbreviations on enter {{{
183
175
inoremap <CR> <C-]><CR>
184
176
" }}}
185
-
" Smart <Home> and `^` {{{
186
-
" <Home> goes to the beginning of the text on first press and to the beginning
177
+
" Smart `^` {{{
178
+
" `^` goes to the beginning of the text on first press and to the beginning
187
179
" of the line on second press. It alternates afterwards.
188
180
nnoremap <expr> ^ virtcol('.') - 1 <= indent('.') && col('.') > 1 ? '0' : '_'
189
181
" }}}
···
203
195
" Folding {{{
204
196
nnoremap <expr> <CR> foldlevel('.')?'za':"\<CR>"
205
197
" }}}
206
-
" Notes {{{
207
-
command! Note setlocal nobuflisted buftype=nofile bufhidden=delete
198
+
" Scratchpad {{{
199
+
command! Scratchify setlocal nobuflisted buftype=nofile bufhidden=delete
200
+
command! Scratch enew | Scratchify
201
+
command! SScratch split | Scratchify
202
+
command! VScratch vsplit | Scratchify
208
203
" }}}
209
204
" Format {{{
210
205
nnoremap g= gg=Gg``
211
-
noremap Q gq
206
+
noremap Q gq
212
207
nnoremap gQ gggqG``
213
208
214
209
command! Clean let _s = @/ | %s/\s\+$//e | let @/ = _s | set nohlsearch
215
210
" }}}
216
211
" Search {{{
212
+
if executable('rg')
213
+
set grepprg=rg\ --vimgrep\ --no-heading\ --smart-case
214
+
set gfm=%f:%l:%c:%m,%f:%l%m,%f\ \ %l%m
215
+
elseif executable('ag')
216
+
set grepprg=ag\ --nogroup\ --nocolor\ --vimgrep
217
+
set grepformat^=%f:%l:%c:%m
218
+
endif
219
+
217
220
" Easier change and replace word
218
221
nnoremap <Space>, :nohlsearch<CR>
219
-
nnoremap <C-c> <C-c>:nohlsearch<CR>
220
222
" }}}
221
223
" Tabs {{{
222
224
nnoremap ]w gt
223
225
nnoremap [w gT
224
226
" }}}
227
+
" Terminal {{{
228
+
nnoremap <C-q> <nop>
229
+
nnoremap <C-q>c :<C-u>term<CR>
230
+
nnoremap <C-q>s :<C-u>split +term<CR>
231
+
nnoremap <C-q>v :<C-u>vsplit +term<CR>
232
+
nnoremap <C-q>t :<C-u>tabnew +term<CR>
233
+
234
+
tnoremap <C-q> <C-\><C-n>
235
+
" }}}
225
236
" }}}
226
237
" Autocommands {{{
227
238
augroup align_windows
···
229
240
autocmd VimResized * wincmd =
230
241
augroup END
231
242
" }}}
243
+
" Startify {{{
244
+
let g:startify_list_order = ['sessions', 'dir']
245
+
let g:startify_session_dir = '~/.local/share/nvim/sessions/'
246
+
let g:startify_session_autoload = 1
247
+
let g:startify_session_persistence = 1
248
+
249
+
let g:startify_change_to_dir = 0
250
+
let g:startify_change_to_vcs_root = 1
251
+
" }}}
-8
nvim/plugin/grep.vim
-8
nvim/plugin/grep.vim
-7
nvim/plugin/startify.vim
-7
nvim/plugin/startify.vim