colors but they're different now

15 files changed, 140 insertions, 157 deletions

diff --git a/.cache/wal/chromium/bg.png b/.cache/wal/chromium/bg.png
index 5995ddc..46227a9 100644
--- a/.cache/wal/chromium/bg.png
+++ b/.cache/wal/chromium/bg.png
diff --git a/.cache/wal/chromium/manifest.json b/.cache/wal/chromium/manifest.json
index 63441e0..01657f8 100644
--- a/.cache/wal/chromium/manifest.json
+++ b/.cache/wal/chromium/manifest.json
@@ -3,65 +3,19 @@
     "manifest_version": 2,
     "name": "pywal",
     "theme": {
-        "images": {
-            "theme_frame": "bg.png"
-        },
+        "images": { "theme_frame": "bg.png" },
         "colors": {
-            "bookmark_text": [
-                252,
-                249,
-                247
-            ],
-            "frame": [
-                255,
-                255,
-                255
-            ],
-            "ntp_background": [
-                18,
-                18,
-                18
-            ],
-            "ntp_text": [
-                18,
-                18,
-                18
-            ],
-            "tab_background_text": [
-                223,
-                158,
-                126
-            ],
-            "tab_background_text_inactive": [
-                223,
-                158,
-                126
-            ],
-            "tab_background_text_incognito": [
-                223,
-                158,
-                126
-            ],
-            "tab_background_text_incognito_inactive": [
-                223,
-                158,
-                126
-            ],
-            "tab_text": [
-                252,
-                249,
-                247
-            ],
-            "toolbar": [
-                23,
-                23,
-                24
-            ],
-            "button_background": [
-                255,
-                255,
-                255
-            ]
+            "frame":                                  [ 255, 255, 255 ],
+            "button_background":                      [ 255, 255, 255 ],
+            "ntp_background":                         [ 15,  20,  25  ],
+            "ntp_text":                               [ 15,  20,  25  ],
+            "toolbar":                                [ 23,  28,  36  ],
+            "tab_background_text":                    [ 73,  81,  98  ],
+            "tab_background_text_inactive":           [ 73,  81,  98  ],
+            "tab_background_text_incognito":          [ 73,  81,  98  ],
+            "tab_background_text_incognito_inactive": [ 73,  81,  98  ],
+            "bookmark_text":                          [ 248, 248, 240 ],
+            "tab_text":                               [ 248, 248, 240 ]
         },
         "tints": {
             "buttons": [
@@ -69,22 +23,10 @@
                 29.279279279279276,
                 87.05882352941177
             ],
-            "frame_inactive": [
-                -1,
-                -1,
-                -1
-            ],
-            "frame_incognito": [
-                -1,
-                -1,
-                -1
-            ],
-            "frame_incognito_inactive": [
-                -1,
-                -1,
-                -1
-            ]
+            "frame_inactive": [ -1, -1, -1 ],
+            "frame_incognito": [ -1, -1, -1 ],
+            "frame_incognito_inactive": [ -1, -1, -1 ]
         }
     },
     "version": "2"
-}
\ No newline at end of file
+}
diff --git a/.config/X11/dark b/.config/X11/dark
index b4083bd..f947012 100644
--- a/.config/X11/dark
+++ b/.config/X11/dark
@@ -1,20 +1,20 @@
-*.color0:  #121213
-*.color1:  #DE9DAC
-*.color2:  #9DDEAF
-*.color3:  #DEDD9D
-*.color4:  #9DACDE
-*.color5:  #AF9DDE
-*.color6:  #9DCCDE
-*.color7:  #f4e0d8
-*.color8:  #393b3b
-*.color9:  #F7AFC0
-*.color10: #AFF7C3
-*.color11: #F7F6AF
-*.color12: #AFC0F7
-*.color13: #C3AFF7
-*.color14: #AFE3F7
-*.color15: #f9ece8
+*.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
 
