Skip to content

Commit

Permalink
vim themes; remove cruft; fix gitignore
Browse files Browse the repository at this point in the history
  • Loading branch information
cdaddr committed Jul 15, 2019
1 parent 8a5e718 commit e7ea1e5
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 36 deletions.
32 changes: 16 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
.emacs.d/history
.emacs.d/saveplace
.vim/.netrwhist
.vim/.VimballRecord
.vim/undo
.vim/backup
.vim/plugged
.emacs.d/swank
.emacs.d/ac-comphist.dat
.emacs.d/.smex-items
emacs.d/history
emacs.d/saveplace
vim/.netrwhist
vim/.VimballRecord
vim/undo
vim/backup
vim/plugged
emacs.d/swank
emacs.d/ac-comphist.dat
emacs.d/.smex-items
.irbrc
.emacs.d/cider-history.log
.emacs.d/places
.emacs.d/session*
.emacs.d/url
.emacs.d/elpa
emacs.d/cider-history.log
emacs.d/places
emacs.d/session*
emacs.d/url
emacs.d/elpa
emacs.d/ido.last
.DS_Store
.emacs.d/ido.last

.hg/
.hgignore
Expand Down
23 changes: 3 additions & 20 deletions vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,11 @@ else
endif

" themes
Plug 'lifepillar/vim-colortemplate'
Plug 'NLKNguyen/papercolor-theme'
Plug 'morhetz/gruvbox'
Plug 'lithammer/vim-eighties'

let g:deoplete#enable_at_startup = 1

" for snippets
Expand Down Expand Up @@ -272,10 +275,6 @@ let g:netrw_liststyle = 3
let &showbreak = '>>> '
set list listchars=eol:\ ,tab:>-,trail:.,extends:>,nbsp:_

if has("win32")
set wildignore+=*.bpk,*.bjk,*.diw,*.bmi,*.bdm,*.bfi,*.bdb,*.bxi
endif

augroup custom
au!
au BufReadPost * if line("'\"") > 0|if line("'\"") <= line("$")|exe("norm'\"")|else|exe "norm $"|endif|endif
Expand All @@ -296,19 +295,6 @@ augroup custom
endfunction
autocmd BufWritePost *.go call s:buildGo()

function! SetLovePrefs()
let dir = "$HOME/Documents/GitHub/dotfiles/.vim/love.dict"
if has("win32") || has("win64")
command! -nargs=* Love :silent !"C:\Program Files (x86)\LOVE\love.exe" . <args>
nnoremap <F12> = :Love<CR>
exe 'setlocal dictionary-=' . dir . ' dictionary+=' . dir
setlocal dictionary-=~/vimfiles/lua.dict dictionary+=~/vimfiles/lua.dict
setlocal iskeyword+=.
setlocal iskeyword+=:
end
endfunction
autocmd FileType lua call SetLovePrefs()

au BufWritePost */colors/* exe 'colorscheme ' . expand('%:t:r')

" Hugo project editing
Expand All @@ -330,9 +316,6 @@ augroup custom
autocmd Filetype html call s:maybeHugoHtml()
autocmd BufReadPre * call s:maybeHugoIgnore()

" autocmd FileType * if exists("+omnifunc") && &omnifunc == "" | setlocal omnifunc=syntaxcomplete#Complete | endif
" autocmd FileType * if exists("+completefunc") && &completefunc == "" | setlocal completefunc=syntaxcomplete#Complete | endif

au FileType go nmap <leader>bb <Plug>(go-build)
au FileType go nmap <leader>rr <Plug>(go-run)
au FileType go nmap <leader>tt <Plug>(go-test)
Expand Down

0 comments on commit e7ea1e5

Please sign in to comment.