Added vim-repeat and vim-commentary to vimrc. Fixed bashrc merge conflict. Improved tmux.conf
This commit is contained in:
parent
ed4f8c5d95
commit
dea825b486
5
bashrc
5
bashrc
@ -104,14 +104,9 @@ PATH=$PATH:~/tmp/ucpp/ucpp/
|
||||
function tsh(){
|
||||
ssh $* -t 'tmux a || tmux || /bin/bash'
|
||||
}
|
||||
<<<<<<< Updated upstream
|
||||
[[ -s ~/.autojump/etc/profile.d/autojump.sh ]] && source ~/.autojump/etc/profile.d/autojump.sh
|
||||
export PATH=~/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:~/tmp/ucpp/ucpp/:~/tmp/ucpp/ucpp/:~/hitchhikers/bin/ucpp/ucpp:~/hitchhikers/bin/ucpp/ucpp
|
||||
=======
|
||||
. /usr/share/autojump/autojump.sh
|
||||
[[ -s /home/stonewareslord/.autojump/etc/profile.d/autojump.sh ]] && source /home/stonewareslord/.autojump/etc/profile.d/autojump.sh
|
||||
export PATH=/home/stonewareslord/.autojump/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/tmp/ucpp/ucpp/:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp:/home/stonewareslord/hitchhikers/bin/ucpp/ucpp
|
||||
>>>>>>> Stashed changes
|
||||
alias frcbot='python build'
|
||||
|
||||
|
||||
|
25
tmux.conf
25
tmux.conf
@ -9,12 +9,27 @@ unbind %
|
||||
bind | split-window -h
|
||||
bind - split-window -v
|
||||
set -g default-terminal "screen-256color"
|
||||
set-option -g history-limit 10000
|
||||
set-option -g history-limit 50000
|
||||
|
||||
set -g prefix C-a
|
||||
bind C-a send-prefix
|
||||
unbind C-b
|
||||
bind-key k select-pane -U
|
||||
bind-key j select-pane -D
|
||||
bind-key h select-pane -L
|
||||
bind-key l select-pane -R
|
||||
bind-key H resize-pane -L 5
|
||||
bind-key J resize-pane -D 5
|
||||
bind-key K resize-pane -U 5
|
||||
bind-key L resize-pane -R 5
|
||||
setw -g mode-mouse off
|
||||
set -g mouse-select-pane off
|
||||
set -g mouse-resize-pane off
|
||||
set -g mouse-select-window off
|
||||
setw -g mode-keys vi
|
||||
bind-key -t vi-copy v begin-selection
|
||||
bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace"
|
||||
set-option -g pane-border-fg colour235
|
||||
set-option -g pane-active-border-fg colour240
|
||||
set-option -g status on
|
||||
set -g status-utf8 on
|
||||
set -g status-interval 5
|
||||
set -g status-right-length 60
|
||||
set -g status-right "#[fg=white]#S #I:#P #[fg-yellow] %d %b %Y #[fg=green] %l:%M %p #(date -u | awk '{print $4}')"
|
||||
bind-key R source-file ~/.tmux.conf
|
||||
|
5
vimrc
5
vimrc
@ -100,6 +100,9 @@ inoremap <C-h> <Left>
|
||||
inoremap <C-k> <Up>
|
||||
inoremap <C-j> <Down>
|
||||
nnoremap Y y$
|
||||
set guicursor+=n-v-c:blinkon0
|
||||
set formatoptions-=r
|
||||
set formatoptions-=o
|
||||
set diffopt+=iwhite
|
||||
set noesckeys
|
||||
set mouse-=a
|
||||
@ -189,6 +192,8 @@ Bundle 'vim-scripts/YankRing.vim'
|
||||
Bundle 'majutsushi/tagbar'
|
||||
Bundle 'sjl/gundo.vim'
|
||||
Bundle 'tommcdo/vim-exchange'
|
||||
Bundle 'tpope/vim-repeat'
|
||||
Bundle 'tpope/vim-commentary'
|
||||
"Bundle 'Shougo/neosnippet'
|
||||
"Bundle 'honza/vim-snippets'
|
||||
"Bundle 'msanders/snipmate.vim'
|
||||
|
Loading…
Reference in New Issue
Block a user