-*.foreground: #fdf9f7
-*.background: #121213
-*.cursorColor: #fdf9f7
+*.foreground: #f8f8f0
+*.background: #0f1419
+*.cursorColor: #f8f8f0
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 2c9d26e..f695ee8 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -49,20 +49,20 @@ mouse_middle_click = close_all
 mouse_right_click = close_current
 
 # vim: ft=cfg
-frame_color = "#DE9DAC"
+frame_color = "#ff3f4f"
 
 [urgency_low]
-background = "#121213"
-foreground = "#DE9DAC"
+background = "#0f1419"
+foreground = "#ff3f4f"
 timeout = 10
 
 [urgency_normal]
-background = "#121213"
-foreground = "#fdf9f7"
+background = "#0f1419"
+foreground = "#f8f8f0"
 timeout = 10
 
 [urgency_critical]
-background = "#DE9DAC"
-foreground = "#121213"
-frame_color = "#DE9DAC"
+background = "#ff3f4f"
+foreground = "#0f1419"
+frame_color = "#ff3f4f"
 timeout = 0
diff --git a/.config/i3/autostart b/.config/i3/autostart
index b1c3a9a..7d4bd3c 100644
--- a/.config/i3/autostart
+++ b/.config/i3/autostart
@@ -1,6 +1,6 @@
 #!/bin/sh
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 cat ~/.config/X11/base ~/.config/X11/dark | xrdb &
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 polybar main -c ~/.config/polybar/config &
 zsh -c "rwall" &
 picom -b
diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf
index 6faa9b2..0ff6875 100644
--- a/.config/mpd/mpd.conf
+++ b/.config/mpd/mpd.conf
@@ -45,3 +45,11 @@ audio_output {
 	format                  "44100:16:2"
 }
 
+audio_output {
+    type            "fifo"
+    name            "snapfifo"
+    path            "/tmp/snapfifo"
+    format          "48000:16:2"
+    mixer_type      "software"
+}
+
diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc
index 6e87beb..2fd4e95 100644
--- a/.config/neomutt/neomuttrc
+++ b/.config/neomutt/neomuttrc
@@ -64,3 +64,7 @@ color tilde brightmagenta black
 color index blue black ~F
 color index red black "~N|~O"
 
+# switch folders
+macro index i "<change-folder> =Inbox"<enter>
+macro index h "<change-folder> =Archive"<enter>
+
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 4452dd2..79762b5 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -3,8 +3,8 @@ let mapleader = " "
 set wrap
 set autoindent
 set noexpandtab
-set tabstop=4
-set shiftwidth=4
+set tabstop=2
+set shiftwidth=2
 set termguicolors
 set shortmess=I
 set splitbelow splitright
@@ -45,7 +45,7 @@ Plug 'itchyny/lightline.vim'
 Plug 'itchyny/vim-gitbranch'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'AndrewRadev/tagalong.vim'
-Plug 'tpope/vim-commentary'
+Plug 'terrortylor/nvim-comment'
 Plug 'liuchengxu/vim-which-key'
 Plug 'justinmk/vim-sneak'
 Plug 'jbgutierrez/vim-better-comments'
@@ -58,17 +58,18 @@ Plug 'wellle/targets.vim'
 Plug 'dstein64/vim-startuptime'
 Plug 'vim-scripts/DoxygenToolkit.vim'
 Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
+Plug 'dkarter/bullets.vim'
 
 " language plugins
 Plug 'lervag/vimtex'
-Plug 'pangloss/vim-javascript'
+" Plug 'pangloss/vim-javascript'
 Plug 'hail2u/vim-css3-syntax'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'vim-python/python-syntax'
 Plug 'dart-lang/dart-vim-plugin'
 Plug 'bartlomiejdanek/vim-dart'
 Plug 'natebosch/dartlang-snippets'
-Plug 'ianks/vim-tsx'
+Plug 'HerringtonDarkholme/yats.vim'
 Plug 'cespare/vim-toml'
 Plug 'tikhomirov/vim-glsl'
 
@@ -88,8 +89,8 @@ Plug 'NLKNguyen/papercolor-theme'
 Plug 'scheakur/vim-scheakur'
 Plug 'mkarmona/materialbox'
 Plug 'morhetz/gruvbox'
