fix(desktop): unfree CLI default, bar icon spacing, unified clock

Hardware findings on Latitude: nix-shell blocked unfree; whole-swap bars collided icon+percentage; clock needed calcurse + one module. - Export NIXPKGS_ALLOW_UNFREE=1 + ~/.config/nixpkgs/config.nix - Mono Nerd face + trailing spaces on battery/volume icons (all bars) - Single clock `HH:MM · Day DD Mon`; calcurse ships with waybar - V3 queue entries for laptop re-check Verification: V0 — nix flake check --no-build green; V2/V3 pending on session (user-visible bar + CLI unfree).
2026-07-10 12:58:37 +01:00
parent eb951569cf
commit d547393e7b
13 changed files with 143 additions and 130 deletions
--- a/themes/boreal/waybar.css
+++ b/themes/boreal/waybar.css
@@ -24,7 +24,9 @@
@define-color bad       #E2818A;

 * {
-  font-family: "GeistMono Nerd Font", "Symbols Nerd Font";
+  /* Mono Nerd face for status glyphs (tight right bearings on the
+     proportional Symbols face make icon+percentage collide). */
+  font-family: "GeistMono Nerd Font", "Symbols Nerd Font Mono";
  font-size: 13px;
  font-weight: 500;
  border: none;
@@ -85,13 +87,12 @@ window#waybar {
 }
 #custom-nomarchy:hover { color: @accentAlt; }

-/* ── Clock — mono digits align; date recedes to frost-grey ───────────*/
+/* ── Clock — unified time · date ─────────────────────────────────────*/
 #clock {
  color: @text;
  font-weight: 600;
  padding-left: 4px;
 }
-#clock.date { color: @subtext; font-weight: 500; }

 /* ── Workspaces — dots that bloom to an aurora pill when active ───────*/
 #workspaces { padding: 0 2px; }
--- a/themes/boreal/waybar.jsonc
+++ b/themes/boreal/waybar.jsonc
@@ -10,8 +10,7 @@
  "reload_style_on_change": true,
  "modules-left": [
    "custom/nomarchy",
-    "clock",
-    "clock#date"
+    "clock"
  ],
  "modules-center": [
    "hyprland/workspaces"
@@ -38,14 +37,10 @@
    "tooltip-format": "Nomarchy menu"
  },
  "clock": {
-    "format": "{:%H:%M}",
+    "format": "{:%H:%M  ·  %a %d %b}",
    "on-click": "nomarchy-calendar",
    "tooltip": true,
-    "tooltip-format": "{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
-  },
-  "clock#date": {
-    "format": "{:%a %d %b}",
-    "tooltip": false
+    "tooltip-format": "{:%A %d %B %Y}\n{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
  },
  "hyprland/workspaces": {
    "disable-scroll": true,
@@ -101,21 +96,21 @@
  },
  "pulseaudio": {
    "scroll-step": 5,
-    "format": "<span size='13pt'>{icon}</span>  {volume}%",
-    "format-bluetooth": "<span size='13pt'>{icon}</span>  {volume}%",
+    "format": "<span size='13pt'>{icon}</span>{volume}%",
+    "format-bluetooth": "<span size='13pt'>{icon} </span>{volume}%",
    "format-bluetooth-muted": " {icon}",
-    "format-muted": "<span size='13pt'></span> muted",
+    "format-muted": "<span size='13pt'> </span>muted",
    "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
+      "headphone": " ",
+      "hands-free": " ",
+      "headset": " ",
+      "phone": " ",
+      "portable": " ",
+      "car": " ",
      "default": [
-        "",
-        "",
-        ""
+        " ",
+        " ",
+        " "
      ]
    },
    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
@@ -128,15 +123,15 @@
      "warning": 25,
      "critical": 10
    },
-    "format": "<span size='13pt'>{icon}</span>  {capacity}%",
-    "format-charging": "<span size='13pt'></span> {capacity}%",
-    "format-plugged": "<span size='13pt'></span> {capacity}%",
+    "format": "<span size='13pt'>{icon}</span>{capacity}%",
+    "format-charging": "<span size='13pt'> </span>{capacity}%",
+    "format-plugged": "<span size='13pt'> </span>{capacity}%",
    "format-icons": [
-      "",
-      "",
-      "",
-      "",
-      ""
+      " ",
+      " ",
+      " ",
+      " ",
+      " "
    ],
    "on-click": "nomarchy-menu powermgmt",
    "tooltip-format": "Battery status"
--- a/themes/executive-slate/waybar.css
+++ b/themes/executive-slate/waybar.css
@@ -22,7 +22,9 @@
@define-color bad       #D06B71;

 * {
-  font-family: "Inter", "Symbols Nerd Font", "JetBrainsMono Nerd Font", sans-serif;
+  /* Mono Nerd face first for status glyphs: proportional "Symbols Nerd
+     Font" has tight right bearings that make icon+percentage collide. */
+  font-family: "Symbols Nerd Font Mono", "Inter", "JetBrainsMono Nerd Font", sans-serif;
  font-size: 13px;
  font-weight: 500;
  border: none;
@@ -114,10 +116,11 @@ window#waybar {
  border-bottom: 2px solid @bad;
 }

