Merge branch 'master' of /home/git/Development/dotfiles

tmux/.tmux.conf

@@ -1,39 +1,17 @@
 # use vim copy/paste keybindings
 setw -g mode-keys vi
 
-# needs xclip for system clipboard
-run-shell "tmux setenv -g TMUX_VERSION $(tmux -V | cut -c 6-)"
-if-shell -b '[ "$(echo "$TMUX_VERSION < 2.4" | bc)" = 1 ]' \
-  "bind-key Escape copy-mode; \
-  bind-key -t vi-copy Escape cancel; \
-  bind-key p paste-buffer; \
-  bind-key -t vi-copy v begin-selection; \
-  bind-key -t vi-copy V select-line; \
-  bind-key -t vi-copy r rectangle-toggle; \
-  bind -t vi-copy y copy-pipe 'xclip -in -selection clipboard'"
-
-if-shell -b '[ "$(echo "$TMUX_VERSION >= 2.4" | bc)" = 1 ]' \
-  "bind-key -T copy-mode-vi 'v' send -X begin-selection; \
-  bind-key -T copy-mode-vi 'V' send -X select-line; \
-  bind-key -T copy-mode-vi 'r' send -X rectangle-toggle; \
-  bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -in -selection clipboard'"
-
 # split panes using | and -
 bind | split-window -h
 bind - split-window -v
 unbind '"'
 unbind %
 
-# reload config file (change file location to your the tmux.conf you want to use)
-bind r source-file ~/.tmux.conf
-
 # status bar design
 set -g status-position top
 set -g status-bg colour239
 set -g status-attr dim
 set -g status-right ' #[fg=colour233,bg=colour102,bold] #(hostname) #[fg=colour233,bg=colour102,bold] %d/%m #[fg=colour233,bg=colour102,bold] %H:%M:%S '
-set -g status-right-length 50
-set -g status-left-length 20
 
 # current session name
 set-window-option -g status-left '#[fg=colour0,bg=colour102,bold] #S  '
@@ -54,6 +32,3 @@ setw -g window-status-format '  #I#[fg=colour0] #[fg=colour0]#W  '
 set -g history-limit 10000
 
 set -g mouse on
-
-# terminal colors
-

vim/.vimrc

@@ -18,8 +18,8 @@ syntax on
 set hidden
 
 " file specific formatting
-autocmd Filetype python,bash,sh,java,php setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
+autocmd Filetype python,bash,sh,java,php,json setlocal tabstop=4 softtabstop=4 shiftwidth=4 expandtab autoindent fileformat=unix
-autocmd Filetype css,html,htmldjango,javascript setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent
+autocmd Filetype css,html,htmldjango,javascript,yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent
 
 " search down into subfolders
 " provides tab-completion for all file-related tasks
@@ -31,15 +31,19 @@ set wildmenu
 " use normal backspace behavior
 set backspace=2
 
-set t_ut=
-set t_Co=256
-
 " colorscheme
 if exists('+termguicolors') 
 	set termguicolors
 	colorscheme breezy
 endif
 
+" Color trailing spaces with red color
+highlight ExtraWhitespace ctermbg=green guibg=green
+match ExtraWhitespace /\s\+$/
+autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
+autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
+autocmd InsertLeave * match ExtraWhitespace /\s\+$/
+autocmd BufWinLeave * call clearmatches()
 
 " line numbers
 set number