diff options
| -rw-r--r-- | configs/.tmux.conf | 10 | ||||
| -rw-r--r-- | configs/.zsh_profile | 6 | ||||
| -rw-r--r-- | functions/vim_functions.sh | 3 | ||||
| -rw-r--r-- | usbify/vim/.vimrc | 10 |
4 files changed, 26 insertions, 3 deletions
diff --git a/configs/.tmux.conf b/configs/.tmux.conf index 5ef3765e86ab..04b210c12f55 100644 --- a/configs/.tmux.conf +++ b/configs/.tmux.conf @@ -1,7 +1,17 @@ set -g default-terminal "screen-256color" +set -g mouse on bind-key -r -T prefix k select-pane -U bind-key -r -T prefix j select-pane -D bind-key -r -T prefix h select-pane -L bind-key -r -T prefix l select-pane -R +bind-key -r -T prefix C-k resize-p -U 2 +bind-key -r -T prefix C-j resize-p -D 2 +bind-key -r -T prefix C-h resize-p -L 2 +bind-key -r -T prefix C-l resize-p -R 2 + +bind % split-window -c "#{pane_current_path}" +bind '"' split-window -h -c "#{pane_current_path}" +bind c new-window -c "#{pane_current_path}" + diff --git a/configs/.zsh_profile b/configs/.zsh_profile index 28e21f3ca40c..26da66d00ccb 100644 --- a/configs/.zsh_profile +++ b/configs/.zsh_profile @@ -1,10 +1,13 @@ -export PATH=$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/go/bin:$PATH +export PATH=$HOME/bin:/opt/local/bin:/opt/local/sbin:/usr/local/go/bin:/usr/local/sbin:$PATH # make vim the default editor for commit messages etc export EDITOR=$(which vim) echo "Welcome back, $USER" +# display the space available on each mounted Volume +df -hl + # use vi bindings for terminal input set -o vi @@ -14,7 +17,6 @@ source $HOME/pc_settings/aliases.sh # functions source $HOME/pc_settings/functions/index.sh - # setup keybindings for history functions source $HOME/pc_settings/scripts/setup_keybindings.sh diff --git a/functions/vim_functions.sh b/functions/vim_functions.sh index 63e01b534b18..70aed74df9bd 100644 --- a/functions/vim_functions.sh +++ b/functions/vim_functions.sh @@ -21,7 +21,8 @@ function vfzopen() { if [ ! -z "$filename" ]; then - vim "$filename" + echo "$filename" + vim +/"$search_query" "$filename" return 0 else return 1 diff --git a/usbify/vim/.vimrc b/usbify/vim/.vimrc index ce2a7c88726e..1a1cbaa6574c 100644 --- a/usbify/vim/.vimrc +++ b/usbify/vim/.vimrc @@ -23,6 +23,7 @@ Plugin 'scrooloose/syntastic' Plugin 'scrooloose/nerdtree' Plugin 'mileszs/ack.vim' Plugin 'sjl/clam.vim' +Plugin 'kien/ctrlp.vim' call vundle#end() " required filetype plugin indent on " required @@ -40,6 +41,15 @@ filetype plugin indent on " required " -- END: Vundle config -- +" backspace settings +set backspace=2 +set backspace=indent,eol,start + + +" keyword completion +inoremap ;; <C-n> + + " -- Syntastic Settings -- set statusline+=%#warningmsg# set statusline+=%{SyntasticStatuslineFlag()} |