Browse Source

Vim no longer uses bufferline and uses minibufexpl again, tmux learned a
lot about how to be pretty as did vim airline.

sdbarker 4 years ago
parent
commit
5b0a15da3f
8 changed files with 135 additions and 21 deletions
  1. 3 0
      .gitmodules
  2. 4 0
      install.sh
  3. 27 0
      tmux/.tmux-powerlinerc
  4. 26 19
      tmux/.tmux.conf
  5. 31 0
      tmux/solarized.conf
  6. 38 0
      tmux/themes/sdbarker.sh
  7. 1 0
      tmux/tmux-powerline
  8. 5 2
      vim/.vimrc

+ 3 - 0
.gitmodules

@@ -1,3 +1,6 @@
 [submodule "vimrc/vimfiles/bundle/vundle"]
 	path = vim/.vim/bundle/vundle
 	url = https://github.com/gmarik/vundle.git
+[submodule "tmux/tmux-powerline"]
+	path = tmux/tmux-powerline
+	url = https://github.com/erikw/tmux-powerline.git

+ 4 - 0
install.sh

@@ -47,8 +47,12 @@ install_gitconfig ()
 install_tmuxconfig ()
 {
 	echo "Installing .tmux.conf"
+	rm -rf ~/.tmux-powerlinerc
 	rm -rf ~/.tmux.conf
+	rm -rf ~/.tmux/
 	ln -s "${DIR}/tmux/.tmux.conf" ~/.tmux.conf
+	ln -s "${DIR}/tmux/.tmux-powerlinerc" ~/.tmux-powerlinerc
+	ln -s "${DIR}/tmux" ~/.tmux
 	echo "Done."
 	echo
 }

+ 27 - 0
tmux/.tmux-powerlinerc

@@ -0,0 +1,27 @@
+# Default configuration file for tmux-powerline.
+# Modeline {
+#	 vi: foldmarker={,} foldmethod=marker foldlevel=0 tabstop=4 filetype=sh
+# }
+
+# General {
+	# Show which segment fails and its exit code.
+	export TMUX_POWERLINE_DEBUG_MODE_ENABLED="false"
+	# Use patched font symbols.
+	export TMUX_POWERLINE_PATCHED_FONT_IN_USE="true"
+	# The theme to use.
+	export TMUX_POWERLINE_THEME="sdbarker"
+	# Overlay dirctory to look for themes. There you can put your own themes outside the repo. Fallback will still be the "themes" directory in the repo.
+	export TMUX_POWERLINE_DIR_USER_THEMES="~/.tmux/themes"
+	# Overlay dirctory to look for segments. There you can put your own segments outside the repo. Fallback will still be the "segments" directory in the repo.
+	export TMUX_POWERLINE_DIR_USER_SEGMENTS=""
+# }
+
+# date.sh {
+	# date(1) format for the date. If you don't, for some reason, like ISO 8601 format you might want to have "%D" or "%m/%d/%Y".
+	export TMUX_POWERLINE_SEG_DATE_FORMAT="%F"
+# }
+
+# time.sh {
+	# date(1) format for the time. Americans might want to have "%I:%M %p".
+	export TMUX_POWERLINE_SEG_TIME_FORMAT="%H:%M"
+# }

+ 26 - 19
tmux/.tmux.conf

@@ -1,6 +1,4 @@
-set -g terminal-overrides 'xterm:colors=256'
-
-# Rebind Prefix 
+# Rebind Prefix
 set -g prefix C-a
 bind C-a send-prefix
 
@@ -32,10 +30,8 @@ unbind %
 bind | split-window -h # horizontal split
 bind _ split-window -v # vertical split
 
-bind h swap-pane -L
-bind j swap-pane -D
-bind k swap-pane -U
-bind l swap-pane -R
+bind j swap-pane -dD
+bind k swap-pane -dU
 
 bind h select-pane -L
 bind j select-pane -D
@@ -55,15 +51,26 @@ bind Q kill-pane
 #set -g visual-bell off
 
 # status bar
