Merge branch 'master' of github.com:lytedev/dotfiles

This commit is contained in:
Daniel Flanagan 2016-09-20 03:08:42 -05:00
commit cb329772d7
3 changed files with 5 additions and 1 deletions

View file

@ -56,6 +56,7 @@ Plug 'tmux-plugins/vim-tmux-focus-events' " allow transitions within tmux
Plug 'christoomey/vim-tmux-navigator' " allow transitions within tmux Plug 'christoomey/vim-tmux-navigator' " allow transitions within tmux
Plug 'tasklist.vim' " show tasks with leader,t Plug 'tasklist.vim' " show tasks with leader,t
Plug 'godlygeek/tabular' " align text lines together Plug 'godlygeek/tabular' " align text lines together
Plug 'dhruvasagar/vim-table-mode' " for creating and editing character tables
Plug 'lytedev/vim-superman' " view man pages with vim Plug 'lytedev/vim-superman' " view man pages with vim
Plug 'tpope/vim-surround' " quickly modify text surrounding objects Plug 'tpope/vim-surround' " quickly modify text surrounding objects
Plug 'tpope/vim-speeddating' " vim knows about date-like text objects Plug 'tpope/vim-speeddating' " vim knows about date-like text objects

3
env/sh/tmux.conf vendored
View file

@ -19,6 +19,9 @@ bind-key W resize-pane -x 100
bind-key v split-window -h bind-key v split-window -h
bind-key b split-window bind-key b split-window
# be xterm
set -g default-terminal "xterm"
# iterating # iterating
bind r source-file ~/.tmux.conf bind r source-file ~/.tmux.conf

View file

@ -21,7 +21,7 @@ export BAR_TOP=0
export BAR_HEIGHT=20 export BAR_HEIGHT=20
export BAR_BORDER_WIDTH=1 export BAR_BORDER_WIDTH=1
export BAR_FONT_FAMILY="$PRIMARY_FONT_FAMILY_WITH_SIZE" export BAR_FONT_FAMILY="$PRIMARY_FONT_FAMILY_WITH_SIZE"
export BAR_UNDERLINE=1 export BAR_UNDERLINE=0
# export BAR_MARGIN=$WINDOW_GAP # export BAR_MARGIN=$WINDOW_GAP
export BAR_MARGIN=700 export BAR_MARGIN=700
export BAR_OFFSET=0 export BAR_OFFSET=0