From adc650ace3b0f8fd6ebe80be0a42361634b47256 Mon Sep 17 00:00:00 2001
From: Marco Thomas <rb.ma.tho@gmail.com>
Date: Fri, 22 Jul 2022 20:29:53 +0200
Subject: [PATCH] sway/waybar: fix colors after f36 upgrade

---
 README.md                                     |  4 ++++
 .../alacritty/.config/alacritty/alacritty.yml |  2 +-
 files/sway/.config/sway/config                | 24 +++++++++----------
 files/waybar/.config/waybar/config            |  4 +---
 files/waybar/.config/waybar/style.css         | 12 ++++++----
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 1638f51..d5badd8 100644
--- a/README.md
+++ b/README.md
@@ -23,3 +23,7 @@ SFMono also provides icons.
 + `fd` (rust find)
 + `fu` (find icons)
 + all `fcitx5` stuff (data, gtk, qt, mozc)
+
+### GTK theming stuff
++ icons: `Flat-Remix-Blue-Light-darkPanel`
++ theme: `Flat-Remix-GTK-Blue-Light-solid`
diff --git a/files/alacritty/.config/alacritty/alacritty.yml b/files/alacritty/.config/alacritty/alacritty.yml
index ca1cd30..2b66ef6 100644
--- a/files/alacritty/.config/alacritty/alacritty.yml
+++ b/files/alacritty/.config/alacritty/alacritty.yml
@@ -11,7 +11,7 @@ font:
     style: Bold
 
   italic:
-    family: SF Mono Nerd Font
+    family: SFMono Nerd Font
     style: Italic
 
   size: 11.0
diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config
index eda985b..de4d157 100644
--- a/files/sway/.config/sway/config
+++ b/files/sway/.config/sway/config
@@ -13,14 +13,14 @@ set $right l
 
 # Color
 # old solarized
-set $yellow	#b58900
-set $orange	#cb4b16
-set $red	#dc322f
-set $magenta	#d33682
-set $violet	#6c71c4
-set $blue	#268bd2
-set $cyan	#2aa198
-set $green	#859900
+set $yellow  #b58900
+set $orange  #cb4b16
+set $red     #dc322f
+set $magenta #d33682
+set $violet  #6c71c4
+set $blue    #268bd2
+set $cyan    #2aa198
+set $green   #859900
 
 set $baseA3 #fdf6e3
 set $baseA2 #eee8d5
@@ -105,16 +105,16 @@ input type:keyboard {
         --tb "#282828" \
         --hf "#ffffff" \
         --hb "#393939" \
-        --fn "SFMono Nerd Font 13" -i -H 25 -W 0.35
+        --fn "SFMono Nerd Font 13" -i -H 25 -W 0.5
 
     set $files fd -I "pdf$" $HOME | cut -f 4- -d "/"
     set $lock_screen \
         printf \
-            "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now" \
+            "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now\nloginctl terminate-user marc" \
         | $bemenu -p "power" \
         | xargs -d '\n' -r /bin/bash -c
     bindsym $mod+d exec dmenu_path | $bemenu -p 'run' | xargs swaymsg exec --
-    bindsym $mod+p exec $files | $bemenu -l 20 -p 'pdf' | xargs -d '\n' -r xdg-open
+    bindsym $mod+p exec $files | $bemenu -l 20 -p 'pdf' -W 0.7 | xargs -d '\n' -r xdg-open
     bindsym $mod+Ctrl+Backspace exec $lock_screen
 
     # Screenshot
@@ -223,7 +223,7 @@ input type:keyboard {
     for_window [app_id="org.telegram.desktop"] move container to workspace number $ws3
     for_window [class="Spotify"] move container to workspace number $ws4
     for_window [app_id="Joplin"] move container to workspace number $ws5
-    for_window [app_id="geary"] move container to workspace number $ws8
+    for_window [app_id="evolution"] move container to workspace number $ws8
     for_window [app_id="org.keepassxc.KeePassXC"] move container to workspace number $ws9
 
 # Status Bar
diff --git a/files/waybar/.config/waybar/config b/files/waybar/.config/waybar/config
index 95a454b..7ca8376 100644
--- a/files/waybar/.config/waybar/config
+++ b/files/waybar/.config/waybar/config
@@ -15,9 +15,6 @@
 
     "position": "left",
 
-    // If height property would be not present, it'd be calculated dynamically
-    "height": 37,
-
     "modules-left": [
         "sway/workspaces"
     ],
@@ -131,6 +128,7 @@
     "sway/workspaces": {
         "all-outputs": false,
         "disable-scroll": false,
+        "disable-scroll-wraparound": true,
         "format": "{icon}",
         "format-icons": {
             "1": "一",
diff --git a/files/waybar/.config/waybar/style.css b/files/waybar/.config/waybar/style.css
index c34dc61..05c359c 100644
--- a/files/waybar/.config/waybar/style.css
+++ b/files/waybar/.config/waybar/style.css
@@ -186,15 +186,19 @@
     background-color: #f85551;
 }
 
+#workspaces button.urgent:hover {
+    background-color: #b85551;
+}
+
 /* remove weird GTK hover effect */
 #workspaces button:hover {
     box-shadow: inherit;
     text-shadow: inherit;
-    background: #282828;
-    border: #282828;
+    background: #383838;
+    border: #383838;
 }
 
 #workspaces button.focused:hover {
-    background: #93b259;
-    border: #93b259;
+    background: #75b259;
+    border: #73b259;
 }