commit 2b11e39db85033c559b99e1c5fc699c9e814515f
parent fb0b4c0725e3ca220a210081b16d3d335bc94285
Author: edvb54 <edvb54@gmail.com>
Date: Sat, 31 May 2014 14:58:31 -0700
Update README, add TMUX configuration, add buffersaurus plug-in
Diffstat:
8 files changed, 114 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
@@ -16,8 +16,8 @@ thinks they are suppose to be:
ln -s ~/dotfiles/vim ~/.vim
ln -s ~/dotfiles/vimrc ~/.vimrc
- ln -s ~/dotfiles/vimrc.bundles ~/.vimrc.bundles
ln -s ~/dotfiles/bashrc ~/.bashrc
+ ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
In order to use the powerline plugin you need a special font. To get it use:
diff --git a/bash_profile b/bash_profile
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
# prompt statement{{{1
check="${Green}✓ "
cross="${Red}✗ "
@@ -25,11 +26,9 @@ ${Cyan}❯${Color_Off}❯ "
# PS1="${BGreen}\u@\h${Color_Off}:${BBlue}\w${Color_Off}\$ "
# (${BIBlue}$(file_number), $(file_size)${Cyan})-\
-PS2=' ${ICyan}❯${Color_Off} '
+PS2=" ${Cyan}❯${Color_Off} "
# basic{{{1
-bind -m vi-insert '"jj": vi-movement-mode'
-
export EDITOR='vim'
fortune | cowsay
@@ -53,7 +52,9 @@ alias py2='python2'
alias vrc='vim ~/.vimrc'
alias vrcb='vim ~/.vimrc.bundles'
alias brc='vim ~/.bashrc'
-alias bp='vim ~/.bash_profile'
+alias bp='vim ~/dotfiles/bash_profile'
+alias tconf='vim ~/dotfiles/tmux.conf'
+
alias v='xmodmap ~/.vim_keyboard'
cd() {
@@ -73,6 +74,4 @@ if [ "$TERM" == "xterm" ]; then
if [ -f ~/.local/lib/python2.7/site-packages/powerline/bindings/bash/powerline.sh ]; then
source ~/.local/lib/python2.7/site-packages/powerline/bindings/bash/powerline.sh
fi
-
-# export TERM="xterm-256color"
#}}}
diff --git a/bashrc b/bashrc
@@ -111,4 +111,4 @@ fi
#}}}
# load bash_profile
. ~/dotfiles/colors
-. ~/.bash_profile
+. ~/dotfiles/bash_profile
diff --git a/tmux.conf b/tmux.conf
@@ -0,0 +1,87 @@
+# colors{{{
+set -g default-terminal "xterm-256color"
+
+set-option -g pane-border-fg colour235 #base02
+set-option -g pane-active-border-fg colour240 #base01
+
+#}}}
+# mappings{{{1
+# vi keys for moving around panes
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
+
+# vi keys for resizing around panes
+bind-key -r H resize-pane -L "5"
+bind-key -r J resize-pane -D "5"
+bind-key -r K resize-pane -U "5"
+bind-key -r L resize-pane -R "5"
+
+# better split window keys
+bind-key "|" split-window -h
+bind-key "\\" split-window -h
+bind-key "-" split-window -v
+
+# better vi like copy/pasting
+unbind [
+bind Escape copy-mode
+unbind p
+bind p paste-buffer
+bind-key -t vi-copy 'v' begin-selection
+bind-key -t vi-copy 'y' copy-selection
+
+# prefix r to reload this file
+bind r source-file ~/.tmux.conf \; display-message "tmux.conf Reloaded"
+
+# remap prefix to Ctrl+Space
+set -g prefix C-Space
+unbind C-b
+
+#}}}
+# status{{{1
+set -g status-bg black
+
+set -g window-status-current-fg white
+set -g window-status-current-bg blue
+set -g window-status-current-attr bright
+
+set -g window-status-last-fg white
+set -g window-status-last-bg default
+set -g window-status-last-attr bright
+
+set -g window-status-fg white
+set -g window-status-bg default
+set -g window-status-attr dim
+
+set -g message-fg white
+set -g message-bg blue
+set -g message-attr bright
+
+set -g status-interval 1
+set -g status-justify centre
+set -g status-left-length 158
+set -g status-right-length 140
+
+set -g status-left '\
+#[fg=white][#[fg=blue]#S#[fg=white]]\
+#[fg=white][#[fg=blue]#{pane_current_path}#[fg=white]]\
+'
+set -g status-right '\
+#[fg=white][#[fg=blue]#H#[fg=white]]\
+#[fg=white][#[fg=blue]%a%l:%M#[fg=white]]\
+'
+
+#}}}
+# set vi mode keys
+setw -g mode-keys vi
+
+# start window numbering at 1, not 0
+set -g base-index 1
+
+# change pane border
+set -g pane-border-fg blue
+set -g pane-border-bg default
+set -g pane-active-border-fg blue
+set -g pane-active-border-bg default
+
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
@@ -1 +1 @@
-Subproject commit 44bf6fd1c5abb536288612b4ac1110c04a96c96d
+Subproject commit 3ab1bb7eb0e533f4512dc2199a50d1238abcbb42
diff --git a/vim/bundle/vim-buffersaurus b/vim/bundle/vim-buffersaurus
@@ -0,0 +1 @@
+Subproject commit 4faa5cd90df1da3f8fefe802e435a4fe1a657ed8
diff --git a/vimrc b/vimrc
@@ -161,6 +161,7 @@ set modelines=5 " number of lines down vim checks for set comman
set mouse=a " turn on the mouse
set nrformats=octal,hex,alpha " allow you to ctrl-a/ctrl-x to increase/decrease letters and numbers
set scrolloff=7 " make vim have 7 lines below cursor when moving down
+set t_ut= " needed if using vim inside of tmux
set spell spelllang=en_us " set language for spell check to United States
" Great Britain = gb, Canada = ca, Australia = au, New Zealand = nz
set clipboard=unnamedplus " vim yanks go to OS's clipboard as well
@@ -288,14 +289,14 @@ vnoremap <C-Down> J
" move file up and down
nnoremap J <c-Y>
nnoremap K <c-E>
-nnoremap <C-K> 15<c-u>
-nnoremap <C-J> 15<c-d>
+nnoremap <C-K> 15<C-U>
+nnoremap <C-J> 15<C-D>
inoremap <C-D> <C-k>
" useful for Neocomplete
-inoremap <C-J> <C-n>
-inoremap <C-K> <C-p>
+inoremap <C-J> <C-N>
+inoremap <C-K> <C-P>
" window movements{{{2
map <A-h> <C-w>h
diff --git a/vimrc.bundles b/vimrc.bundles
@@ -8,7 +8,7 @@ call vundle#rc()
" load Vundle
Plugin 'gmarik/Vundle.vim'
-" bow down to the Tim Pope plug-ins!!
+""" bow down to the Tim Pope plug-ins!!
" lots of commands to change words
Bundle 'tpope/vim-abolish'
" use <c-g>c to toggle CAPS LOCK
@@ -19,7 +19,7 @@ Bundle 'tpope/vim-characterize'
Bundle 'tpope/vim-commentary'
" improves . command to repeat last command
Bundle 'tpope/vim-repeat'
-" automatically changes tabs to fit file type
+" automatically changes indents to fit file type
Bundle 'tpope/vim-sleuth'
" allows you to change/insert/delete tags/quotes/parentheses
Bundle 'tpope/vim-surround'
@@ -28,7 +28,7 @@ Bundle 'tpope/vim-unimpaired'
" better HTML/XML editing
Bundle 'tpope/vim-ragtag'
-" special file type things
+""" language specific plug-ins
" syntax checker
Bundle 'Syntastic'
" sort python imports using pep8
@@ -38,19 +38,19 @@ Bundle 'MatchTag'
" jump to HTML/XML tags with %
Bundle 'matchit.zip'
-" window plug-ins
+""" window plug-ins
" allows you to have split widows that adjust
Bundle 'zhaocai/GoldenView.Vim'
" all purpose search plug-in
Bundle 'Shougo/unite.vim'
-" file explorer
+" better file explorer
Bundle 'Shougo/vimfiler.vim'
" jump to tags in file, such as classes and functions
Bundle 'Tagbar'
" better status line and tab bar
Bundle 'bling/vim-airline'
-" auto complete stuff
+""" auto complete stuff
" implement snippets
Bundle 'SirVer/ultisnips'
" snippets for ultisnips
@@ -58,22 +58,22 @@ Bundle 'honza/vim-snippets'
" auto complete words already in file and syntax's
Bundle 'Shougo/neocomplete.vim'
-" visual stuff
+""" visual stuff
" show where marks are
Bundle 'kshenoy/vim-signature'
" rainbow parentheses
Bundle 'rainbow_parentheses.vim'
-" better looking in indents(tabs)
+" better looking in indents
Bundle 'nathanaelkane/vim-indent-guides'
-" others
+""" others
" complete math problems inside of Vim
Bundle 'arecarn/crunch'
" align text, like by =
Bundle 'godlygeek/tabular'
-" auto insert (,",`
+" auto insert ),",`
Bundle 'delimitMate.vim'
-" use enter to select next area such as () or paragraphs
+" use enter to select next area such as () or ""
Bundle 'gcmt/wildfire.vim'
" allow for, multiple cursors
Bundle 'terryma/vim-multiple-cursors'
@@ -84,6 +84,8 @@ Bundle 'Lokaltog/vim-easymotion'
Bundle 'jayflo/vim-skip'
" better pasting
Bundle 'YankRing.vim'
+" find and replace words in all buffers
+Bundle 'jeetsukumaran/vim-buffersaurus'
Bundle 'reedes/vim-wordy'
Bundle 'reedes/vim-litecorrect'
