Merge commit '22dc26387366673f1178bf7dac3c3b1fe0b3417a'

Conflicts:
	sway/behaviours

bash/bash_aliases

@@ -33,7 +33,7 @@ alias startsway="${HOME}/scripts/sway/startsway.sh"
 alias starti3="${HOME}/scripts/i3/starti3.sh"
 
 # Web shortcuts
-alias papillon="/usr/bin/chromium --app='https://papillon.john.me.tz/hud.php?refresh=3600&theme=dark'"
+alias papillon="flatpak run com.github.Eloston.UngoogledChromium --app='https://papillon.john.me.tz/hud.php?refresh=3600&theme=dark'"
 
 # Force python3
 alias pip="pip3"

bash/bash_login

@@ -25,7 +25,7 @@ export LC_ALL="en_US.UTF-8"
 export XDG_DATA_HOME="${HOME}/.config"
 
 # GUI themes
-export GTK_THEME="Oled"
+export GTK_THEME="Flat-Remix-GTK-Blue-Darkest-Solid-NoBorder"
 export PROFILE_NAME="Oled"
 export QT_QPA_PLATFORMTHEME="qt5ct"
 export QT_QPA_PLATFORM="wayland-egl;wayland;xcb"

sway/behaviours

@@ -22,8 +22,9 @@ assign [app_id="com.github.gittyup.Gittyup"] 9
 # Floating windows
 ################################################################################
 
-for_window [shell="xdg_shell"] floating enable # Picture-in-picture firefox
+for_window [title="Picture-in-Picture"] floating enable # Picture-in-picture firefox
 # Also make Picture-in-picture windows stick to active workspace
+for_window [title="Picture-in-Picture"] sticky enable
 for_window [shell="xdg_shell"] sticky enable # Picture-in-picture firefox
 for_window [instance="Download"] floating enable
 for_window [window_role="plugin_ui"] floating enable

sway/config

@@ -43,7 +43,7 @@ seat seat0 xcursor_theme FlatbedCursors-Blue
 
 # Minimize borders from all windows
 hide_edge_borders none
-default_floating_border normal 1
+default_floating_border none
 default_border pixel 1
 
 # Font only visible in tabbed mode. Also inheritted by bar.

waybar/config.template

@@ -22,87 +22,9 @@
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
     },
