some cleanup, vim is back as well as st

vimrc

@@ -6,23 +6,19 @@ set list listchars=tab:\|_,nbsp:x,trail:*
 set hlsearch incsearch ignorecase smartcase
 " scroll before reaching the first / final line
 set scrolloff=3 sidescrolloff=15 sidescroll=1
-" disable bell
-set noerrorbells visualbell t_vb=
+" disable bell and fix termcap
+set noerrorbells visualbell t_vb= t_8f=[38;2;%lu;%lu;%lum t_8b=[48;2;%lu;%lu;%lum
 " indentation
 set tabstop=3 softtabstop=4 shiftwidth=4 smarttab expandtab autoindent
-" termcap fixes
-set t_Co=256 t_ut= termencoding=utf-8 encoding=utf-8
 " status line
 set wildmenu showcmd ruler laststatus=2
 set statusline=[%F]\ %R%H%W%M\ %=[%{&fenc}/%{&ff}]\ %y\ [%4l/%L:%3v]
 " update window title
-if !exists('g:tvim')
-    if $TERM =~ '^screen'
-        set t_ts=k
-        set t_fs=\
-    endif
-    set title titlestring=[%{hostname()}]\ %t\ -\ vim
+if $TERM =~ '^screen'
+    set t_ts=k
+    set t_fs=\
 endif
+set title titlestring=[%{hostname()}]\ %t\ -\ vim
 " enable case indentation
 let g:sh_indent_case_labels=1
 " version specific settings
@@ -63,21 +59,14 @@ if v:version >= 800
     xmap <Leader>a <Plug>(EasyAlign)
     nmap <Leader>a <Plug>(EasyAlign)
 
-    " signify options
-    let g:signify_vcs_list = [ 'git' ]
-    let g:signify_sign_change = '~'
-
     " enable packs based on filetype
     let g:ale_python_flake8_executable = 'python2'
     autocmd FileType python packadd ale | packadd jedi-vim
     autocmd FileType sh packadd ale
 
-    if exists('g:tvim') || has('gui_running')
-        colorscheme jellybeans
-    elseif $TERM != 'linux'
-        let g:solarized_extra_hi_groups = 1
-        let g:solarized_use16 = 1
-        colorscheme solarized8
+    if $TERM != 'linux'
+        set termguicolors bg=dark ttymouse=sgr
+        colorscheme hybrid
     endif
 endif