Improve waybar

.config/kitty/fontawesome.generate.py

@@ -22,7 +22,7 @@ for icon, data in obj.items():
     points.append(ufmt)
 
 pointsfmt = ",".join(points)
-configline = "symbol_map {} Font Awesome 5 Pro".format(pointsfmt)
+configline = "symbol_map {} Font Awesome 5 Free".format(pointsfmt)
 
 pointsfmt_brands = ",".join(points_brands)
 configline_brands = "symbol_map {} Font Awesome 5 Brands".format(pointsfmt_brands)

.config/sway/work

@@ -32,8 +32,8 @@ for_window [instance="google-chrome" title="apps"] move container to workspace 1
 #
 # Shortcuts
 #
-bindsym XF86Favorites exec google-chrome --new-window $MICROSEC_DAILY
-bindsym $mod+Shift+Control+a exec google-chrome --new-window $MICROSEC_PAGES
+bindsym XF86Favorites exec google-chrome --password-store=gnome --new-window $MICROSEC_DAILY
+bindsym $mod+Shift+Control+a exec google-chrome --password-store=gnome --new-window $MICROSEC_PAGES
 
 #
 # Display controls:

.config/waybar/config

@@ -6,7 +6,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode", "custom/media", "sway/window"],
     "modules-center": [],
-    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "battery", "clock", "tray"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "sway/language", "battery", "clock", "tray"],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -23,9 +23,25 @@
     //         "default": ""
     //     }
     // },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{icon} {name}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
+    "sway/scratchpad": {
+        "format": "{icon} {count}",
+        "show-empty": false,
+        "format-icons": ["", ""],
+        "tooltip": true,
+        "tooltip-format": "{app}: {title}"
+    },
     "mpd": {
         "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
         "format-disconnected": "Disconnected ",
@@ -66,30 +82,31 @@
     "clock": {
         // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B %e}</big>\n<tt><small>{calendar}</small></tt>",
-		"format": "{:%H:%M}",
-        "format-alt": "{:%Y-%m-%d %H:%M}"
+        "format": "{:%Y-%m-%d %H:%M}",
+        "format-alt": "{:%H:%M}"
     },
     "cpu": {
-        "format": "{usage}% ",
+        "format": " {usage}%",
         "format-alt": "{usage}%"
     },
     "memory": {
-        "format": "{}% ",
+        "tooltip-format": "Free: {avail}Gi\nUsed: {used}Gi/{total}Gi\nSwap Free: {swapAvail}Gi\nSwap Used: {swapUsed}Gi/{swapTotal}Gi",
+        "format": " {}%",
         "format-alt": "{}%"
     },
     "temperature": {
         // "thermal-zone": 2,
         // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
-        "critical-threshold": 75,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C {icon}",
-        "format-icons": ["", "", ""],
-        "format-alt": "{temperatureC}°C"
+        "critical-threshold": 80,
+        // "format-critical": "{icon} {temperatureC}",
+        "format": "{icon} {temperatureC}",
+        "format-icons": ["", "", "", "", "", "", "", "", "", ""],
+        "format-alt": "{temperatureC}"
     },
     "backlight": {
         // "device": "acpi_video1",
-        "format": "{percent}% {icon}",
-        "format-icons": ["", ""]
+        "format": "{icon} {percent}%",
+        "format-icons": ["", ""]
     },
     "battery": {
         "states": {
@@ -97,10 +114,10 @@
             "warning": 30,
             "critical": 15
         },
-        "format": "{capacity}% {icon}",
-        "format-charging": "{capacity}% ",
-        "format-plugged": "{capacity}% ",
-        "format-alt": "{time} {icon}",
+        "format": "{icon} {capacity}%",
+        "format-charging": " {capacity}%",
+        "format-plugged": " {capacity}%",
+        "format-alt": "{icon} {time}",
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
         "format-icons": ["", "", "", "", ""]
@@ -109,26 +126,22 @@
         "bat": "BAT2"
     },
     "network": {
-        // "interface": "wlp2*", // (Optional) To force the use of this interface
-        //"format-wifi": "{essid} ({signalStrength}%) ",
-        //"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
-        //"format-linked": "{ifname} (No IP) ",
-        //"format-disconnected": "Disconnected ⚠",
-        "format-wifi": "{essid} ({signalStrength}%)",
-        "format-ethernet": "{ipaddr}/{cidr}",
-        "format-linked": "{ifname} (No IP)",
-        "format-disconnected": "⚠",
-        "format-alt": "{ipaddr}",
-		"tooltip-format": "{ifname}: {ipaddr}/{cidr}"
+        "format-wifi": " {signalStrength}%",
+        "format-ethernet": "",
+        "format-linked": " (No IP)",
+        "format-disconnected": "",
+        "format-alt": "<small>{ipaddr}/{cidr}</small> {bandwidthUpBits} {bandwidthDownBits}",
+        "tooltip-format": "{ifname}: {ipaddr}/{cidr} via {gwaddr}"
     },
     "pulseaudio": {
         "scroll-step": 1, // %, can be a float
-        "format": "{volume}% {icon} {format_source}",
-        "format-bluetooth": "{volume}% {icon}  {format_source}",
-        "format-bluetooth-muted": " {icon}  {format_source}",
-        "format-muted": "muted  {format_source}",
-        "format-source": "",
-        "format-source-muted": "",
+		"tooltip-format": "Output: {desc} {volume}\nSource: {source_desc} {source_volume}",
+        "format": "{icon} {volume}% {format_source}",
+        "format-bluetooth": "{icon} {volume}% {format_source}",
+        "format-bluetooth-muted": "{icon}  {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "",
+        "format-source-muted": "",
         "format-icons": {
             "headphone": "",
             "hands-free": "",
@@ -149,7 +162,7 @@
             "default": "🎜"
         },
         "escape": true,
-        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
-        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+		// Script in resources folder
+        "exec": "/usr/bin/python3 $HOME/.config/waybar/mediaplayer.py 2> /dev/null"
     }
 }