-},{
-    // LAUNCHER
-    "name": "launcher",
-    "output": __OUTPUT__,
-    "ipc": true,
-    "id": "bar-1",
-    "mode": "hide",
-    "hidden_state": "hide",
-    "layer": "top", // Waybar at top layer
-    "position": "bottom", // Waybar position (top|bottom|left|right)
-    "margin-left": 20,
-    "margin-right": 20,
-    "margin-bottom": 20,
-    "modules-left": ["custom/launcher"],
-    "modules-center": [],
-    "modules-right": ["tray", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "idle_inhibitor", "custom/clock", "custom/power"],
-    // Modules configuration
-    "custom/launcher": {
-        "format": "",
-        "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else rofi -config ${HOME}/.config/rofi/config.rasi -show drun -lines 20; fi"
-    },
-    //"mpd": {
-        //"server": "10.10.0.66",
-	//"port": 6600,
-	//"interval": 10,
-	//"timeout": 30,
-	//"unknown-tag": "⚠",
-	//"format": "▶️{title}",
-	//"format-paused": "⏸️{title}",
-	//"format-stopped": "⏹️ mpd",
-	//"format-disconnected": "⚠ mpd",
-        //"on-click": "${HOME}/scripts/waybar/waybar-mpd.sh"
-    //},
-    "tray": {
-        "icon-size": 28,
-        "spacing": 10
-    },
-    "custom/todo": {
-        "format": "🗈",
-        "on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
-	"tooltip": false
-    },
-    "custom/osk": {
-        "format": "⌨",
-        "on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh",
-	"tooltip": false
-    },
-    "custom/pkg": {
-        "interval": 60,
-	"tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>",
-        "on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
-	"return-type": "json",
-        "exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar"
-    },
-    "custom/bar": {
-        "format": "",
-	"tooltip": false,
-	"on-click": "${HOME}/scripts/waybar/toggle.sh"
-    },
-    "idle_inhibitor": {
-        "format": "{icon}",
-        "format-icons": {
-            "activated": "",
-            "deactivated": ""
-        },
-	"on-click": "echo {status} > .config/idle_inhibitor"
-    },
-    "custom/clock": {
-        "interval": 60,
-	"tooltip": true,
-        "on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php",
-	"return-type": "json",
-        "exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'"
-    },
-    "custom/power": {
-        "format": "\u23FB",
-        "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else ${HOME}/scripts/rofi/rofi-power-menu.sh; fi"
-    },
 },
 {
-    "name": "status",
+    "name": "bar",
     "output": __OUTPUT__,
     "ipc": true,
     "id": "bar-1",
@@ -116,7 +38,7 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces"],
     "modules-center": [],
-    "modules-right": ["custom/weather", "network", "network#wireguard", "cpu", "memory", "custom/disk", "temperature", "backlight", "custom/battery", "pulseaudio"],
+    "modules-right": ["custom/weather", "network", "network#wireguard", "cpu", "memory", "custom/disk", "temperature", "backlight", "custom/battery", "pulseaudio","tray", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "idle_inhibitor", "custom/clock", "custom/power"],
     // Modules configuration
     "sway/workspaces": {
         // "disable-scroll": true,
@@ -171,7 +93,7 @@
     "network": {
         // "interface": "wlp58s0", // (Optional) To force the use of this interface
 	"interval": 10,
-	"tooltip": "{ipaddr}",
+	"tooltip-format": "{essid} {ipaddr}",
         "format-ethernet": "",
         "format-wifi": "",
         "format-disconnected": "⛖",
@@ -181,6 +103,7 @@
     "network#wireguard": {
 	"interval": 10,
         "interface": "wg0", // (Optional) To force the use of this interface
+	"tooltip-format": "{ifname} {ipaddr}",
         "tooltip": "{ipaddr}",
         "format": "⚿",
         "format-disconnected": "⚿",
@@ -235,4 +158,55 @@
         },
         "on-click": "${HOME}/scripts/waybar/waybar-audio.sh"
     },
+    "tray": {
+        "icon-size": 24,
+        "spacing": 0
+    },
+    "custom/todo": {
+        "format": "🗈",
+        "on-click": "${HOME}/scripts/waybar/waybar-todo.sh",
+	"tooltip": false
+    },
+    "custom/osk": {
+        "format": "⌨",
+        "on-click": "${HOME}/scripts/waybar/waybar-keyboard.sh",
+	"tooltip": false
+    },
+    "custom/pkg": {
+        "interval": 60,
+	"tooltip-format": "<span font='Anonymous Pro 12'><big>{:%d %B}</big>\n<tt><small>{calendar}</small></tt></span>",
+        "on-click": "${HOME}/scripts/waybar/waybar-pkg.sh upgrade",
+	"return-type": "json",
+        "exec": "${HOME}/scripts/waybar/waybar-pkg.sh bar"
+    },
+    "custom/bar": {
+        "format": "\u200a",
+	"tooltip": false,
+	"on-click": "${HOME}/scripts/waybar/toggle.sh"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        },
+	"on-click": "echo {status} > .config/idle_inhibitor"
+    },
+    "custom/gammastep": {
+        "interval": 1,
+	"return-type": "json",
+        "exec": "${HOME}/scripts/waybar/waybar-gammastep.sh",
+	"on-click": "${HOME}/scripts/waybar/waybar-gammastep.sh toggle"
+    },
+    "custom/clock": {
+        "interval": 60,
+	"tooltip": true,
+        "on-click": "${HOME}/.local/bin/firefox/firefox-bin https://papillon.john.me.tz/calendar.php",
+	"return-type": "json",
+        "exec": "echo '{\"class\": \"clock\", \"text\": \"'$(date '+%H:%M')'\", \"tooltip\": \"'$(date '+%A, %B %d, %Y | %Y-%m-%d')'\"}'"
+    },
+    "custom/power": {
+        "format": "\u23FB",
+        "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else ${HOME}/scripts/rofi/rofi-power-menu.sh; fi"
+    },
 }]

waybar/style.css

@@ -24,6 +24,7 @@
  * yellow
  * blue
  * purple
+ * orange
  * aqua
  * redhi
  * greenhi
@@ -40,33 +41,34 @@
 
 * {
     font-family: "Anonymous Pro", "Font Awesome 5 Brands", "Font Awesome 5 Free", Monospace;
-    font-size: 24px;
+    font-size: 20px;
     min-height: 0;
 }
 
 window#waybar.window {
