summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules51
-rw-r--r--.mpv/config (renamed from .mplayer/config)2
m---------.vim/bundle/YouCompleteMe0
m---------.vim/bundle/airline (renamed from .vim/bundle/vim-airline)0
m---------.vim/bundle/closetag (renamed from .vim/bundle/closetag.vim)0
m---------.vim/bundle/endwise (renamed from .vim/bundle/vim-endwise)0
m---------.vim/bundle/jedi0
m---------.vim/bundle/nerdtree0
m---------.vim/bundle/pathogen0
m---------.vim/bundle/requests0
m---------.vim/bundle/requests-futures0
m---------.vim/bundle/supertab0
m---------.vim/bundle/syntastic0
m---------.vim/bundle/tagbar0
m---------.vim/bundle/ultisnips0
m---------.vim/bundle/vim-fugitive0
m---------.vim/bundle/vim-ruby0
m---------.vim/bundle/vim-surround0
m---------.vim/bundle/vundle0
m---------.vim/bundle/ycmd0
-rw-r--r--.vim/colors/pks256.vim86
-rw-r--r--.vimrc88
-rw-r--r--.zshrc2
23 files changed, 83 insertions, 146 deletions
diff --git a/.gitmodules b/.gitmodules
index 56cb7ee..213c767 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,54 +1,21 @@
[submodule ".vim/bundle/closetag.vim"]
- path = .vim/bundle/closetag.vim
+ path = .vim/bundle/closetag
url = https://github.com/docunext/closetag.vim.git
[submodule ".vim/bundle/nerdcommenter"]
path = .vim/bundle/nerdcommenter
url = https://github.com/scrooloose/nerdcommenter.git
-[submodule ".vim/bundle/nerdtree"]
- path = .vim/bundle/nerdtree
- url = https://github.com/scrooloose/nerdtree.git
-[submodule ".vim/bundle/syntastic"]
- path = .vim/bundle/syntastic
- url = https://github.com/scrooloose/syntastic.git
-[submodule ".vim/bundle/tagbar"]
- path = .vim/bundle/tagbar
- url = https://github.com/majutsushi/tagbar.git
-[submodule ".vim/bundle/ultisnips"]
- path = .vim/bundle/ultisnips
- url = https://github.com/SirVer/ultisnips.git
[submodule ".vim/bundle/vim-airline"]
- path = .vim/bundle/vim-airline
+ path = .vim/bundle/airline
url = https://github.com/bling/vim-airline.git
[submodule ".vim/bundle/vim-endwise"]
- path = .vim/bundle/vim-endwise
+ path = .vim/bundle/endwise
url = https://github.com/tpope/vim-endwise.git
-[submodule ".vim/bundle/vim-fugitive"]
- path = .vim/bundle/vim-fugitive
- url = https://github.com/tpope/vim-fugitive.git
-[submodule ".vim/bundle/vim-ruby"]
- path = .vim/bundle/vim-ruby
- url = https://github.com/vim-ruby/vim-ruby.git
-[submodule ".vim/bundle/vim-surround"]
- path = .vim/bundle/vim-surround
- url = https://github.com/tpope/vim-surround.git
[submodule ".vim/bundle/vimwiki"]
path = .vim/bundle/vimwiki
url = https://github.com/vimwiki/vimwiki.git
-[submodule ".vim/bundle/vundle"]
- path = .vim/bundle/vundle
- url = https://github.com/gmarik/vundle.git
-[submodule ".vim/bundle/YouCompleteMe"]
- path = .vim/bundle/YouCompleteMe
- url = https://github.com/Valloric/YouCompleteMe.git
-[submodule ".vim/bundle/jedi"]
- path = .vim/bundle/jedi
- url = https://github.com/davidhalter/jedi.git
-[submodule ".vim/bundle/requests"]
- path = .vim/bundle/requests
- url = https://github.com/kennethreitz/requests
-[submodule ".vim/bundle/requests-futures"]
- path = .vim/bundle/requests-futures
- url = https://github.com/ross/requests-futures
-[submodule ".vim/bundle/ycmd"]
- path = .vim/bundle/ycmd
- url = https://github.com/Valloric/ycmd
+[submodule ".vim/bundle/pathogen"]
+ path = .vim/bundle/pathogen
+ url = https://github.com/tpope/vim-pathogen.git
+[submodule ".vim/bundle/supertab"]
+ path = .vim/bundle/supertab
+ url = https://github.com/ervandew/supertab.git
diff --git a/.mplayer/config b/.mpv/config
index 55cf56a..21cf775 100644
--- a/.mplayer/config
+++ b/.mpv/config
@@ -1,5 +1,3 @@
# Write your default config options here!
-[extension.mp4]
-fps=23.976
diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe
deleted file mode 160000
-Subproject 92084bf91a238979c4bfd3e63db6d877e0ec952
diff --git a/.vim/bundle/vim-airline b/.vim/bundle/airline
-Subproject 00e4b68ee6eba08559a868d08b2a4b642a6bc10
+Subproject 00e4b68ee6eba08559a868d08b2a4b642a6bc10
diff --git a/.vim/bundle/closetag.vim b/.vim/bundle/closetag
-Subproject 060109359b81b53dfad7206e23f86007d895996
+Subproject 060109359b81b53dfad7206e23f86007d895996
diff --git a/.vim/bundle/vim-endwise b/.vim/bundle/endwise
-Subproject ab5f7f99f49ee26a16563df00a79fbc3bf1090a
+Subproject ab5f7f99f49ee26a16563df00a79fbc3bf1090a
diff --git a/.vim/bundle/jedi b/.vim/bundle/jedi
deleted file mode 160000
-Subproject cd648e933bfa89adcb2a92d856abe0b1900c0d9
diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree
deleted file mode 160000
-Subproject 4f1e6ecb057fc0bac189171c1430d71ef25f6bb
diff --git a/.vim/bundle/pathogen b/.vim/bundle/pathogen
new file mode 160000
+Subproject 91e6378908721d20514bbe5d18d292a0a15faf0
diff --git a/.vim/bundle/requests b/.vim/bundle/requests
deleted file mode 160000
-Subproject 35d083e1665beff39aabe47a79cd1f867b897b0
diff --git a/.vim/bundle/requests-futures b/.vim/bundle/requests-futures
deleted file mode 160000
-Subproject 98712e7d0f6be2a090b6fda2a925f85e63656b5
diff --git a/.vim/bundle/supertab b/.vim/bundle/supertab
new file mode 160000
+Subproject 4e2376a5b4fe3a1f71eb5ec2deb745d98fabde1
diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic
deleted file mode 160000
-Subproject a27b435a1316123b7d13696871b103c7f024f91
diff --git a/.vim/bundle/tagbar b/.vim/bundle/tagbar
deleted file mode 160000
-Subproject 59c9b7ce1cc70ac2c7bd3c858e80c89f17b42cc
diff --git a/.vim/bundle/ultisnips b/.vim/bundle/ultisnips
deleted file mode 160000
-Subproject 279d6e63c9a8dbaa20ffc43c3c5f057dfc8f112
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
deleted file mode 160000
-Subproject 90ee6fb5d255d14d9f12f2469f92ee50149f5b4
diff --git a/.vim/bundle/vim-ruby b/.vim/bundle/vim-ruby
deleted file mode 160000
-Subproject 5bc55bec639836ff5c35f58dc62988d6d1e74bd
diff --git a/.vim/bundle/vim-surround b/.vim/bundle/vim-surround
deleted file mode 160000
-Subproject fa433e0b7330753688f715f3be5d10dc480f20e
diff --git a/.vim/bundle/vundle b/.vim/bundle/vundle
deleted file mode 160000
-Subproject 0b28e334e65b6628b0a61c412fcb45204a2f2ba
diff --git a/.vim/bundle/ycmd b/.vim/bundle/ycmd
deleted file mode 160000
-Subproject 50e6f5b16e3692edc2fd02dfa89a460b9a1f3a6
diff --git a/.vim/colors/pks256.vim b/.vim/colors/pks256.vim
index 324cf23..ad7a34d 100644
--- a/.vim/colors/pks256.vim
+++ b/.vim/colors/pks256.vim
@@ -1,5 +1,5 @@
" Vim color file: pks256.vim
-" Last Change: 2014-06-13
+" Last Change: 2014-08-30
"
" Color numbers (0-255) see:
" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
@@ -9,46 +9,46 @@ set background=light
hi clear
let g:colors_name = "pks256"
- highlight Normal cterm=none ctermfg=0 ctermbg=231
- highlight Special cterm=bold ctermfg=197 ctermbg=231
- highlight Comment cterm=bold ctermfg=201 ctermbg=231
- highlight Constant cterm=bold ctermfg=12 ctermbg=231
- highlight LineNr cterm=none ctermfg=242 ctermbg=159
- highlight Number cterm=none ctermfg=197 ctermbg=231
- highlight PreProc cterm=bold ctermfg=9 ctermbg=231
- highlight Statement cterm=bold ctermfg=197 ctermbg=231
- highlight Type cterm=bold ctermfg=12 ctermbg=231
- highlight Error cterm=bold ctermfg=231 ctermbg=9
- highlight Identifier cterm=none ctermfg=207 ctermbg=231
- highlight SpecialKey cterm=none ctermfg=48 ctermbg=231
- highlight NonText cterm=none ctermfg=164 ctermbg=231
- highlight Directory cterm=none ctermfg=12 ctermbg=231
- highlight ErrorMsg cterm=bold ctermfg=9 ctermbg=231
- highlight MoreMsg cterm=none ctermfg=10 ctermbg=231
- highlight Title cterm=none ctermfg=199 ctermbg=231
- highlight WarningMsg cterm=none ctermfg=9 ctermbg=231
- highlight DiffDelete cterm=none ctermfg=207 ctermbg=231
- highlight Search cterm=none ctermfg=15 ctermbg=231
- highlight Visual cterm=none ctermfg=16 ctermbg=50
- highlight Cursor cterm=none ctermfg=201 ctermbg=201
- highlight CursorLine cterm=none ctermfg=0 ctermbg=252
- highlight StatusLine cterm=none ctermfg=0 ctermbg=231
- highlight Question cterm=none ctermfg=16 ctermbg=226
- highlight Todo cterm=bold ctermfg=231 ctermbg=201
- highlight Folded cterm=none ctermfg=0 ctermbg=255
- highlight ModeMsg cterm=none ctermfg=16 ctermbg=46
- highlight VisualNOS cterm=none ctermfg=16 ctermbg=28
- highlight WildMenu cterm=none ctermfg=16 ctermbg=226
- highlight FoldColumn cterm=none ctermfg=15 ctermbg=58
- highlight SignColumn cterm=none ctermfg=16 ctermbg=28
- highlight DiffText cterm=none ctermfg=16 ctermbg=34
- highlight StatusLineNC cterm=none ctermfg=0 ctermbg=231
- highlight VertSplit cterm=none ctermfg=231 ctermbg=231
- highlight User1 cterm=none ctermbg=20 ctermfg=15
- highlight User2 cterm=none ctermbg=20 ctermfg=46
- highlight User3 cterm=none ctermbg=20 ctermfg=46
- highlight User4 cterm=none ctermbg=20 ctermfg=50
- highlight User5 cterm=none ctermbg=20 ctermfg=46
- highlight Pmenu cterm=none ctermbg=228 ctermfg=0
- highlight PmenuSel cterm=bold ctermbg=228 ctermfg=0
+highlight Normal cterm=none ctermfg=0 ctermbg=231
+highlight Special cterm=bold ctermfg=197 ctermbg=231
+highlight Comment cterm=bold ctermfg=201 ctermbg=231
+highlight Constant cterm=bold ctermfg=12 ctermbg=231
+highlight LineNr cterm=none ctermfg=242 ctermbg=159
+highlight Number cterm=none ctermfg=197 ctermbg=231
+highlight PreProc cterm=bold ctermfg=9 ctermbg=231
+highlight Statement cterm=bold ctermfg=197 ctermbg=231
+highlight Type cterm=bold ctermfg=12 ctermbg=231
+highlight Error cterm=bold ctermfg=231 ctermbg=9
+highlight Identifier cterm=none ctermfg=207 ctermbg=231
+highlight SpecialKey cterm=none ctermfg=48 ctermbg=231
+highlight NonText cterm=none ctermfg=164 ctermbg=231
+highlight Directory cterm=none ctermfg=12 ctermbg=231
+highlight ErrorMsg cterm=bold ctermfg=9 ctermbg=231
+highlight MoreMsg cterm=none ctermfg=10 ctermbg=231
+highlight Title cterm=none ctermfg=199 ctermbg=231
+highlight WarningMsg cterm=none ctermfg=9 ctermbg=231
+highlight DiffDelete cterm=none ctermfg=207 ctermbg=231
+highlight Search cterm=none ctermfg=15 ctermbg=231
+highlight Visual cterm=none ctermfg=16 ctermbg=50
+highlight Cursor cterm=none ctermfg=201 ctermbg=201
+highlight CursorLine cterm=none ctermfg=0 ctermbg=252
+highlight Question cterm=none ctermfg=16 ctermbg=226
+highlight Todo cterm=bold ctermfg=231 ctermbg=201
+highlight Folded cterm=none ctermfg=0 ctermbg=255
+highlight ModeMsg cterm=none ctermfg=16 ctermbg=46
+highlight VisualNOS cterm=none ctermfg=16 ctermbg=28
+highlight WildMenu cterm=none ctermfg=16 ctermbg=226
+highlight FoldColumn cterm=none ctermfg=15 ctermbg=58
+highlight SignColumn cterm=none ctermfg=16 ctermbg=28
+highlight DiffText cterm=none ctermfg=16 ctermbg=34
+highlight VertSplit cterm=none ctermfg=231 ctermbg=231
+highlight User1 cterm=none ctermbg=20 ctermfg=15
+highlight User2 cterm=none ctermbg=20 ctermfg=46
+highlight User3 cterm=none ctermbg=20 ctermfg=46
+highlight User4 cterm=none ctermbg=20 ctermfg=50
+highlight User5 cterm=none ctermbg=20 ctermfg=46
+highlight Pmenu cterm=none ctermbg=228 ctermfg=0
+highlight PmenuSel cterm=bold ctermbg=228 ctermfg=0
+"highlight StatusLine cterm=none ctermfg=0 ctermbg=231
+"highlight StatusLineNC cterm=none ctermfg=0 ctermbg=231
diff --git a/.vimrc b/.vimrc
index 284ca84..f8864bf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,3 +1,7 @@
+" pathogen
+execute pathogen#infect()
+
+" settings
set nocompatible
set nu
set noet
@@ -18,10 +22,15 @@ set mouse=r
set bs=2
set ignorecase
set smartcase
+set laststatus=2
+set ttyfast
+set lazyredraw
syntax on
+filetype plugin indent on
+
+" spelling
setlocal spell spelllang=en_us
set nospell
-set laststatus=2
" color
if $TERM =~ "^rxvt" || $TERM =~ "256color$"
@@ -32,70 +41,31 @@ else
endif
" bindings
-nmap <C-t> :tabnew<CR>
-nmap <C-a> :tabprevious<CR>
-nmap <C-d> :tabnext<CR>
-map <up> <nop>
-map <down> <nop>
-map <left> <nop>
-map <right> <nop>
+nmap <C-t> :tabnew<cr>
+nmap <C-a> :tabprevious<cr>
+nmap <C-d> :tabnext<cr>
+map <up> <nop>
+map <down> <nop>
+map <left> <nop>
+map <right> <nop>
+inoremap <C-s> <esc>:w<cr>a
+nnoremap <C-s> :w<cr>
+nmap <C-b> :TagbarToggle<cr>
" cursorline
autocmd InsertEnter * setlocal nocursorline
autocmd InsertLeave * setlocal cursorline
-" relative numbers
-function! NumberToggle()
- if(&relativenumber == 1)
- set number
- else
- set relativenumber
- endif
-endfunc
-nnoremap <C-n> :call NumberToggle()<cr>
-
-" vundle
-filetype off " required!
-set rtp+=~/.vim/bundle/vundle/
-call vundle#rc()
-Bundle 'gmarik/vundle'
-Bundle 'SirVer/ultisnips'
-Bundle 'Valloric/YouCompleteMe'
-Bundle 'tpope/vim-fugitive'
-Bundle 'docunext/closetag.vim'
-Bundle 'vimwiki/vimwiki'
-Bundle 'scrooloose/nerdcommenter'
-Bundle 'scrooloose/nerdtree'
-Bundle 'majutsushi/tagbar'
-Bundle 'scrooloose/syntastic'
-Bundle 'tpope/vim-surround'
-Plugin 'tpope/vim-endwise'
-Plugin 'vim-ruby/vim-ruby'
-Plugin 'bling/vim-airline'
-filetype plugin indent on " required!
-
-" UltiSnips
-let g:UltiSnipsExpandTrigger="<c-j>"
-let g:UltiSnipsJumpForwardTrigger="<c-i>"
-let g:UltiSnipsJumpBackwardTrigger="<c-o>"
-
-" syntastic
-let g:syntastic_auto_loc_list=1
-let g:syntastic_enable_signs=1
-
" airline
-let g:airline_theme = 'pks256'
-let g:airline_powerline_fonts = 1
-"let g:airline_enable_branch = 1
-"let g:airline_enable_syntastic = 1
-"let g:airline_left_sep = ''
-"let g:airline_left_alt_sep = ''
-"let g:airline_right_sep = ''
-"let g:airline_right_alt_sep = ''
-"let g:airline_branch_prefix = ''
-"let g:airline_readonly_symbol = ''
-"let g:airline_linecolumn_prefix = ''
+let g:airline_theme = 'pks256'
+let g:airline_powerline_fonts = 1
+let g:airline_enable_branch = 0
+let g:airline_symbols = {}
+let g:airline_symbols.whitespace = 'Ξ'
+
+" tagbar
+let g:tagbar_compact = 1
" vimwiki
-let g:vimwiki_list = [{'path':'~/var/wiki', 'path_html':'~/var/wiki/html/'}]
+let g:vimwiki_list = [{'path':'~/var/wiki'}]
diff --git a/.zshrc b/.zshrc
index a913923..ecf57ab 100644
--- a/.zshrc
+++ b/.zshrc
@@ -190,3 +190,5 @@ case `whoami` in
;;
esac
+stty -ixon # enable mapping of C-s in vim..
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-18 15:23:15 +0000