From 7d23bbbb59daa40ad5ef5836fe3dd74350a9f793 Mon Sep 17 00:00:00 2001
From: Marco Thomas <rb.ma.tho@gmail.com>
Date: Thu, 28 Jul 2022 12:31:39 +0200
Subject: [PATCH] sway/waybar: visual update

---
 files/sway/.config/sway/config        | 16 ++++++++--------
 files/waybar/.config/waybar/config    | 26 ++++++++++++++------------
 files/waybar/.config/waybar/style.css |  6 +++---
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config
index 900a0eb..6305df4 100644
--- a/files/sway/.config/sway/config
+++ b/files/sway/.config/sway/config
@@ -109,13 +109,13 @@ input type:keyboard {
 
     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\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' -W 0.7 | xargs -d '\n' -r xdg-open
-    bindsym $mod+Ctrl+Backspace exec $lock_screen
+        printf "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now\nloginctl terminate-user marc"
+    #bindsym $mod+d exec dmenu_path | $bemenu -p 'run' | xargs swaymsg exec --
+    bindsym $mod+d exec rofi -show drun
+    #bindsym $mod+p exec $files | $bemenu -l 20 -p 'pdf' -W 0.7 | xargs -d '\n' -r xdg-open
+    bindsym $mod+p exec $files | rofi -dmenu -p '   PDF ' -i | xargs -d '\n' -r xdg-open
+    #bindsym $mod+Ctrl+Backspace exec $lock_screen | $bemenu -p "power" | xargs -d '\n' -r /bin/bash -c
+    bindsym $mod+Ctrl+Backspace exec $lock_screen | rofi -dmenu -p " ⏻  Power " | xargs -d '\n' -r /bin/bash -c
 
     # Screenshot
     bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy
@@ -222,7 +222,7 @@ input type:keyboard {
     for_window [class="discord"] move container to workspace number $ws3
     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 [class="Joplin"] move container to workspace number $ws5
     for_window [app_id="evolution"] move container to workspace number $ws8
     for_window [app_id="org.keepassxc.KeePassXC"] move container to workspace number $ws9
 
diff --git a/files/waybar/.config/waybar/config b/files/waybar/.config/waybar/config
index 7ca8376..ba2e49d 100644
--- a/files/waybar/.config/waybar/config
+++ b/files/waybar/.config/waybar/config
@@ -21,8 +21,6 @@
     "modules-center": [
     ],
     "modules-right": [
-        "temperature",
-        "cpu",
         "backlight",
         "battery",
         "pulseaudio",
@@ -47,7 +45,8 @@
 
     "backlight": {
         // "device": "acpi_video1",
-        "format": "{icon} {percent}%",
+        //"format": "{icon} {percent}%",
+        "format": "BRT\n{percent}%",
         "format-icons": ["", "", "", "", "", "", "", "", ""]
     },
 
@@ -58,10 +57,11 @@
             "critical": 15
         },
         // Connected to AC
-        //"format": "{icon}  {capacity}%", // Icon: bolt
-        "format": " {capacity}%", // Icon: bolt
+        //"format": " {capacity}%", // Icon: bolt
+        "format": "CHR\n{capacity}%", // Icon: bolt
         // Not connected to AC
-        "format-discharging": "{icon}  {capacity}%",
+        //"format-discharging": "{icon}  {capacity}%",
+        "format-discharging": "BAT\n{capacity}%",
         "format-icons": [
             "", // Icon: battery-full
             "", // Icon: battery-three-quarters
@@ -74,13 +74,13 @@
 
     "clock#time": {
         "interval": 5,
-        "format": "{:%I:%M}",
-        "tooltip": false
+        "format": "{:%I\n%M}",
+        "tooltip": false,
     },
 
     "clock#date": {
       "interval": 10,
-      "format": "{:%a %e}", // Icon: calendar-alt
+      "format": "{:%a\n%e}",
       "tooltip-format": "{:%A, %e %B %Y}"
     },
 
@@ -149,9 +149,11 @@
 
     "pulseaudio": {
         //"scroll-step": 1,
-        "format": "{icon} {volume}%",
-        "format-bluetooth": "{icon} {volume}% ",
-        "format-muted": "婢  0%",
+        //"format": "{icon} {volume}%",
+        "format": "VOL\n{volume}%",
+        //"format-bluetooth": "{icon} {volume}% ",
+        "format-bluetooth": "BLT\n{volume}% ",
+        "format-muted": "MUT\n 0%",
         "format-icons": {
             "headphones": "",
             "handsfree": "",
diff --git a/files/waybar/.config/waybar/style.css b/files/waybar/.config/waybar/style.css
index 05c359c..0914b00 100644
--- a/files/waybar/.config/waybar/style.css
+++ b/files/waybar/.config/waybar/style.css
@@ -187,7 +187,7 @@
 }
 
 #workspaces button.urgent:hover {
-    background-color: #b85551;
+    background-color: #ff5569;
 }
 
 /* remove weird GTK hover effect */
@@ -199,6 +199,6 @@
 }
 
 #workspaces button.focused:hover {
-    background: #75b259;
-    border: #73b259;
+    background: #a1b259;
+    border: #a1b259;
 }