From 74e27e6278de2752cc193d6be3548a7d40cf0fc4 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Mon, 5 Nov 2018 16:43:11 -0600
Subject: [PATCH] xrdb, Vim: Use Linux colors

---
 ...0-colors-gruvbox-dark.xresources.disabled} |  0
 .config/xrdb/00-colors-linux.xresources       | 24 +++++++++++++++++++
 .gitmodules                                   |  3 ---
 .vim/bundle/gruvbox                           |  1 -
 4 files changed, 24 insertions(+), 4 deletions(-)
 rename .config/xrdb/{00-colors-gruvbox-dark.xresources => 00-colors-gruvbox-dark.xresources.disabled} (100%)
 create mode 100644 .config/xrdb/00-colors-linux.xresources
 delete mode 160000 .vim/bundle/gruvbox

diff --git a/.config/xrdb/00-colors-gruvbox-dark.xresources b/.config/xrdb/00-colors-gruvbox-dark.xresources.disabled
similarity index 100%
rename from .config/xrdb/00-colors-gruvbox-dark.xresources
rename to .config/xrdb/00-colors-gruvbox-dark.xresources.disabled
diff --git a/.config/xrdb/00-colors-linux.xresources b/.config/xrdb/00-colors-linux.xresources
new file mode 100644
index 00000000..dc35ce26
--- /dev/null
+++ b/.config/xrdb/00-colors-linux.xresources
@@ -0,0 +1,24 @@
+*background:		#000000
+*bg2:			#181818
+*bg3:			#686868
+*foreground:		#b2b2b2
+
+! Black Red Green Yellow Blue Magenta Cyan Grey
+! Dim
+*color0:		#000000 
+*color1:		#b21818
+*color2:		#18b218
+*color3:		#b26818
+*color4:		#1818b2
+*color5:		#b218b2
+*color6:		#18b2b2
+*color7:		#b2b2b2
+! Intense
+*color8:		#686868
+*color9:		#ff5454
+*color10:		#54ff54
+*color11:		#ffff54
+*color12:		#5454ff
+*color13:		#ff54ff
+*color14:		#54ffff
+*color15:		#ffffff
diff --git a/.gitmodules b/.gitmodules
index 387e3445..c83763e8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule ".vim/bundle/vim-closetag"]
 	path = .vim/bundle/vim-closetag
 	url = https://github.com/alvan/vim-closetag.git
-[submodule ".vim/bundle/gruvbox"]
-	path = .vim/bundle/gruvbox
-	url = https://github.com/morhetz/gruvbox.git
 [submodule ".vim/bundle/SimpylFold"]
 	path = .vim/bundle/SimpylFold
 	url = https://github.com/tmhedberg/SimpylFold.git
diff --git a/.vim/bundle/gruvbox b/.vim/bundle/gruvbox
deleted file mode 160000
index cb4e7a56..00000000
--- a/.vim/bundle/gruvbox
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86