Skip to content

Commit

Permalink
Fix some errors with Tmux
Browse files Browse the repository at this point in the history
Signed-off-by: Tomas Slusny <[email protected]>
  • Loading branch information
deathbeam committed Mar 16, 2017
1 parent 28e5c40 commit 6057852
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@
[submodule "lib/vim/tsuquyomi"]
path = lib/vim/tsuquyomi
url = https://github.com/Quramy/tsuquyomi
[submodule "lib/vim/vimproc.vim"]
path = lib/vim/vimproc.vim
url = https://github.com/Shougo/vimproc.vim
[submodule "lib/vim/vim-polyglot"]
path = lib/vim/vim-polyglot
url = https://github.com/sheerun/vim-polyglot
Expand Down
22 changes: 15 additions & 7 deletions config/tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@
set-option -g visual-silence off
set-option -g bell-action none

# Turn status line off
set -g status off

# Command bar
set -g message-command-bg "colour0"
set -g message-command-fg "colour7"
Expand All @@ -72,13 +69,24 @@
set -g pane-border-fg "colour19"
set -g pane-active-border-fg "colour4"

# Titles
set -g set-titles on
set -g set-titles-string '#T'

# Status bar
set -g status on
setw -g status-bg default
setw -g status-fg default

set -g status-left ''
set -g window-status-format '#[fg=black]#I:#W#F'
set -g window-status-current-format '#[fg=blue]#I:#W#F'
set -g status-right '#[fg=cyan]#{session_name}'

# }}}

# Plugins {{{

# We need $DOTHOME
run-shell "source ~/.dotconfig"

# Some sane default configuration
run-shell "$DOTHOME/lib/tmux/tmux-sensible/sensible.tmux"
run-shell "$DOTHOME/lib/tmux/vim-tmux-navigator/vim-tmux-navigator.tmux"
Expand All @@ -101,6 +109,6 @@

# User configuration {{{

run-shell "tmux source-file $DOTHOME/usr/tmux.conf > /dev/null 2>&1; true"
run-shell "[ -e $DOTHOME/usr/tmux.conf ] && tmux source-file $DOTHOME/usr/tmux.conf; true"

# }}}
1 change: 0 additions & 1 deletion lib/vim/vimproc.vim
Submodule vimproc.vim deleted from 25cb83

0 comments on commit 6057852

Please sign in to comment.