diff options
| l--------- | colors/solarized.vim | 1 | ||||
| -rwxr-xr-x | update-plugins | 28 | ||||
| -rw-r--r-- | vimrc | 30 | ||||
| -rw-r--r-- | vopher.list | 8 |
4 files changed, 28 insertions, 39 deletions
diff --git a/colors/solarized.vim b/colors/solarized.vim new file mode 120000 index 0000000..f806ade --- /dev/null +++ b/colors/solarized.vim @@ -0,0 +1 @@ +../bundle/solarized-color/colors/solarized.vim
\ No newline at end of file diff --git a/update-plugins b/update-plugins deleted file mode 100755 index 856f85a..0000000 --- a/update-plugins +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# This is a simple front-end to vopher that will update all your plugins, -# clean up plugins that aren't in PLUGIN_LIST, and prune all .zip files. -# What more could you ask for from a wrapper? - -die() { - echo "$1" && exit -} - -PLUGIN_PATH="$HOME/projects/vimrc/bundle" -PLUGIN_LIST="$HOME/projects/vimrc/vopher.list" -_has_sparkup=$(grep -c sparkup ${PLUGIN_LIST}) -_tmp=$(pwd) -if [ "$_has_sparkup" -a -d ./bundle/sparkup ]; then - cd bundle/sparkup - unlink doc - unlink ftplugin - cd "$_tmp" -fi -_cmd="vopher -f "$PLUGIN_LIST" -dir "$PLUGIN_PATH" -ui=simple" -$_cmd -force update 2>vopher.log 1>/dev/null || die "Could not update! Consult vopher.log for details." -$_cmd -force -all prune 2>>vopher.log 1>/dev/null || die "Could not prune! Consult vopher.log for details." -if [ $_has_sparkup ]; then - cd "${PLUGIN_PATH}/sparkup" - make vim-pathogen --quiet - cd "$_tmp" -fi -echo "Plugins successfully updated." @@ -9,15 +9,28 @@ set spelllang=en_us set switchbuf=useopen " Colors and Syntax {{{1 +set t_Co=16 set background=dark -colorscheme zlg +colorscheme solarized if has('syntax') && !exists('g:syntax_on') syntax enable endif " Plugin-Specific {{{1 -call pathogen#infect('bundle/{}') -Helptags +" Use vim-plug +call plug#begin('~/.vim/bundle') +Plug 'tpope/vim-commentary', { 'as': 'commentary' } +Plug 'tpope/vim-fugitive', { 'as': 'fugitive' } +Plug 'jamessan/vim-gnupg', { 'as': 'gnupg' } +Plug 'junegunn/goyo.vim', { 'as': 'goyo' } +Plug 'ledger/vim-ledger', { 'as': 'ledger' } +Plug 'rstacruz/sparkup' +Plug 'godlygeek/tabular' +Plug 'PotatoesMaster/i3-vim-syntax', { 'as': 'i3-syntax' } +Plug 'justinj/vim-pico8-syntax', { 'as': 'pico8-syntax' } +Plug 'evanrelf/vim-pico8-color', { 'as': 'pico8-color' } +Plug 'altercation/vim-colors-solarized', { 'as': 'solarized-color' } +call plug#end() " Formatting {{{1 set formatprg=par-format\ w80 @@ -94,6 +107,17 @@ if has("autocmd") " up on linebreaks if it's not DOS, iso8859-1 text. The limit is set to " allow for a character or two that might be wider than an M or W. autocmd FileType sctxt setlocal enc=latin1 ff=dos tw=30 cc=31 fo=tcqwn nolist et ts=4 sts=4 sw=4 + " vim -b : edit binary using xxd-format! + augroup Binary + au! + au BufReadPre *.pal let &bin=1 + au BufReadPost *.pal if &bin | %!xxd + au BufReadPost *.pal set ft=xxd | endif + au BufWritePre *.pal if &bin | %!xxd -r + au BufWritePre *.pal endif + au BufWritePost *.pal if &bin | %!xxd + au BufWritePost *.pal set nomod | endif + augroup END endif " Key Bindings {{{1 diff --git a/vopher.list b/vopher.list deleted file mode 100644 index 2085a79..0000000 --- a/vopher.list +++ /dev/null @@ -1,8 +0,0 @@ -commentary http://github.com/tpope/vim-commentary -fugitive http://github.com/tpope/vim-fugitive -gnupg http://github.com/jamessan/vim-gnupg -goyo http://github.com/junegunn/goyo.vim -ledger http://github.com/ledger/vim-ledger -pathogen http://github.com/tpope/vim-pathogen -sparkup http://github.com/rstacruz/sparkup -tabular http://github.com/godlygeek/tabular |