From a3924a784c63de1e72b41820d1c93d20d241039d Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Tue, 3 Jul 2018 14:55:56 +0300
Subject: [PATCH] solarized8 is back (better support for gutter); also fix
 window naming in tmux

---
 .gitmodules                  | 6 +++---
 bashrc                       | 8 ++++----
 vimpack/start/flattened      | 1 -
 vimpack/start/vim-solarized8 | 1 +
 vimrc                        | 9 ++++++---
 zshrc                        | 8 ++++----
 6 files changed, 18 insertions(+), 15 deletions(-)
 delete mode 160000 vimpack/start/flattened
 create mode 160000 vimpack/start/vim-solarized8

diff --git a/.gitmodules b/.gitmodules
index 347c0c5..1fd341b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,6 @@
 [submodule "vim-gitgutter"]
 	path = vimpack/start/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter.git
-[submodule "flattened"]
-	path = vimpack/start/flattened
-	url = https://github.com/romainl/flattened.git
+[submodule "vim-solarized8"]
+	path = vimpack/start/vim-solarized8
+	url = https://github.com/lifepillar/vim-solarized8.git
diff --git a/bashrc b/bashrc
index 0f7339a..c764704 100644
--- a/bashrc
+++ b/bashrc
@@ -31,12 +31,12 @@ reset='\e[0m'
 prompt_command()
 {
     case ${TERM} in
-        rxvt*|st*|xterm*)
-            printf '\033]0;%s\007' "${HOSTNAME%%.*}"
-            ;;
-        screen*|tmux*)
+        screen*)
             printf '\033k%s\033\' "${HOSTNAME%%.*}"
             ;;
+        *)
+            printf '\033]0;%s\007' "${HOSTNAME%%.*}"
+            ;;
     esac
     if ((UID)); then
         prompt_user="${pblack}\\u${preset} "
diff --git a/vimpack/start/flattened b/vimpack/start/flattened
deleted file mode 160000
index a4e55da..0000000
--- a/vimpack/start/flattened
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a4e55da1a35ea565216597f893dcf8d479aefe6a
diff --git a/vimpack/start/vim-solarized8 b/vimpack/start/vim-solarized8
new file mode 160000
index 0000000..ff7ec26
--- /dev/null
+++ b/vimpack/start/vim-solarized8
@@ -0,0 +1 @@
+Subproject commit ff7ec263d934320deb9c49b2ca8af61caf072f01
diff --git a/vimrc b/vimrc
index 5bf9303..175e777 100644
--- a/vimrc
+++ b/vimrc
@@ -16,7 +16,7 @@ set t_Co=256 t_ut= termencoding=utf-8 encoding=utf-8
 set wildmenu showcmd ruler laststatus=2
 set statusline=[%F]\ %R%H%W%M\ %=[%{&fenc}/%{&ff}]\ %y\ [%4l/%L:%3v]
 " update window title
-if $TERM =~ '^\(screen\|tmux\)'
+if $TERM =~ '^screen'
     set t_ts=k
     set t_fs=\
 endif
@@ -66,10 +66,13 @@ if v:version >= 800
     nmap <Leader>a <Plug>(EasyAlign)
 
     " enable packs based on filetype
-    autocmd FileType python packadd jedi-vim | packadd ale
+    let g:ale_python_flake8_executable = 'python2'
+    autocmd FileType python packadd ale
     autocmd FileType sh packadd ale
 
-    colorscheme flattened_light
+    let g:solarized_extra_hi_groups = 1
+    let g:solarized_use16 = 1
+    colorscheme solarized8
 endif
 
 syntax on
diff --git a/zshrc b/zshrc
index d06adef..0fe825e 100644
--- a/zshrc
+++ b/zshrc
@@ -75,12 +75,12 @@ PROMPT3='%b%f?%(!.%F{red}.%F{black})#%f%b '
 PROMPT4='%b%f+%N:%i%(!.%F{red}.%F{black})>%f%b '
 precmd.title() {
     case $TERM in
-        st*|xterm*|rxvt*)
-            printf '\033]0;%s\007' ${HOST%%.*}
-            ;;
-        screen*|tmux*)
+        screen*)
             printf '\033k%s\033\' ${HOST%%.*}
             ;;
+        *)
+            printf '\033]0;%s\007' ${HOST%%.*}
+            ;;
     esac
 }
 precmd.is_git_repo() {