commit 6f103e391816e14eab478408429cdf6ca237e686
parent 0cb4fcdb9adbc31c42e74a6325f34e20357d38a5
Author: Anders Damsgaard <andersd@riseup.net>
Date: Tue, 24 Oct 2017 14:27:35 -0700
remove legacy code
Diffstat:
4 files changed, 9 insertions(+), 104 deletions(-)
diff --git a/links/.vim/appearance.vim b/links/.vim/appearance.vim
@@ -1,12 +1,10 @@
-" terminal colors "set t_Co=16
+" terminal colors
+"set t_Co=16
"set t_Co=256
-" hilight column 80
set colorcolumn=+1
highlight ColorColumn ctermbg=237
-"" For Neovim 0.1.3 and 0.1.4
-let $NVIM_TUI_ENABLE_TRUE_COLOR=1
colorscheme tender
highlight Normal cterm=NONE ctermfg=NONE ctermbg=NONE
@@ -16,18 +14,8 @@ highlight SpecialKey ctermfg=250 ctermbg=NONE cterm=NONE
highlight NonText ctermfg=250 ctermbg=NONE
" Invisible character colors
-" chose ctermfg=10 if Tab and EOL characters should be brighter
-" chose ctermfg=0 if Tab and EOL characters should be darker
highlight NonText ctermfg=10 guifg=DarkGray
highlight SpecialKey ctermfg=10 guifg=DarkGray
-"highlight NonText ctermfg=0 guifg=DarkGray
-"highlight SpecialKey ctermfg=0 guifg=DarkGray
-
-" Control mpd by CtrlP
-let g:ctrlp_extensions = ['buffertag', 'tag', 'line', 'dir', 'tmux', 'mpc']
" Split divider appearance
-"set fillchars=vert:│,fold:-
-"hi! VertSplit ctermfg=15 ctermbg=NONE term=NONE
hi! VertSplit ctermfg=238 ctermbg=NONE term=NONE
-
diff --git a/links/.vim/filetypes.vim b/links/.vim/filetypes.vim
@@ -12,9 +12,7 @@ autocmd FileType tex,latex,md,markdown,mkd,rst,mail
\ | setl nocursorcolumn
\ | setl list
\ | setl formatoptions=alw2qt " automatically reflow paragraphs
- "\ | setl spell spl=en_us noru nonu nornu
- "\ | let b:dispatch = 'sh /usr/local/bin/preview %:p'
-"
+
" customize what is concealed in LaTeX documents:
" a = conceal accents/ligatures
" d = conceal delimiters
diff --git a/links/.vim/keybinds.vim b/links/.vim/keybinds.vim
@@ -1,5 +1,5 @@
""" Keyboard shortcuts
-"
+
" Formatting options are prefixed by backslash
nmap \A :set formatoptions+=a<CR>:echo "autowrap enabled"<CR>
nmap \a :set formatoptions-=a<CR>:echo "autowrap disabled"<CR>
@@ -7,8 +7,6 @@ nmap \a :set formatoptions-=a<CR>:echo "autowrap disabled"<CR>
" Save with ZX
nmap ZX :w<CR>
-" use , instead of \ as leader
-"let mapleader=","
" use space instead of \ as leader
let mapleader="\<Space>"
@@ -19,9 +17,6 @@ nmap <leader>R :source $MYVIMRC<CR>
nmap <leader>y :set nolist<CR>:Goyo<CR>
nmap <leader>Y :set nolist<CR>:Goyo!<CR>:source $MYVIMRC<CR>
-" Shortcut to switch background color
-"nmap <leader>W :ToggleBG<CR>
-
" Save file
nmap <Leader>w :w<CR>
nmap <Leader>W :w !sudo tee > /dev/null %<CR>:e!<CR>
@@ -29,9 +24,6 @@ nmap <Leader>W :w !sudo tee > /dev/null %<CR>:e!<CR>
" Quit
nmap <Leader>q :q<CR>
-" Native (fast) buffer switching
-"nnoremap ,b :ls<CR>:buffer<Space>
-
" Close buffer
nmap <leader>Q :bd<CR>
@@ -41,9 +33,6 @@ nmap <Leader>x :x<CR>
" Jump to previous buffer
nmap <leader><tab> :e#<CR>
-" Explore buffers
-"nmap <leader>b :BufExplorer<CR>
-
" toggle spelling
nmap <leader>s :set spell!<CR>
@@ -65,7 +54,6 @@ nmap <leader>" :split
" shortcuts to commonly used files
nmap <leader>C :e $MYVIMRC<CR>
-"nmap <leader>T :e ~/doc/todo.org<CR>
nmap <leader>T :e ~/doc/todo.md<CR>
nmap <leader>B :e `kpsexpand '$TEXMFHOME'`/bibtex/bib/myfiles/BIB.bib<CR>
@@ -76,10 +64,8 @@ nmap <leader>D :read !date<CR>
" job execution
nmap <leader>m :Make
-nmap <leader>E :VimProcRead
nmap <leader>! :Start!
-
" Switch split focus with leader+hjkl
nmap <leader>h <C-w>h
nmap <leader>j <C-w>j
@@ -103,11 +89,11 @@ if has('nvim')
tnoremap <C-j> <C-\><C-n><C-w>j
tnoremap <C-k> <C-\><C-n><C-w>k
tnoremap <C-l> <C-\><C-n><C-w>l
-
- " launch terminal in current window
- nmap <leader><CR> :terminal<CR>
endif
+" launch terminal in current window
+nmap <leader><CR> :terminal bash<CR>
+
let g:tmux_navigator_no_mappings = 1
nnoremap <silent> <C-h> :TmuxNavigateLeft<CR>
nnoremap <silent> <C-j> :TmuxNavigateDown<CR>
@@ -122,18 +108,6 @@ nmap <leader>= <C-w>=
nmap <leader>g :Start git commit -a -v -S<CR>
nmap <leader>G :Start git commit -a -v -S && git push<CR>
-" Toggle fold
-nmap <leader>f za
-" Toggle all folds
-nmap <leader>F zA
-"nmap <leader>Fa zR
-"nmap <leader>FA zM
-" zc: close a fold
-" zo: open a fold
-" za: toggle a fold
-" zM: close all folds
-" zR: open all folds
-
" Use home row keys as Esc
inoremap jk <Esc>
inoremap lkj <Esc>:write<CR>
@@ -145,22 +119,9 @@ inoremap lkj <Esc>:write<CR>
map <leader>E <Plug>(easymotion-prefix)
" <Leader>f{char} to move to {char}
-"map <leader>f <Plug>(easymotion-bd-f)
-"nmap <leader>f <Plug>(easymotion-overwin-f)
map <leader><leader> <Plug>(easymotion-bd-f)
nmap <leader><leader> <Plug>(easymotion-overwin-f)
-" s{char}{char} to move to {char}{char} (conflicts with spell)
-"nmap <leader>s <Plug>(easymotion-overwin-f2)
-
-" Move to line
-"map <leader>L <Plug>(easymotion-bd-jk)
-"nmap <leader>L <Plug>(easymotion-overwin-line)
-
-" Move to word
-"map <leader>W <Plug>(easymotion-bd-w)
-"nmap <leader>W <Plug>(easymotion-overwin-w)
-
" Disable arrow keys
map <Left> <Nop>
map <Right> <Nop>
@@ -171,17 +132,8 @@ imap <Right> <Nop>
imap <Up> <Nop>
imap <Down> <Nop>
-" show/hide tagbar
-"nmap <leader>t :TagbarToggle<CR>
-
" Update ctags
nmap <leader>c :Start ctags -R --python-kinds=-i --langmap=c++:.cu,c++:.cuh .<CR>
-" useful tags commands:
-" :tag or :ta <function> Go to definition of the function
-" :ts or :tselect Show the list of tags
-" When the cursor is on a function call, press <Ctrl-[> to go to its definition.
-" Press <Ctrl-t> to go back
-" Use the Ctrl-P plugin to search the tags
" file search
if executable("rg")
@@ -199,8 +151,8 @@ end
" using fzf.vim
nmap , :Buffers<CR>
nmap <leader>b :Buffers<CR>
-nmap <leader>O :History<CR>
-nmap <leader>o :Files<CR>
+nmap <leader>F :History<CR>
+nmap <leader>f :Files<CR>
nmap <leader>l :Lines<CR>
nmap <leader>L :BLines<CR>
nmap <leader>t :Tags<CR>
diff --git a/links/.vim/plugins.vim b/links/.vim/plugins.vim
@@ -1,13 +1,8 @@
""""" PLUGIN SOURCES """""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Specify a directory for plugins
-" - For Neovim: ~/.local/share/nvim/plugged
-" - Avoid using standard Vim directory names like 'plugin'
call plug#begin('~/.vim/plugged')
-" install plugins with :PlugInstall
-" Make sure you use single quotes
-
"""""" Appearance """"""
Plug 'itchyny/lightline.vim' " lighter status line
Plug 'drzel/vim-line-no-indicator'
@@ -31,21 +26,10 @@ Plug 'ludovicchabant/vim-gutentags' " automatic tag generation
"""""" Syntax checking """"""
Plug 'w0rp/ale' " asynchronous syntax check
-
"""""" Buffer motion """"""
Plug 'Lokaltog/vim-easymotion'
Plug 'christoomey/vim-tmux-navigator'
-" add/remove bookmark: mm
-" add/edit/remove annotation: mi
-" next bookmark: mn
-" previous bookmark: mn
-" list of all bookmarks: ma
-" clear all bookmarks in current buffer: mc
-" clear all bookmarks in all buffers: mx
-Plug 'MattesGroeger/vim-bookmarks'
-
-
"""""" Text editing """"""
Plug 'tpope/vim-surround'
Plug 'tpope/vim-speeddating' " increment dates and times with C-a and C-x
@@ -57,21 +41,17 @@ Plug 'reedes/vim-litecorrect'
" see history with :Yanks
Plug 'maxbrunsfeld/vim-yankstack'
-
"""""" Autocomplete """"""
Plug 'davidhalter/jedi-vim' " (C-space)
Plug 'ervandew/supertab' " complete with TAB in insert mode
-
"""""" Version control """"""
Plug 'tpope/vim-fugitive' " :Gread, :Gwrite
Plug 'airblade/vim-gitgutter' " show line changes since last git commit
-
"""""" Processes """"""
Plug 'tpope/vim-dispatch' " for :Make
-
"""""" File types """"""
" General
Plug 'msanders/snipmate.vim' " boilerplate code
@@ -97,11 +77,6 @@ Plug 'plasticboy/vim-markdown'
" Mail
Plug 'vim-scripts/mutt-aliases' " auto-complete aliases from ~/.mutt/aliases
-
-""""" Unmanaged plugin (manually installed and updated) """"""
-"Plug '~/my-prototype-plugin'
-
-
" Initialize plugin system
call plug#end()
@@ -117,14 +92,6 @@ let g:rainbow_active = 1 " toggle with :RainbowToggle
let g:vim_markdown_folding_disabled=1
let g:vim_markdown_math=1
-" Tell ack.vim to use rg (ripgrep) or ag (the Silver Searcher) instead
-"if executable("rg")
-" let g:ackprg = 'rg --vimgrep --no-heading'
-"elseif executable("ag")
-" let g:ackprg = 'ag --vimgrep'
-"end
-
-
function! s:goyo_enter()
silent !tmux set status off
silent !tmux list-panes -F '\#F' | grep -q Z || tmux resize-pane -Z