-/* ── Clock — time (center) and date (left) share the #clock id ───── */
+/* ── Clock — unified time · date in one module ───────────────────── */
 #clock {
  color: @text;
  font-weight: 600;
+  font-family: "Inter", "Symbols Nerd Font Mono", sans-serif;
 }

 /* ── Status cluster: neutral by default, semantic on state ───────── */
--- a/themes/executive-slate/waybar.jsonc
+++ b/themes/executive-slate/waybar.jsonc
@@ -10,8 +10,7 @@
  "reload_style_on_change": true,
  "modules-left": [
    "custom/nomarchy",
-    "hyprland/workspaces",
-    "clock#date"
+    "hyprland/workspaces"
  ],
  "modules-center": [
    "clock"
@@ -45,14 +44,10 @@
    "on-scroll-down": "hyprctl dispatch workspace r-1"
  },
  "clock": {
-    "format": "{:%H:%M}",
+    "format": "{:%H:%M  ·  %a %d %b}",
    "on-click": "nomarchy-calendar",
    "tooltip": true,
-    "tooltip-format": "{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
-  },
-  "clock#date": {
-    "format": "{:%a %d %b}",
-    "tooltip": false
+    "tooltip-format": "{:%A %d %B %Y}\n{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
  },
  "custom/recording": {
    "return-type": "json",
@@ -87,21 +82,21 @@
  },
  "pulseaudio": {
    "scroll-step": 5,
-    "format": "<span size='13pt'>{icon}</span>  {volume}%",
-    "format-bluetooth": "<span size='13pt'>{icon}</span>  {volume}%",
+    "format": "<span size='13pt'>{icon}</span>{volume}%",
+    "format-bluetooth": "<span size='13pt'>{icon} </span>{volume}%",
    "format-bluetooth-muted": " {icon}",
-    "format-muted": "<span size='13pt'></span> muted",
+    "format-muted": "<span size='13pt'> </span>muted",
    "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
+      "headphone": " ",
+      "hands-free": " ",
+      "headset": " ",
+      "phone": " ",
+      "portable": " ",
+      "car": " ",
      "default": [
-        "",
-        "",
-        ""
+        " ",
+        " ",
+        " "
      ]
    },
    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
@@ -120,15 +115,15 @@
      "warning": 25,
      "critical": 10
    },
-    "format": "<span size='13pt'>{icon}</span>  {capacity}%",
-    "format-charging": "<span size='13pt'></span> {capacity}%",
-    "format-plugged": "<span size='13pt'></span> {capacity}%",
+    "format": "<span size='13pt'>{icon}</span>{capacity}%",
+    "format-charging": "<span size='13pt'> </span>{capacity}%",
+    "format-plugged": "<span size='13pt'> </span>{capacity}%",
    "format-icons": [
-      "",
-      "",
-      "",
-      "",
-      ""
+      " ",
+      " ",
+      " ",
+      " ",
+      " "
    ],
    "on-click": "nomarchy-menu powermgmt",
    "tooltip-format": "Battery status"
--- a/themes/summer-day/waybar.css
+++ b/themes/summer-day/waybar.css
@@ -48,7 +48,6 @@ window#waybar {
 #custom-recording,
 #idle_inhibitor,
 #clock,
-#clock-date,
 #workspaces,
 #pulseaudio,
 #custom-powerprofile,
--- a/themes/summer-day/waybar.jsonc
+++ b/themes/summer-day/waybar.jsonc
@@ -9,7 +9,7 @@
  "spacing": 15,
  "reload_style_on_change": true,

-  "modules-left": ["custom/launcher", "clock", "clock#date"],
+  "modules-left": ["custom/launcher", "clock"],
  "modules-center": ["hyprland/workspaces"],
  "modules-right": ["custom/recording", "idle_inhibitor", "pulseaudio", "custom/powerprofile", "custom/nightlight", "hyprland/language", "custom/updates", "battery", "tray", "custom/vpn", "custom/doctor", "custom/notification", "custom/powermenu"],

@@ -37,18 +37,18 @@
  },

  "pulseaudio": {
-    "format": "<span size='13pt'>{icon}</span>  {volume}%",
-    "format-bluetooth": "<span size='13pt'>{icon} </span>  {volume}%",
+    "format": "<span size='13pt'>{icon}</span>{volume}%",
+    "format-bluetooth": "<span size='13pt'>{icon}  </span>{volume}%",
    "format-bluetooth-muted": "  muted",
-    "format-muted": "<span size='13pt'></span> muted",
+    "format-muted": "<span size='13pt'> </span>muted",
    "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
+      "headphone": " ",
+      "hands-free": " ",
+      "headset": " ",
+      "phone": " ",
+      "portable": " ",
+      "car": " ",
+      "default": [" ", " ", " "]
    },
    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
    "on-click-right": "pwvucontrol",
