From 91707c2ed94322d1ab00b5d7fe8b141fc081d620 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@alien.gov>
Date: Sat, 20 Jul 2024 11:36:08 +0800
Subject: [PATCH] color schemes, multi-head and update path

---
 .config/kitty/themes/dark.conf    | 69 +++++++++++++++++++------------
 .config/nvim                      |  2 +-
 .config/sway/conf.d/exec          |  2 +-
 .config/sway/conf.d/keybinds      |  2 +-
 .config/sway/conf.d/windows-rules |  2 +
 .config/waybar/config.jsonc       | 30 +++++++-------
 .zshrc                            |  2 +-
 7 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/.config/kitty/themes/dark.conf b/.config/kitty/themes/dark.conf
index b93d4a8..88e7be9 100644
--- a/.config/kitty/themes/dark.conf
+++ b/.config/kitty/themes/dark.conf
@@ -1,32 +1,47 @@
-## name: Gruvbox Dark
-## author: Pavel Pertsev
-## license: MIT/X11
-## upstream: https://raw.githubusercontent.com/gruvbox-community/gruvbox-contrib/master/kitty/gruvbox-dark.conf
+# vim:ft=kitty
+## name: Gruvbox Material Dark Medium
+## author: Sainnhe Park
+## license: MIT
+## upstream: https://raw.githubusercontent.com/rsaihe/gruvbox-material-kitty/main/colors/gruvbox-material-dark-medium.conf
+## blurb: A modified version of Gruvbox with softer contrasts
 
-selection_foreground    #ebdbb2
-selection_background    #d65d0e
+background #282828
+foreground #d4be98
 
-background              #282828
-foreground              #ebdbb2
+selection_background #d4be98
+selection_foreground #282828
 
-color0                  #3c3836
-color1                  #cc241d
-color2                  #98971a
-color3                  #d79921
-color4                  #458588
-color5                  #b16286
-color6                  #689d6a
-color7                  #a89984
-color8                  #928374
-color9                  #fb4934
-color10                 #b8bb26
-color11                 #fabd2f
-color12                 #83a598
-color13                 #d3869b
-color14                 #8ec07c
-color15                 #fbf1c7
+cursor #a89984
+cursor_text_color background
 
-cursor                  #bdae93
-cursor_text_color       #665c54
+# Black
+color0 #665c54
+color8 #928374
 
-url_color               #458588
+# Red
+color1 #ea6962
+color9 #ea6962
+
+# Green
+color2  #a9b665
+color10 #a9b665
+
+# Yellow
+color3  #e78a4e
+color11 #d8a657
+
+# Blue
+color4  #7daea3
+color12 #7daea3
+
+# Magenta
+color5  #d3869b
+color13 #d3869b
+
+# Cyan
+color6  #89b482
+color14 #89b482
+
+# White
+color7  #d4be98
+color15 #d4be98
diff --git a/.config/nvim b/.config/nvim
index e54bdaa..f24ddba 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit e54bdaa5240d5315eaffc4e96e4b13d9887e80f0
+Subproject commit f24ddba0df874aae735d6e9634054d51174b91a4
diff --git a/.config/sway/conf.d/exec b/.config/sway/conf.d/exec
index 1b51a95..994bf18 100644
--- a/.config/sway/conf.d/exec
+++ b/.config/sway/conf.d/exec
@@ -4,6 +4,6 @@
 # exec_always sh -c ~/.config/sway/scripts/update-wallpaper.sh
 exec mkfifo /tmp/kitty
 exec wlsunset -s 19:00 -S 07:00 -d 1800
-exec xbacklight -set 70
+# exec xbacklight -set 70
 exec playerctld daemon
 # exec easyeffects --gapplication-service
diff --git a/.config/sway/conf.d/keybinds b/.config/sway/conf.d/keybinds
index 7450241..af3be87 100644
--- a/.config/sway/conf.d/keybinds
+++ b/.config/sway/conf.d/keybinds
@@ -51,7 +51,7 @@ bindsym XF86AudioNext exec 'playerctl next'
 bindsym XF86AudioPrev exec 'playerctl previous'
 
 # sticky window
-bindsym $mod+Ctrl+s floating toggle ; sticky toggle ; resize set 800 600 ; move position 55ppt 5ppt
+bindsym $mod+Ctrl+s sticky toggle
 
 # Start a terminal
 bindsym $mod+Return exec $term
diff --git a/.config/sway/conf.d/windows-rules b/.config/sway/conf.d/windows-rules
index 1dcc183..c55c563 100644
--- a/.config/sway/conf.d/windows-rules
+++ b/.config/sway/conf.d/windows-rules
@@ -9,6 +9,8 @@ for_window {
 	[app_id="exe$"] $float # Wayland wine app
 	[app_id="org.strawberrymusicplayer.strawberry"] $float
 	[class="exe$"] $float # XWayland wine app
+	[instance="REAPER"] $float
+	[instance="steam_proton"] $float # proton wine app
 	[instance="steamwebhelper"] $float
 	[title="Extension:*"] $float # Bitwarden passkey etc.
 	[title="Write:*"] $float # Thunderbird write emails
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 1fe50cc..584cdaa 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -2,7 +2,7 @@
 	{
 		"layer": "top",
 		"name": "main",
-		"output": "!XMI Redmi 27 NU 3948622WH08F4",
+		// "output": "!XMI Redmi 27 NU 3948622WH08F4",
 		"modules-left": [
 			"sway/workspaces"
 		],
@@ -23,19 +23,19 @@
 		"include": [
 			"~/.config/waybar/sway-modules.jsonc"
 		]
-	},
-	{
-		// "layer": "top",
-		"name": "alt",
-		"output": "XMI Redmi 27 NU 3948622WH08F4",
-		"modules-left": [
-			"sway/workspaces"
-		],
-		"modules-right": [
-			"sway/window"
-		],
-		"sway/window": {
-			"max-length": 128
-		}
 	}
+	// {
+	// 	// "layer": "top",
+	// 	"name": "alt",
+	// 	"output": "XMI Redmi 27 NU 3948622WH08F4",
+	// 	"modules-left": [
+	// 		"sway/workspaces"
+	// 	],
+	// 	"modules-right": [
+	// 		"sway/window"
+	// 	],
+	// 	"sway/window": {
+	// 		"max-length": 128
+	// 	}
+	// }
 ]
diff --git a/.zshrc b/.zshrc
index 41ff882..540b796 100644
--- a/.zshrc
+++ b/.zshrc
@@ -114,5 +114,5 @@ export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
 
 # local path
 export MANPATH="${MANPATH}:${HOME}/.local/share/man"
-export PATH="${PATH}:${HOME}/.local/bin:${HOME}/.scripts:${HOME}/.cache/go/bin:${HOME}/.local/share/nvim/mason/bin"
+export PATH="${PATH}:${HOME}/.local/bin:${HOME}/.scripts:${HOME}/.cache/go/bin:${HOME}/.cache/cargo/bin:${HOME}/.local/share/nvim/mason/bin"
 export PATH="/usr/lib/ccache/bin${PATH:+:}$PATH" # ccache support