Compare commits

..

No commits in common. "8617f69d4c6ac554731ff07ed9d9a000a3d92979" and "64b6b15490e9aa8fecd9e9f972f213f1b339207c" have entirely different histories.

28
vimrc
View file

@ -17,7 +17,7 @@ let g:netrw_dirhistmax = 0
set clipboard^=unnamed set clipboard^=unnamed
" Terminal title " Terminal title
if has('macunix') && $TERM_PROGRAM == 'Apple_Terminal' if has('macunix')
set title set title
set t_ts=]6; set t_ts=]6;
set t_fs= set t_fs=
@ -27,7 +27,6 @@ if has('macunix') && $TERM_PROGRAM == 'Apple_Terminal'
endif endif
else else
set title set title
autocmd BufEnter,BufRead * let &titlestring = expand("%:p")
endif endif
" Airline " Airline
@ -48,30 +47,18 @@ if !has('gui_running')
if has("mouse_sgr") if has("mouse_sgr")
set ttymouse=sgr set ttymouse=sgr
end end
"set background=light set background=light
if $SSH_CLIENT if $SSH_CLIENT
colorscheme smpl colorscheme smpl
else else
if &background == 'light' colorscheme nofrils-dark
colorscheme nofrils-light
else
"colorscheme nofrils-dark
colorscheme nofrils-light
endif
"use terminal background "use terminal background
if has('nvim') hi Normal ctermbg=none guibg=none
hi Normal ctermbg=none guibg=none hi todo ctermbg=none guibg=none
hi todo ctermbg=none guibg=none hi statement ctermbg=none guibg=none
hi statement ctermbg=none guibg=none hi LineNr ctermbg=none guibg=none
hi LineNr ctermbg=none guibg=none
else
hi Normal ctermbg=none
hi todo ctermbg=none
hi statement ctermbg=none
hi LineNr ctermbg=none
endif
endif endif
endif endif
@ -85,7 +72,6 @@ let g:ale_sign_warning = '⚠'
let g:ale_virtualtext_cursor = 0 let g:ale_virtualtext_cursor = 0
let g:ale_ruby_rubocop_executable = 'bundle' let g:ale_ruby_rubocop_executable = 'bundle'
let g:ale_ruby_steep_executable = 'bundle' let g:ale_ruby_steep_executable = 'bundle'
let g:ale_ruby_standardrb_executable = 'bundle'
let g:go_fmt_command = "goimports" let g:go_fmt_command = "goimports"
"let g:ale_linters = {'ruby': ['standardrb']} "let g:ale_linters = {'ruby': ['standardrb']}
"let g:ale_fixers = { 'python': ['black'], 'ruby': ['standardrb'] } "let g:ale_fixers = { 'python': ['black'], 'ruby': ['standardrb'] }