-    font-size: 12px;
+    font-size: 20px;
 }
 
 window#waybar {
+    margin: -5px;
     border-radius: 30px;
     border: solid 2px @fg;
-    font-size: 12px;
+    font-size: 20px;
     background-color: @bg;
     animation-name: fadeIn;
     animation-duration: 1s;
     color: @fg;
 }
 
-#window, #custom-launcher, #workspaces, #mode, #mpd, #network, #cpu, #memory, #custom-disk, #temperature, #backlight, #custom-battery, #pulseaudio, #custom-clock, #tray, #custom-todo, #custom-osk, #idle_inhibitor, #custom-power, #custom-weather {
+#window, #workspaces, #mode, #mpd, #network, #cpu, #memory, #custom-disk, #temperature, #backlight, #custom-battery, #pulseaudio, #custom-clock, #tray, #custom-todo, #custom-osk, #idle_inhibitor, #custom-power, #custom-weather {
     color: @grey06;
-    padding: 0 5px;
+    padding: 0 3px;
     margin: 0px;
 }
 
 /* Tray */
 
-#tray, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #idle_inhibitor, #custom-clock, #custom-power {
+#tray, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-gammastep, #idle_inhibitor, #custom-clock, #custom-power {
     color: @bluehi;
 }
 
@@ -76,14 +78,7 @@ window#waybar {
 }
 
 #window {
-    padding: 10px;
+    padding: 5px;
-}
-
-/* Start Launcher */
-
-#custom-launcher {
-    margin-left: 15px;
-    color: @fg;
 }
 
 /* Workspaces */
@@ -133,12 +128,13 @@ window#waybar {
 
 #network {
     color: @blue;
-    margin-right: -8px;
+    font-size: 24px;
+    margin-right: -4px;
 }
 
 #network.wireguard {
     padding: 0px;
-    margin-right: 0px;
+    margin-right: 4px;
 }
 
 #network.disconnected {
@@ -190,7 +186,7 @@ window#waybar {
 /* Battery */
 
 #custom-battery {
-    color: @yellow;
+    color: @green;
 }
 
 #custom-battery.charging {
@@ -198,6 +194,10 @@ window#waybar {
 }
 
 #custom-battery.discharging {
+    color: @yellow;
+}
+
+#custom-battery.low {
     color: @orange;
 }
 
@@ -213,7 +213,6 @@ window#waybar {
 /* Pulseaudio */
 
 #pulseaudio {
-    margin-right: 15px;
     color: @bluehi;
 }
 
@@ -221,10 +220,10 @@ window#waybar {
     color: @grey06;
 }
 
-/* Clock */
+/* Tray */
 
-#custom-clock {
+#tray {
-    color: @fg;
+        margin-right: 3px;
 }
 
 /* Todo-txt */
@@ -232,9 +231,17 @@ window#waybar {
 #custom-todo {
     font-size: 40px;
     margin-top: -13px;
-    margin-bottom: -10px;
+    margin-bottom: -9px;
     margin-left: -8px;
-    margin-right: -8px;
+    margin-right: -6px;
+}
+
+/* On-Screen Keyboard */
+
+#custom-osk {
+    font-size: 40px;
+    margin-top: -13px;
+    margin-bottom: -15px;
 }
 
 /* Package upgrades */
@@ -243,12 +250,25 @@ window#waybar {
     margin-bottom: -3px;
 }
 
-/* On-Screen Keyboard */
+#custom-pkg.updateable {
+        color: @orange;
+}
 
-#custom-osk {
+/* Bar locker */
-    font-size: 50px;
+
-    margin-top: -13px;
+#custom-bar {
-    margin-bottom: -15px;
+    padding: 3px;
+    margin-top: -10px;
+}
+
+/* Gammastep */
+
+#custom-gammastep {
+    margin-top: -5px;
+}
+
+#custom-gammastep.enabled {
+        color: #fefefe;
 }
 
 /* Idle Inhibitor */
@@ -258,10 +278,16 @@ window#waybar {
     color: @white;
 }
 
+/* Clock */
+
+#custom-clock {
+    color: @fg;
+}
+
 /* Power button */
 
 #custom-power {
-    margin-right: 15px;
+    margin-right: 8px;
     margin-top: 8px;
     color: @red;
 }