.config/yadm/bootstrap

@@ -473,7 +473,7 @@ if $desktopbase && $desktop; then
 
 	case $ID in
 		alpine|fedora) packages_add mako;;
-		debian|ubuntu) packages_add mako-notifier;;
+		debian|ubuntu) packages_add mako-notifier libappindicator3-1 gir1.2-playerctl-2.0;;
 	esac
 
 	case $ID in

.dockerignore

@@ -42,8 +42,7 @@
 !.config/waybar
 !.config/wofi
 !.config/yabai
-!.config/yadm/*
-.config/yadm/repo.git
+!.config/yadm
 .deno/bin
 .docker/.buildNodeID
 .docker/.token_seed*

.gitignore

@@ -42,8 +42,7 @@
 !.config/waybar
 !.config/wofi
 !.config/yabai
-!.config/yadm/*
-.config/yadm/repo.git
+!.config/yadm
 .deno/bin
 .docker/.buildNodeID
 .docker/.token_seed*

.zshrc

@@ -536,7 +536,7 @@ function theme {
 			iterm_profile=Light
 			kitty_theme=${kitty_variation}light
 			export LIGHT=true
-			echo "LIGHT=true" > ~/.zshrc-theme
+			echo "export LIGHT=true" > ~/.zshrc-theme
 			gnome_theme=Adwaita
 			macos_theme=false
 		;;
@@ -544,7 +544,7 @@ function theme {
 			iterm_profile=Default
 			kitty_theme=${kitty_variation}dark
 			export LIGHT=false
-			echo "LIGHT=false" > ~/.zshrc-theme
+			echo "export LIGHT=false" > ~/.zshrc-theme
 			gnome_theme=Adwaita-dark
 			macos_theme=true
 		;;