sonny/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add json to indent formatting

Browse source
This commit is contained in:
Sonny 2018-07-16 21:44:00 +02:00
parent 8b85b30cd1
commit eb12ff9328
2 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tmux/.tmux.conf
View file

@ -7,16 +7,11 @@ bind - split-window -v
unbind '"' unbind '"'
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 # status bar design
set -g status-position top set -g status-position top
set -g status-bg colour239 set -g status-bg colour239
set -g status-attr dim 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 ' #[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 # current session name
set-window-option -g status-left '#[fg=colour0,bg=colour102,bold] #S ' set-window-option -g status-left '#[fg=colour0,bg=colour102,bold] #S '

7
vim/.vimrc
View file

@ -18,7 +18,7 @@ syntax on
set hidden set hidden
" file specific formatting " 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 autocmd Filetype css,html,htmldjango,javascript,yaml setlocal tabstop=2 softtabstop=2 shiftwidth=2 expandtab autoindent
" search down into subfolders " search down into subfolders
@ -31,9 +31,6 @@ set wildmenu
" use normal backspace behavior " use normal backspace behavior
set backspace=2 set backspace=2
set t_ut=
set t_Co=256
" colorscheme " colorscheme
if exists('+termguicolors') if exists('+termguicolors')
set termguicolors set termguicolors
@ -41,7 +38,7 @@ if exists('+termguicolors')
endif endif
" Color trailing spaces with red color " Color trailing spaces with red color
highlight ExtraWhitespace ctermbg=red guibg=red highlight ExtraWhitespace ctermbg=green guibg=green
match ExtraWhitespace /\s\+$/ match ExtraWhitespace /\s\+$/
autocmd BufWinEnter * match ExtraWhitespace /\s\+$/ autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/ autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/