@@ -58,26 +58,21 @@
  "battery": {
    "interval": 60,
    "states": { "warning": 25, "critical": 10 },
-    "max-length": 10,
-    "format": "<span size='13pt'>{icon}</span>  {capacity}%",
-    "format-charging": "<span size='13pt'></span> {capacity}%",
-    "format-plugged": "<span size='13pt'></span> {capacity}%",
-    "format-full": " 100%",
-    "format-icons": ["", "", "", "", ""],
+    "max-length": 14,
+    "format": "<span size='13pt'>{icon}</span>{capacity}%",
+    "format-charging": "<span size='13pt'> </span>{capacity}%",
+    "format-plugged": "<span size='13pt'> </span>{capacity}%",
+    "format-full": "  100%",
+    "format-icons": [" ", " ", " ", " ", " "],
    "on-click": "nomarchy-menu powermgmt",
    "tooltip-format": "Battery status"
  },

  "clock": {
-    "format": " {:%H:%M}",
+    "format": " {:%H:%M  ·  %a %d %b}",
    "on-click": "nomarchy-calendar",
    "tooltip": true,
-    "tooltip-format": "{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
-  },
-
-  "clock#date": {
-    "format": " {:%A, %B %d, %Y}",
-    "tooltip": false
+    "tooltip-format": "{:%A %d %B %Y}\n{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
  },

  "tray": { "spacing": 8 },
--- a/themes/summer-night/waybar.css
+++ b/themes/summer-night/waybar.css
@@ -53,7 +53,6 @@ window#waybar {
 #custom-nomarchy,
 #custom-recording,
 #clock,
-#clock.date,
 #workspaces,
 #pulseaudio,
 #custom-powerprofile,
--- a/themes/summer-night/waybar.jsonc
+++ b/themes/summer-night/waybar.jsonc
@@ -9,7 +9,7 @@
  "spacing": 15,
  "reload_style_on_change": true,

-  "modules-left": ["custom/nomarchy", "clock", "clock#date"],
+  "modules-left": ["custom/nomarchy", "clock"],
  "modules-center": ["hyprland/workspaces"],
  "modules-right": ["custom/recording", "idle_inhibitor", "pulseaudio", "custom/powerprofile", "custom/nightlight", "hyprland/language", "custom/updates", "battery", "tray", "custom/vpn", "custom/doctor", "custom/notification", "custom/powermenu"],

@@ -38,18 +38,18 @@

  "pulseaudio": {
    "scroll-step": 5,
-    "format": "<span size='13pt'>{icon}</span>  {volume}%",
-    "format-bluetooth": "<span size='13pt'>{icon}</span>  {volume}%",
+    "format": "<span size='13pt'>{icon}</span>{volume}%",
+    "format-bluetooth": "<span size='13pt'>{icon} </span>{volume}%",
    "format-bluetooth-muted": " {icon}",
-    "format-muted": "<span size='13pt'></span> muted",
+    "format-muted": "<span size='13pt'> </span>muted",
    "format-icons": {
-      "headphone": "",
-      "hands-free": "",
-      "headset": "",
-      "phone": "",
-      "portable": "",
-      "car": "",
-      "default": ["", "", ""]
+      "headphone": " ",
+      "hands-free": " ",
+      "headset": " ",
+      "phone": " ",
+      "portable": " ",
+      "car": " ",
+      "default": [" ", " ", " "]
    },
    "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
    "on-click-right": "pwvucontrol",
@@ -59,24 +59,19 @@
  "battery": {
    "interval": 30,
    "states": { "warning": 25, "critical": 10 },
-    "format": "<span size='13pt'>{icon}</span>  {capacity}%",
-    "format-charging": "<span size='13pt'></span> {capacity}%",
-    "format-plugged": "<span size='13pt'></span> {capacity}%",
-    "format-icons": ["", "", "", "", ""],
+    "format": "<span size='13pt'>{icon}</span>{capacity}%",
+    "format-charging": "<span size='13pt'> </span>{capacity}%",
+    "format-plugged": "<span size='13pt'> </span>{capacity}%",
+    "format-icons": [" ", " ", " ", " ", " "],
    "on-click": "nomarchy-menu powermgmt",
    "tooltip-format": "Battery status"
  },

  "clock": {
-    "format": " {:%H:%M}",
+    "format": " {:%H:%M  ·  %a %d %b}",
    "on-click": "nomarchy-calendar",
    "tooltip": true,
-    "tooltip-format": "{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
-  },
-
-  "clock#date": {
-    "format": " {:%A, %B %d, %Y}",
-    "tooltip": false
+    "tooltip-format": "{:%A %d %B %Y}\n{:%Z (UTC%z)}\n<tt><small>{calendar}</small></tt>"
  },

  "tray": { "spacing": 8 },