From ac3580c83fab0a661e9a2f2974324ac74721306d Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Mon, 2 Jul 2018 20:03:58 +0300
Subject: [PATCH] neovim, switch to flattened (another theme again, I know
 right?)

---
 .gitmodules                    | 12 +++---------
 vimpack/start/flattened        |  1 +
 vimpack/start/papercolor-theme |  1 -
 vimpack/start/vim-gruvbox8     |  1 -
 vimpack/start/vim-solarized8   |  1 -
 vimrc                          |  9 +--------
 zshrc                          |  5 +++++
 7 files changed, 10 insertions(+), 20 deletions(-)
 create mode 160000 vimpack/start/flattened
 delete mode 160000 vimpack/start/papercolor-theme
 delete mode 160000 vimpack/start/vim-gruvbox8
 delete mode 160000 vimpack/start/vim-solarized8

diff --git a/.gitmodules b/.gitmodules
index 4e375a1..347c0c5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,15 +16,6 @@
 [submodule "vim-tru-typewriter"]
 	path = vimpack/start/vim-tru-typewriter
 	url = https://git.vdrandom.org/vim-tru-typewriter
-[submodule "vim-gruvbox8"]
-	path = vimpack/start/vim-gruvbox8
-	url = https://github.com/lifepillar/vim-gruvbox8.git
-[submodule "vim-solarized8"]
-	path = vimpack/start/vim-solarized8
-	url = https://github.com/lifepillar/vim-solarized8.git
-[submodule "PaperColor"]
-	path = vimpack/start/papercolor-theme
-	url = https://github.com/NLKNguyen/papercolor-theme.git
 [submodule "vimwiki"]
 	path = vimpack/opt/vimwiki
 	url = https://github.com/vimwiki/vimwiki.git
@@ -37,3 +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
diff --git a/vimpack/start/flattened b/vimpack/start/flattened
new file mode 160000
index 0000000..a4e55da
--- /dev/null
+++ b/vimpack/start/flattened
@@ -0,0 +1 @@
+Subproject commit a4e55da1a35ea565216597f893dcf8d479aefe6a
diff --git a/vimpack/start/papercolor-theme b/vimpack/start/papercolor-theme
deleted file mode 160000
index 1d7ec4e..0000000
--- a/vimpack/start/papercolor-theme
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d7ec4e7cd7ee6b689baecd9002342cc55de6c20
diff --git a/vimpack/start/vim-gruvbox8 b/vimpack/start/vim-gruvbox8
deleted file mode 160000
index 0d6c7ad..0000000
--- a/vimpack/start/vim-gruvbox8
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0d6c7adfcefc7eebc6bb711a927740dde6191e78
diff --git a/vimpack/start/vim-solarized8 b/vimpack/start/vim-solarized8
deleted file mode 160000
index ff7ec26..0000000
--- a/vimpack/start/vim-solarized8
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff7ec263d934320deb9c49b2ca8af61caf072f01
diff --git a/vimrc b/vimrc
index 8b7a2e0..5bf9303 100644
--- a/vimrc
+++ b/vimrc
@@ -69,14 +69,7 @@ if v:version >= 800
     autocmd FileType python packadd jedi-vim | packadd ale
     autocmd FileType sh packadd ale
 
-    " yaaay themes
-    if $TERM =~ '^\(rxvt\|st\|tmux\|xterm\)'
-        let &t_8f = "\033[38;2;%lu;%lu;%lum"
-        let &t_8b = "\033[48;2;%lu;%lu;%lum"
-        set termguicolors
-    endif
-    set bg=dark
-    colorscheme gruvbox8
+    colorscheme flattened_light
 endif
 
 syntax on
diff --git a/zshrc b/zshrc
index 45322dc..d06adef 100644
--- a/zshrc
+++ b/zshrc
@@ -228,4 +228,9 @@ greset() {
     /usr/bin/git clean -fd
     /usr/bin/git reset --hard
 }
+vim() {
+    local vimbin
+    vimbin=$(whence nvim) || vimbin=$(whence vim)
+    $vimbin "$@"
+}
 # }}}