ian/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add clojure, web dev, git undo, and resolved vimrc's

Browse source
This commit is contained in:
Ian Keane 2020-07-20 09:10:30 -04:00
parent 1cf1d5f484
commit b7f437d22e
2 changed files with 56 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
vim/.vimrc
View file

@ -45,7 +45,10 @@
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:
@ -107,6 +110,7 @@
set lazyredraw " Redraw only when necessary
set updatetime=100 " Make updates happen faster (gitgutter)
set splitright " Make split to right by default
set splitbelow
set winheight=30 " Soft minimum window height (active)
"set winminheight=10 " Hard minimum window height (inactive)
set winwidth=85 " Window width for current window
@ -202,6 +206,19 @@
"}}}
" {{{ 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
@ -313,6 +330,7 @@
nmap ghs <Plug>(GitGutterStageHunk)
" Controls fugitive diff split direction
set diffopt=vertical
command! Gundo !git reset --soft HEAD~1
"}}}
" fold search {{{

59
vim/_vimrc
View file

@ -11,7 +11,6 @@
Plug 'junegunn/vim-easy-align'
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --bin --all' }
Plug 'junegunn/fzf.vim'
Plug 'tpope/vim-surround'
Plug 'tpope/vim-commentary'
Plug 'w0rp/ale'
@ -31,7 +30,7 @@
Plug 'sainnhe/vim-color-forest-night'
Plug 'justinmk/vim-sneak'
Plug 'axvr/zepl.vim'
Plug 'kovisoft/slimv'
" Plug 'kovisoft/slimv'
Plug 'tpope/vim-vinegar'
Plug 'preservim/nerdtree'
Plug 'vimwiki/vimwiki'
@ -40,22 +39,19 @@
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 'alvan/vim-closetag'
Plug 'mattn/emmet-vim'
" Plug 'tpope/vim-salve'
Plug 'chrisbra/colorizer'
" cljfold
" 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()
"}}}
@ -204,11 +200,31 @@
"}}}
" slimv{{{
let g:slimv_repl_split=2
let g:slimv_repl_split_size=10
"
" let g:slimv_repl_split=2
" 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 {{{
" Map vertical split to \ w, switch to it, open explorer, prompt for filename
" TODO: make new window prompt use fzf
@ -306,16 +322,15 @@
"}}}
" git commands {{{
" TODO: map fugitive commands
" TODO: check out gv etc
" TODO: bind hunk committing
" Gitgutter hunk view
nmap ghv <Plug>(GitGutterPreviewHunk)
nmap ghn <Plug>(GitGutterNextHunk)
nmap ghp <Plug>(GitGutterPrevHunk)
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 {{{