move to rose pine and auto lightline config generator

13 files changed, 62 insertions, 286 deletions

diff --git a/.config/BetterDiscord/themes/Material-Discord.theme.css b/.config/BetterDiscord/themes/Material-Discord.theme.css
deleted file mode 100644
index c3f0ced..0000000
--- a/.config/BetterDiscord/themes/Material-Discord.theme.css
+++ /dev/null
@@ -1,3 +0,0 @@
-//META{"name":"Material_Discord","description":"A theme based on Google's Material Design","author":"CapnKitten","version":"2.1.4.1"}*//{}
-
-@import url(https://capnkitten.github.io/BetterDiscord/Material-Discord/css/source.css?v=2.1.4.1);
diff --git a/.config/BetterDiscord/themes/MinimalCord.theme.css b/.config/BetterDiscord/themes/MinimalCord.theme.css
deleted file mode 100644
index 870c8f6..0000000
--- a/.config/BetterDiscord/themes/MinimalCord.theme.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @name MinimalCord
- * @author Gibbu#1211
- * @version 2.0.0
- * @invite ZHthyCw
- * @description Changes Discord enough to give it a fresh feel while also making it darker. Supports both Light and Dark themes.
- * @source https://github.com/DiscordStyles/MinimalCord
- * @website https://www.gibbu.me
-*/
-
-@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap');
-@import url("https://discordstyles.github.io/MinimalCord/dist/MinimalCord.css");
-
-:root {
-    /*
-        Accent variable
-        Use this website: https://htmlcolorcodes.com/color-picker/
-        to get your desired RGB numbers. Then simply put each number in their respective area.
-        R,G,B
-    */
-    --accent: 50, 131, 207;
-
-    --message-padding: 10px; /* Spacing in the messages. MUST END IN px | DEFAULT: 10px */
-    --message-spacing: 10px; /* Spacing around the messages. MUST END IN px | DEFAULT: 10px */
-
-    /*
-        To use a custom font. Visit https://fonts.google.com and select one to your liking.
-        Now just follow this tutorial: https://imgur.com/a/CNbw7xC
-    */
-    --font: 'Roboto';
-}
\ No newline at end of file
diff --git a/.config/BetterDiscord/themes/bliss.theme.css b/.config/BetterDiscord/themes/bliss.theme.css
deleted file mode 100644
index 0f95c74..0000000
--- a/.config/BetterDiscord/themes/bliss.theme.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @name bliss
- * @author Loekaars#8205
- * @version 1.0.0
- * @description based off co1ncidence's vim theme
-*/
-
-:root {
-	--accent: 175, 192, 247;
-
-	--pywal-serverside: #0c0c0c;
-
-	--pywal-bg0: #121213;
-	--pywal-bg1: #181818;
-	--pywal-bg2: #181818;
-	--pywal-bg3: #222222;
-
-	--pywal-color0:  #121213;
-	--pywal-color1:  #DE9DAC;
-	--pywal-color2:  #9DDEAF;
-	--pywal-color3:  #DEDD9D;
-	--pywal-color4:  #9DACDE;
-	--pywal-color5:  #AF9DDE;
-	--pywal-color6:  #9DCCDE;
-	--pywal-color7:  #f4e0d8;
-	--pywal-color8:  #393b3b;
-	--pywal-color9:  #F7AFC0;
-	--pywal-color10: #AFF7C3;
-	--pywal-color11: #F7F6AF;
-	--pywal-color12: #AFC0F7;
-	--pywal-color13: #C3AFF7;
-	--pywal-color14: #AFE3F7;
-	--pywal-color15: #f9ece8;
-}
diff --git a/.config/BetterDiscord/themes/mountaineer.theme.css b/.config/BetterDiscord/themes/mountaineer.theme.css
deleted file mode 100644
index 4df2450..0000000
--- a/.config/BetterDiscord/themes/mountaineer.theme.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @name mountaineer
- * @author Loekaars#8205
- * @version 1.0.0
- * @description based off vim
-*/
-
-:root {
-	--accent: 172, 138, 140;
-
-	--pywal-serverside: #000000;
-
-	--pywal-bg0: #050505;
-	--pywal-bg1: #111111;
-	--pywal-bg2: #111111;
-	--pywal-bg3: #181818;
-
-	--pywal-color0: #050505;
-	--pywal-color1: #AC8A8C;
-	--pywal-color2: #8AAC8B;
-	--pywal-color3: #ACA98A;
-	--pywal-color4: #8F8AAC;
-	--pywal-color5: #AC8AAC;
-	--pywal-color6: #8AABAC;
-	--pywal-color7: #e7e7e7;
-	--pywal-color8: #676767;
-	--pywal-color9: #AC8A8C;
-	--pywal-color10: #8AAC8B;
-	--pywal-color11: #ACA98A;
-	--pywal-color12: #8F8AAC;
-	--pywal-color13: #AC8AAC;
-	--pywal-color14: #8AABAC;
-	--pywal-color15: #f0f0f0;
-}
diff --git a/.config/BetterDiscord/themes/pywal.theme.css b/.config/BetterDiscord/themes/pywal.theme.css
deleted file mode 100644
index a5ed0df..0000000
--- a/.config/BetterDiscord/themes/pywal.theme.css
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @name pywal
- * @author Loekaars#8205
- * @version 1.0.0
- * @description Cool beans
-*/
-
-:root {
-	--pywal-shade0: #2A1E4D;
-	--pywal-shade1: #32245C;
-	--pywal-shade2: #362664;
-	--pywal-shade3: #3A296C;
-	--pywal-shade4: #280590;
-
-	--accent: 194, 163, 58;
-
-	--pywal-serverside: #1D1627;
-	--pywal-serverfolder-transparent: hsla(265.29999999999995, 28.4%, 11.8%, 0.75);
-
-	--pywal-bg0: #20182B;
-	--pywal-bg1: #261D34;
-	--pywal-bg2: #2D223C;
-	--pywal-bg3: #332645;
-
-	--pywal-color0: #20182b;
-	--pywal-color1: #5034d4;
-	--pywal-color2: #3370d7;
-	--pywal-color3: #28b6c6;
-	--pywal-color4: #da7446;
-	--pywal-color5: #45c790;
-	--pywal-color6: #c2a33a;
-	--pywal-color7: #c7c5ca;
-	--pywal-color8: #575160;
-	--pywal-color9: #5034d4;
-	--pywal-color10: #3370d7;
-	--pywal-color11: #28b6c6;
-	--pywal-color12: #da7446;
-	--pywal-color13: #45c790;
-	--pywal-color14: #c2a33a;
-	--pywal-color15: #c7c5ca;
-
-	--pywal-readable-color0: #695386;
-	--pywal-readable-color1: #5034D4;
-	--pywal-readable-color2: #3370D7;
-	--pywal-readable-color3: #28B6C6;
-	--pywal-readable-color4: #DA7446;
-	--pywal-readable-color5: #45C790;
-	--pywal-readable-color6: #C2A33A;
-	--pywal-readable-color7: #C7C5CA;
-	--pywal-readable-color8: #575160;
-	--pywal-readable-color9: #5034D4;
-	--pywal-readable-color10: #3370D7;
-	--pywal-readable-color11: #28B6C6;
-	--pywal-readable-color12: #DA7446;
-	--pywal-readable-color13: #45C790;
-	--pywal-readable-color14: #C2A33A;
-	--pywal-readable-color15: #C7C5CA;
-
-	--pywal-readableOn-color0: #c7c5ca;
-	--pywal-readableOn-color1: #c7c5ca;
-	--pywal-readableOn-color2: #c7c5ca;
-	--pywal-readableOn-color3: #20182b;
-	--pywal-readableOn-color4: #20182b;
-	--pywal-readableOn-color5: #20182b;
-	--pywal-readableOn-color6: #20182b;
-	--pywal-readableOn-color7: #20182b;
-	--pywal-readableOn-color8: #c7c5ca;
-	--pywal-readableOn-color9: #c7c5ca;
-	--pywal-readableOn-color10: #c7c5ca;
-	--pywal-readableOn-color11: #20182b;
-	--pywal-readableOn-color12: #20182b;
-	--pywal-readableOn-color13: #20182b;
-	--pywal-readableOn-color14: #20182b;
-	--pywal-readableOn-color15: #20182b;
-}
\ No newline at end of file
diff --git a/.config/X11/dark b/.config/X11/dark
index f947012..5af9449 100644
--- a/.config/X11/dark
+++ b/.config/X11/dark
@@ -1,20 +1,21 @@
-*.color0:  #0f1419
-*.color1:  #ff3f4f
-*.color2:  #81f900
-*.color3:  #ffd945
-*.color4:  #45a1ed
-*.color5:  #ef47c5
-*.color6:  #19d1e5
-*.color7:  #f8f8f0
-*.color8:  #495162
-*.color9:  #f95c76
-*.color10: #7dfc5a
-*.color11: #f9ce70
-*.color12: #6395f2
-*.color13: #ea79fc
-*.color14: #88f0fc
-*.color15: #fffff4
+*.color0:  #26233a
+*.color1:  #eb6f92
+*.color2:  #31748f
+*.color3:  #f6c177
+*.color4:  #9ccfd8
+*.color5:  #c4a7e7
+*.color6:  #ebbcba
+*.color7:  #e0def4
+*.color8:  #6e6a86
+*.color9:  #eb6f92
+*.color10: #31748f
+*.color11: #f6c177
+*.color12: #9ccfd8
+*.color13: #c4a7e7
+*.color14: #ebbcba
+*.color15: #e0def4
 
-*.foreground: #f8f8f0
-*.background: #0f1419
-*.cursorColor: #f8f8f0
+*.foreground: #e0def4
+*.background: #191724
+*.cursor_background: #524f67
+*.cursor_foreground: #e0def4
diff --git a/.config/X11/light b/.config/X11/light
index 1f9c2ae..ae9f442 100644
--- a/.config/X11/light
+++ b/.config/X11/light
@@ -1,20 +1,21 @@
-*.color0:  #fdf9f7
-*.color1:  #8c627a
-*.color2:  #628c6e
-*.color3:  #8c8b62
-*.color4:  #626b8c
-*.color5:  #6e628c
-*.color6:  #62808c
-*.color7:  #121213
-*.color8:  #ccbeb7
-*.color9:  #725063
-*.color10: #50725a
-*.color11: #727250
-*.color12: #505872
-*.color13: #5a5072
-*.color14: #506872
-*.color15: #393b3b
+*.color0:  #f2e9e1
+*.color1:  #b4637a
+*.color2:  #286983
+*.color3:  #ea9d34
+*.color4:  #56949f
+*.color5:  #907aa9
+*.color6:  #d7827e
+*.color7:  #575279
+*.color8:  #9893a5
+*.color9:  #b4637a
+*.color10: #286983
+*.color11: #ea9d34
+*.color12: #56949f
+*.color13: #907aa9
+*.color14: #d7827e
+*.color15: #575279
 
-*.foreground: #121213
-*.background: #fdf9f7
-*.cursorColor: #121213
+*.foreground: #575279
+*.background: #faf4ed
+*.cursor_background: #cecacd
+*.cursor_foreground: #575279
diff --git a/.config/nvim/blubber-lightline.vim b/.config/nvim/blubber-lightline.vim
deleted file mode 100644
index 7969163..0000000
--- a/.config/nvim/blubber-lightline.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-let s:bg = [ '#fdf9f7', 'NONE' ]
-let s:fg = [ '#121213', 'NONE' ]
-let s:mode = [ '#ccbeb7', 'NONE' ]
-let s:faint = [ '#393b3b', 'NONE' ]
-let s:none = [ 'NONE', 'NONE' ]
-let s:test = [ '#ff00ff', 'NONE' ]
-
-let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-let s:p.normal.left = [ [ s:fg, s:mode ], [ s:faint, s:bg ] ]
-let s:p.normal.right = [ [ s:faint, s:bg ] ]
-let s:p.normal.middle = [ [ s:none, s:none ] ]
-let s:p.normal.error = [ [ s:test, s:test ] ]
-let s:p.normal.warning = [ [ s:test, s:test ] ]
-let s:p.inactive.left = copy(s:p.normal.left)
-let s:p.inactive.right = copy(s:p.normal.right)
-let s:p.inactive.middle = copy(s:p.normal.middle)
-let s:p.insert.left = copy(s:p.normal.left)
-let s:p.replace.left = copy(s:p.insert.left)
-let s:p.visual.left = copy(s:p.insert.left)
-let s:p.tabline.left = copy(s:p.normal.middle)
-let s:p.tabline.tabsel = [ [ s:fg, s:mode ] ]
-let s:p.tabline.middle = copy(s:p.normal.middle)
-let s:p.tabline.right = copy(s:p.normal.middle)
-
-let g:lightline#colorscheme#bliss#palette = lightline#colorscheme#flatten(s:p)
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 87e2862..80acaba 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -231,15 +231,14 @@ let g:Hexokinase_optInPatterns = [
 " colorscheme thingers
 
 if filereadable(expand('~/.local/share/mode/light'))
-	colorscheme blubber
-	source $HOME/.config/nvim/blubber-lightline.vim
+	colorscheme rose-pine-light
 else
-	colorscheme polarlight
-	source $HOME/.config/nvim/local/polarlight.vim/lightline.vim
+	colorscheme rose-pine-dark
 endif
 
+source $HOME/.config/nvim/lightline.vim
 let g:lightline = {
-			\ 'colorscheme': 'bliss',
+			\ 'colorscheme': 'auto',
 			\ 'mode_map': {
 			\	'n' : 'norm',
 			\	'i' : 'ins',
diff --git a/.config/nvim/bliss-lightline.vim b/.config/nvim/lightline-base.vim
index 969c7a0..968b4b1 100644
--- a/.config/nvim/bliss-lightline.vim
+++ b/.config/nvim/lightline-base.vim
@@ -1,10 +1,3 @@
-let s:bg = [ '#121213', 'NONE' ]
-let s:fg = [ '#fdf9f7', 'NONE' ]
-let s:mode = [ '#222222', 'NONE' ]
-let s:faint = [ '#454949', 'NONE' ]
-let s:none = [ 'NONE', 'NONE' ]
-let s:test = [ '#ff00ff', 'NONE' ]
-
 let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
 let s:p.normal.left = [ [ s:fg, s:mode ], [ s:faint, s:bg ] ]
 let s:p.normal.right = [ [ s:faint, s:bg ] ]
@@ -22,4 +15,4 @@ let s:p.tabline.tabsel = [ [ s:fg, s:mode ] ]
 let s:p.tabline.middle = copy(s:p.normal.right)
 let s:p.tabline.right = copy(s:p.normal.right)
 
-let g:lightline#colorscheme#bliss#palette = lightline#colorscheme#flatten(s:p)
+let g:lightline#colorscheme#auto#palette = lightline#colorscheme#flatten(s:p)
diff --git a/.config/nvim/mountaineer-lightline.vim b/.config/nvim/mountaineer-lightline.vim
deleted file mode 100644
index c8bf37a..0000000
--- a/.config/nvim/mountaineer-lightline.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-" hi! Normal guibg=#050505 ctermbg=NONE
-" hi! EndOfBuffer guibg=#050505 ctermbg=NONE
-" hi! CocInfoFloat guibg=#403056 ctermbg=NONE
-
-let s:bg = [ '#050505', 'NONE' ]
-let s:fg = [ '#e6e6e6', 'NONE' ]
-let s:bg2 = [ '#111111', 'NONE' ]
-let s:bg4 = [ '#222222', 'NONE' ]
-let s:color8 = [ '#333333', 'NONE' ]
-let s:none = [ 'NONE', 'NONE' ]
-let s:test = [ '#ff00ff', 'NONE' ]
-
-let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
-let s:p.normal.left = [ [ s:fg, s:bg2 ], [ s:color8, s:bg ] ]
-let s:p.normal.right = [ [ s:color8, s:bg ] ]
-let s:p.normal.middle = [ [ s:none, s:none ] ]
-let s:p.normal.error = [ [ s:test, s:test ] ]
-let s:p.normal.warning = [ [ s:test, s:test ] ]
-let s:p.inactive.left = copy(s:p.normal.left)
-let s:p.inactive.right = copy(s:p.normal.right)
-let s:p.inactive.middle = copy(s:p.normal.middle)
-let s:p.insert.left = [ [ s:fg, s:bg4 ], [ s:fg, s:bg ] ]
-let s:p.replace.left = copy(s:p.insert.left)
-let s:p.visual.left = copy(s:p.insert.left)
-let s:p.tabline.left = copy(s:p.normal.middle)
-let s:p.tabline.tabsel = [ [ s:fg, s:bg4 ] ]
-let s:p.tabline.middle = copy(s:p.normal.middle)
-let s:p.tabline.right = copy(s:p.normal.middle)
-
-let g:lightline#colorscheme#mountaineer#palette = lightline#colorscheme#flatten(s:p)
diff --git a/.config/startpage/style.css b/.config/startpage/style.css
index 3c22f84..d92ab0c 100644
--- a/.config/startpage/style.css
+++ b/.config/startpage/style.css
@@ -1,8 +1,8 @@
 html, body {
 	margin: 0;
 	padding: 0;
-	background: var(--color0);
-	color: var(--color15);
+	background: var(--background);
+	color: var(--foreground);
 	font-family: "JetBrainsMono Nerd Font";
 }
 
diff --git a/.local/share/bin/mode b/.local/share/bin/mode
index 096435f..042c54c 100755
--- a/.local/share/bin/mode
+++ b/.local/share/bin/mode
@@ -92,7 +92,7 @@ switch_gtk() {
 		sed "s/-Light/-Dark/" -i ~/.config/gtk-3.0/settings.ini
 		sed "s/gtk-application-prefer-dark-theme.*/gtk-application-prefer-dark-theme=true/" -i ~/.config/gtk-3.0/settings.ini
 	fi
-	grep gtk-theme-name .config/gtk-3.0/settings.ini | cut -f2 -d= | xargs xfconf-query -c xsettings -p /Net/ThemeName -s
+	grep gtk-theme-name ~/.config/gtk-3.0/settings.ini | cut -f2 -d= | xargs xfconf-query -c xsettings -p /Net/ThemeName -s
 }
 
 switch_fcitx5() {
@@ -131,6 +131,8 @@ switch_startpage() {
 /* AUTOMATICALLY GENERATED, DO NOT EDIT */
 
 :root {
+	--background:  $(get_color background);
+	--foreground:  $(get_color foreground);
 	--color0:  $(get_color color0);
 	--color1:  $(get_color color1);
 	--color2:  $(get_color color2);
@@ -206,7 +208,18 @@ alpha = #00000000
 ; vim:ft=dosini
 EOF
 	echo "$conf" > ~/.config/polybar/colors
+}
 
+switch_vim_lightline() {
+	read -r -d '' conf << EOF
+let s:bg = [ '$(get_color background)', 'NONE' ]
+let s:fg = [ '$(get_color foreground)', 'NONE' ]
+let s:mode = [ '$(get_color color0)', 'NONE' ]
+let s:faint = [ '$(get_color color8)', 'NONE' ]
+let s:none = [ 'NONE', 'NONE' ]
+let s:test = [ '#ff00ff', 'NONE' ]
+EOF
+	echo "$conf" | cat - ~/.config/nvim/lightline-base.vim > ~/.config/nvim/lightline.vim
 }
 
 reload_terms() {
@@ -263,6 +276,7 @@ switch_cfgs() {
 	switch_chrome $1
 	switch_startpage $1
 	switch_polybar $1
+	switch_vim_lightline $1
 
 	mkdir -p ~/.local/share/mode
 	echo $1 > ~/.local/share/mode/active