rik/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various nvim/tmux updates

Browse Source 
* make sure diffs open vertically in vim
* update tmux theme
* allow tmux to change the title of the terminal
* add .nvim/shada to gitignore ?
This commit is contained in:
Nick Nisi
2015-10-25 13:21:33 -05:00
parent 6e879a7186
commit a585e0caf6
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -5,3 +5,4 @@ nvim/nvim.symlink/plugged/
plug.vim.old plug.vim.old
vim/vim.symlink/spell/ vim/vim.symlink/spell/
nvim/nvim.symlink/spell/ nvim/nvim.symlink/spell/
nvim/nvim.symlink/shada/

2
nvim/nvimrc.symlink
View File

@@ -111,6 +111,8 @@ set clipboard=unnamed
" faster redrawing " faster redrawing
set ttyfast set ttyfast
set diffopt+=vertical
" highlight conflicts " highlight conflicts
match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'

13
tmux/theme.sh
View File

@@ -1,10 +1,11 @@
#### COLOUR #### COLOUR
tm_icon="♟" tm_icon="☀"
tm_color_active=colour213 tm_color_active=colour82
tm_color_inactive=colour241 tm_color_inactive=colour241
tm_color_feature=colour4 tm_color_feature=colour10
tm_color_music=colour203 tm_color_music=colour10
tm_active_border_color=colour10
# separators # separators
tm_separator_left_bold="◀" tm_separator_left_bold="◀"
@@ -35,7 +36,7 @@ set-window-option -g window-status-current-format "#[bold]#I #W"
# pane border # pane border
set-option -g pane-border-fg $tm_color_inactive set-option -g pane-border-fg $tm_color_inactive
set-option -g pane-active-border-fg $tm_color_active set-option -g pane-active-border-fg $tm_active_border_color
# message text # message text
set-option -g message-bg default set-option -g message-bg default
@@ -58,4 +59,4 @@ tm_host="#[fg=$tm_color_feature,bold]#h"
tm_session_name="#[fg=$tm_color_feature,bold]$tm_icon #S" tm_session_name="#[fg=$tm_color_feature,bold]$tm_icon #S"
set -g status-left $tm_session_name' ' set -g status-left $tm_session_name' '
set -g status-right $tm_itunes' '$tm_rdio' '$tm_spotify' '$tm_date' '$tm_host set -g status-right $tm_itunes' '$tm_date' '$tm_host

4
tmux/tmux.conf.symlink
View File

@@ -41,8 +41,8 @@ bind = select-layout tiled
set -g base-index 1 set -g base-index 1
setw -g pane-base-index 1 setw -g pane-base-index 1
# set-option -g set-titles on set-option -g set-titles on
# set-option -g set-titles-string "#T - #W" set-option -g set-titles-string "#T - #W"
# set-window-option -g automatic-rename on # set-window-option -g automatic-rename on
###################### ######################