-set -g status on
-set-option -g status-justify right
-set-option -g status-fg white
-set-option -g status-bg black
-set-option -g status-interval 5
-set-option -g status-left-length 30
-set-option -g status-left '#[fg=green]#(whoami)@#H'
-set-option -g status-right '#[fg=yellow]Up -> #(uptime | cut -d "," -f 2-)'
-set-option -g visual-activity off
-set-window-option -g monitor-activity on
-set-window-option -g window-status-current-fg white
-set-window-option -g window-status-current-bg red
+#set -g status on
+#set-option -g status-justify right
+#set-option -g status-fg white
+#set-option -g status-bg black
+#set-option -g status-interval 5
+#set-option -g status-left-length 30
+#set-option -g status-left '#[fg=green]#(whoami)@#H'
+#set-option -g status-right '#[fg=yellow]Up -> #(uptime | cut -d "," -f 2-)'
+#set-option -g visual-activity off
+#set-window-option -g monitor-activity on
+#set-window-option -g window-status-current-fg white
+#set-window-option -g window-status-current-bg red
+
+set-option -g status on
+set-option -g status-interval 2
+set-option -g status-utf8 on
+set-option -g status-justify "left"
+set-option -g status-left-length 60
+set-option -g status-right-length 90
+set-option -g status-left "#(~/.tmux/tmux-powerline/powerline.sh left)"
+set-option -g status-right "#(~/.tmux/tmux-powerline/powerline.sh right)"
+
+source-file ~/.tmux/solarized.conf

+ 31 - 0
tmux/solarized.conf

@@ -0,0 +1,31 @@
+### COLOUR (Solarized 256)
+
+# default statusbar colors
+set-option -g status-bg colour235 #base02
+set-option -g status-fg colour136 #yellow
+set-option -g status-attr default
+
+# default window title colors
+set-window-option -g window-status-fg colour244 #base0
+set-window-option -g window-status-bg default
+#set-window-option -g window-status-attr dim
+
+# active window title colors
+set-window-option -g window-status-current-fg colour166 #orange
+set-window-option -g window-status-current-bg default
+#set-window-option -g window-status-current-attr bright
+
+# pane border
+set-option -g pane-border-fg colour235 #base02
+set-option -g pane-active-border-fg colour240 #base01
+
+# message text
+set-option -g message-bg colour235 #base02
+set-option -g message-fg colour166 #orange
+
+# pane number display
+set-option -g display-panes-active-colour colour33 #blue
+set-option -g display-panes-colour colour166 #orange
+
+# clock
+set-window-option -g clock-mode-colour colour64 #green

+ 38 - 0
tmux/themes/sdbarker.sh

@@ -0,0 +1,38 @@
+if patched_font_in_use; then
+	TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD=""
+	TMUX_POWERLINE_SEPARATOR_RIGHT_THIN=""
+	TMUX_POWERLINE_SEPARATOR_LEFT_BOLD=""
+	TMUX_POWERLINE_SEPARATOR_LEFT_THIN=""
+else
+	TMUX_POWERLINE_SEPARATOR_LEFT_BOLD="◀"
+	TMUX_POWERLINE_SEPARATOR_LEFT_THIN="❮"
+	TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD="▶"
+	TMUX_POWERLINE_SEPARATOR_RIGHT_THIN="❯"
+fi
+
+TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR:-'235'}
+TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR:-'255'}
+
+TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD}
+TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_LEFT_BOLD}
+
+
+# Format: segment_name background_color foreground_color [non_default_separator]
+
+if [ -z $TMUX_POWERLINE_LEFT_STATUS_SEGMENTS ]; then
+	TMUX_POWERLINE_LEFT_STATUS_SEGMENTS=(
+		"tmux_session_info 148 234" \
+		"hostname 33 0" \
+	)
+fi
+
+if [ -z $TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS ]; then
+	TMUX_POWERLINE_RIGHT_STATUS_SEGMENTS=(
+		"cpu 240 136" \
+		"load 237 167" \
+		"tmux_mem_cpu_load 234 136" \
+		"date_day 235 136" \
+		"date 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \
+		"time 235 136 ${TMUX_POWERLINE_SEPARATOR_LEFT_THIN}" \
+	)
+fi

+ 1 - 0
tmux/tmux-powerline

@@ -0,0 +1 @@
+Subproject commit 19afd8812fc1ff8558b7223ce9fb19a28d15d2ff

+ 5 - 2
vim/.vimrc

@@ -27,8 +27,10 @@ call vundle#rc()
 Plugin 'gmarik/vundle'
 
 Plugin 'bling/vim-airline'
-Plugin 'bling/vim-bufferline'
-	let g:bufferline_echo = 0
+  let g:airline_powerline_fonts=1
+
+"Plugin 'bling/vim-bufferline'
+"	let g:bufferline_echo = 0
 
 Plugin 'ervandew/supertab'
 Plugin 'kchmck/vim-coffee-script'
@@ -46,6 +48,7 @@ Plugin 'tpope/vim-haml'
 Plugin 'tpope/vim-surround'
 Plugin 'vim-scripts/matchit.zip'
 Plugin 'vim-surround'
+Plugin 'fholgado/minibufexpl.vim'
 
 filetype plugin on