From eb12ff932825b643ab7ff97d835a9c850055e966 Mon Sep 17 00:00:00 2001 From: Sonny Date: Mon, 16 Jul 2018 21:44:00 +0200 Subject: [PATCH] Add json to indent formatting --- tmux/.tmux.conf | 5 ----- vim/.vimrc | 7 ++----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 1b56817..9d11b72 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -7,16 +7,11 @@ 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 ' diff --git a/vim/.vimrc b/vim/.vimrc index cb85334..81421cd 100755 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -18,7 +18,7 @@ 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,yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent " search down into subfolders @@ -31,9 +31,6 @@ set wildmenu " use normal backspace behavior set backspace=2 -set t_ut= -set t_Co=256 - " colorscheme if exists('+termguicolors') set termguicolors @@ -41,7 +38,7 @@ if exists('+termguicolors') endif " Color trailing spaces with red color -highlight ExtraWhitespace ctermbg=red guibg=red +highlight ExtraWhitespace ctermbg=green guibg=green match ExtraWhitespace /\s\+$/ autocmd BufWinEnter * match ExtraWhitespace /\s\+$/ autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@