-Plug 'co1ncidence/mountaineer'
-Plug 'co1ncidence/bliss'
+Plug '~/.config/nvim/local/bliss'
+Plug '~/.config/nvim/local/polarlight.vim'
 Plug 'lonkaars/blubber'
 call plug#end()
 
@@ -216,8 +217,8 @@ if filereadable(expand('~/.local/share/mode/light'))
 	colorscheme blubber
 	source $HOME/.config/nvim/blubber-lightline.vim
 else
-	colorscheme bliss
-	source $HOME/.config/nvim/bliss-lightline.vim
+	colorscheme polarlight
+	source $HOME/.config/nvim/local/polarlight.vim/lightline.vim
 endif
 
 let g:lightline = {
@@ -392,3 +393,10 @@ let g:python_recommended_style = 0
 " autocmd FileType python setlocal noexpandtab
 au BufRead,BufNewFile *.py set expandtab
 
+function! SynStack()
+	if !exists("*synstack")
+		return
+	endif
+	echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
+endfunc
+
diff --git a/.config/picom.conf b/.config/picom.conf
index 992acc7..925ce7a 100644
--- a/.config/picom.conf
+++ b/.config/picom.conf
@@ -52,3 +52,8 @@ wintypes: {
 # unknown
 # utility
 
+# animations = true;
+# animation-stiffness = 500.0;
+# animation-dampening = 20.0;
+# animation-window-mass = 0.1;
+
diff --git a/.config/polybar/config b/.config/polybar/config
index ae52fdf..b89d8e9 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -98,9 +98,9 @@ pseudo-transparency = false
 
 [color]
 
-bg = ${xrdb:background:#121213}
-fg = ${xrdb:foreground:#fdf9f7}
-fg-alt = ${xrdb:background:#121213}
+bg = ${xrdb:background:#0f1419}
+fg = ${xrdb:foreground:#f8f8f0}
+fg-alt = ${xrdb:background:#0f1419}
 
 alpha = #00000000
 
@@ -132,10 +132,11 @@ label = %time%
 
 [module/mpd]
 type = internal/mpd
-format-online = 󰎇 <label-song>
-format-offline = 
-icon-play = 󰐊
-icon-pause = 󰏤
+format-online = <toggle> <label-song>
+format-offline = [mpd offline]
+format-stopped = 
+icon-play = 󰏤
+icon-pause = 󰐊
 label-song = %{T2}%artist%%{T-}: %title%
 label-song-maxlen = 50
 label-song-ellipsis = true
diff --git a/.config/startpage/style.css b/.config/startpage/style.css
index 1b46750..0181622 100644
--- a/.config/startpage/style.css
+++ b/.config/startpage/style.css
@@ -1,20 +1,20 @@
 :root {
-	--color0:  #121213;
-	--color1:  #DE9DAC;
-	--color2:  #9DDEAF;
-	--color3:  #DEDD9D;
-	--color4:  #9DACDE;
-	--color5:  #AF9DDE;
-	--color6:  #9DCCDE;
-	--color7:  #f4e0d8;
-	--color8:  #393b3b;
-	--color9:  #F7AFC0;
-	--color10: #AFF7C3;
-	--color11: #F7F6AF;
-	--color12: #AFC0F7;
-	--color13: #C3AFF7;
-	--color14: #AFE3F7;
-	--color15: #f9ece8;
+	--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;
 }
 
 html, body {
@@ -55,7 +55,7 @@ h1 {
 	position: absolute;
 	top: 0;
 	left: 0;
-	background-color: #0c0c0c;
+	background-color: #0d1216;
 	z-index: -2;
 	border-radius: 8px;
 }
diff --git a/.config/zathura/colors b/.config/zathura/colors
index c4bb3e0..085fa42 100644
--- a/.config/zathura/colors
+++ b/.config/zathura/colors
@@ -1,23 +1,23 @@
-set default-bg				"#121213"
-set statusbar-bg			"#121213"
-set inputbar-bg				"#121213"
-set completion-highlight-fg	"#121213"
-set completion-bg			"#121213"
-set notification-error-fg	"#121213"
-set notification-warning-fg	"#121213"
-set notification-fg			"#121213"
-set recolor-lightcolor		"#121213"
+set default-bg				"#0f1419"
+set statusbar-bg			"#0f1419"
+set inputbar-bg				"#0f1419"
+set completion-highlight-fg	"#0f1419"
+set completion-bg			"#0f1419"
+set notification-error-fg	"#0f1419"
+set notification-warning-fg	"#0f1419"
+set notification-fg			"#0f1419"
+set recolor-lightcolor		"#0f1419"
 
-set default-fg			"#fdf9f7"
-set inputbar-fg			"#fdf9f7"
-set completion-fg		"#fdf9f7"
-set statusbar-fg		"#fdf9f7"
-set recolor-darkcolor	"#fdf9f7"
+set default-fg			"#f8f8f0"
+set inputbar-fg			"#f8f8f0"
+set completion-fg		"#f8f8f0"
+set statusbar-fg		"#f8f8f0"
+set recolor-darkcolor	"#f8f8f0"
 
-set notification-error-bg   "#F7AFC0"
-set notification-warning-bg "#F7AFC0"
-set completion-highlight-bg "#F7AFC0"
-set highlight-color         "#F7AFC0"
+set notification-error-bg   "#f95c76"
+set notification-warning-bg "#f95c76"
+set completion-highlight-bg "#f95c76"
+set highlight-color         "#f95c76"
 
-set highlight-active-color "#C3AFF7"
-set notification-bg        "#C3AFF7"
+set highlight-active-color "#ea79fc"
+set notification-bg        "#ea79fc"
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 78fc496..7cc5796 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -1,7 +1,7 @@
 set scroll-page-aware "true"
 set scroll-full-overlap 0.01
 set scroll-step 100
-set font "JetBrainsMono Nerd Font 10"
+set font "JetBrainsMono Nerd Font 9"
 set selection-clipboard clipboard
 
 # recolor (dark mode)
diff --git a/.local/share/bin/ipod-sync b/.local/share/bin/ipod-sync
index 92eb0c2..62c8c80 100755
--- a/.local/share/bin/ipod-sync
+++ b/.local/share/bin/ipod-sync
@@ -2,6 +2,11 @@
 
 UUID="81CC-A462"
 
+if test ! -h "/dev/disk/by-uuid/$UUID"; then
+	notify-send "ipod-sync" "can't find disk with uuid $UUID"
+	exit 1
+fi
+
 read -r -d '' commands << EOF
 echo "mounting..."
 sudo mount "/dev/disk/by-uuid/$UUID" /mnt/ipod -o uid=loek,gid=users
@@ -22,4 +27,3 @@ EOF
 st -T "[floating]" -g "100x15--154-140" -e sh -c "$commands"
 
 
-
diff --git a/.local/share/bin/mode b/.local/share/bin/mode
index 5668d3e..904ff03 100755
--- a/.local/share/bin/mode
+++ b/.local/share/bin/mode
@@ -60,6 +60,16 @@ EOF
 	echo "$conf" > ~/.config/zathura/colors
 }
 
+switch_gtk() {
+	if [[ $1 == "light" ]]; then
+		sed "s/-Dark/-Light/" -i ~/.config/gtk-3.0/settings.ini
+		sed "s/gtk-application-prefer-dark-theme.*/gtk-application-prefer-dark-theme=false/" -i ~/.config/gtk-3.0/settings.ini
+	else
+		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
+}
+
 reload_terms() {
 	read -r -d '' escape_msgs << EOF
 \033]11;$(get_color background)\007
@@ -105,6 +115,7 @@ switch_cfgs() {
 	switch_xrdb $1
 	switch_dunst $1
 	switch_zathura $1
+	switch_gtk $1
 
 	echo $1 > ~/.local/share/mode/active
 	rm ~/.local/share/mode/dark ~/.local/share/mode/light