further configure hyprland

2025-09-07 20:17:11 +02:00
parent 465634d8bf
commit ee6855f2ce
13 changed files with 352 additions and 2496 deletions
--- a/roles/hyprland/files/waybar/config.jsonc
+++ b/roles/hyprland/files/waybar/config.jsonc
@ -2,13 +2,17 @@
 	"layer": "top",
 	"position": "top",

+	"exclusive": true,        // keep the gap reserved
+	"margin-top": 8,          // gap from the top edge
+	"margin-left": 10,        // gap from the left edge
+	"margin-right": 10,       // gap from the right edge
+	"margin-bottom": 0,
+
 	/* order: 1-2-3 | window-title | tray + clock */
 	"modules-left":   [ "custom/page1", "custom/page2", "custom/page3", "custom/page4","custom/page5","custom/page6","custom/page7","custom/page8","custom/page9","custom/page10"],
 	"modules-center": [ "hyprland/window" ],
 	"modules-right": [ "tray", "custom/separator", "network", "bluetooth", "custom/separator", "disk", "cpu", "memory", "pulseaudio", "custom/separator", "clock"],

-
-	/* three persistent “page” buttons */
 	"custom/page1": {
 		"exec": "~/.config/waybar/scripts/page.sh 1",
 		"exec-persistent": true,
--- a/roles/hyprland/files/waybar/nohup.out
+++ b/roles/hyprland/files/waybar/nohup.out
--- a/roles/hyprland/files/waybar/scripts/page.sh
+++ b/roles/hyprland/files/waybar/scripts/page.sh
@ -1,13 +1,10 @@
 #!/usr/bin/env bash
 # page.sh 1‒10 – Waybar “page” indicator
-# deps: socat, awk • (still no jq)
+# deps: socat, awk, sed, grep

-page=$1                               # this script instance’s page (1‒10)
-
-# ── icon lookup table ────────────────────────────────────────────
+page=$1
 icons=( "" "" "" "" "" "" "" "" "" "" "󰝚" )

-# map numeric workspace → page (1‒10)
 to_page() {
  (( $1 <=  3 )) && echo 1 && return
  (( $1 <=  6 )) && echo 2 && return
@ -21,21 +18,26 @@ to_page() {
  echo 10
 }

-# does THIS page contain at least one window?
+# Return 0 if THIS page has at least one window, else 1
 is_occupied() {
-  while read -r ws_id; do
-    (( $(to_page "$ws_id") == page )) && return 0
-  done < <(hyprctl clients | awk '/workspace:/ {print $2}')
+  # Get workspace id + windows count pairs from JSON
+  # Example snippets: {"id":1,"windows":3, ...}
+  while read -r id windows; do
+    (( $(to_page "$id") == page )) && (( windows > 0 )) && return 0
+  done < <(
+    hyprctl -j workspaces \
+      | grep -o '"id":[0-9]\+|"windows":[0-9]\+' \
+      | sed -n 'N;s/"id":\([0-9]\+\)\n"windows":\([0-9]\+\)/\1 \2/p'
+  )
  return 1
 }

 emit() {
  local classes=()
-
-  if (( $1 == page )); then        # ← is THIS instance the active page?
-    classes+=(active)              #    yes → mark it only “active”
+  if (( $1 == page )); then
+    classes+=(active)
  else
-    is_occupied && classes+=(occupied)   #    no  → maybe “occupied”
+    is_occupied && classes+=(occupied)
  fi

  if ((${#classes[@]})); then
@ -46,18 +48,16 @@ emit() {
  fi
 }

-# ── initial state ────────────────────────────────────────────────
+# Initial state
 active_ws=$(hyprctl activeworkspace | awk '/^ID /{print $2}')
 current_page=$(to_page "${active_ws:-1}")
 emit "$current_page"
 current_occ=$(is_occupied && echo 1 || echo 0)

-# ── live updates via Hyprland socket2 ───────────────────────────
+# Live updates
 socket="$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock"
 socat -U - UNIX-CONNECT:"$socket" | while read -r line; do
-  [[ $line =~ ^(workspace|openwindow|closewindow) ]] || continue
-
-  # recompute state if anything relevant changed
+  [[ $line =~ ^(workspace|openwindow|closewindow|movewindow) ]] || continue
  if [[ $line == workspace* ]]; then
    ws=${line#*>>}; ws=${ws%% *}
    new_page=$(to_page "$ws")
@ -65,8 +65,6 @@ socat -U - UNIX-CONNECT:"$socket" | while read -r line; do
    new_page=$current_page
  fi
  new_occ=$(is_occupied && echo 1 || echo 0)
-
-  # update Waybar only when something actually changed
  if (( new_page != current_page || new_occ != current_occ )); then
    emit "$new_page"
    current_page=$new_page
@ -74,3 +72,79 @@ socat -U - UNIX-CONNECT:"$socket" | while read -r line; do
  fi
 done

+
+# # page.sh 1‒10 – Waybar “page” indicator
+# # deps: socat, awk • (still no jq)
+#
+# page=$1                               # this script instance’s page (1‒10)
+#
+# # ── icon lookup table ────────────────────────────────────────────
+# icons=( "" "" "" "" "" "" "" "" "" "" "󰝚" )
+#
+# # map numeric workspace → page (1‒10)
+# to_page() {
+#   (( $1 <=  3 )) && echo 1 && return
+#   (( $1 <=  6 )) && echo 2 && return
+#   (( $1 <=  9 )) && echo 3 && return
+#   (( $1 <= 12 )) && echo 4 && return
+#   (( $1 <= 15 )) && echo 5 && return
+#   (( $1 <= 18 )) && echo 6 && return
+#   (( $1 <= 21 )) && echo 7 && return
+#   (( $1 <= 24 )) && echo 8 && return
+#   (( $1 <= 27 )) && echo 9 && return
+#   echo 10
+# }
+#
+# # does THIS page contain at least one window?
+# is_occupied() {
+#   while read -r ws_id; do
+#     (( $(to_page "$ws_id") == page )) && return 0
+#   done < <(hyprctl clients | awk '/workspace:/ {print $2}')
+#   return 1
+# }
+#
+# emit() {
+#   local classes=()
+#
+#   if (( $1 == page )); then        # ← is THIS instance the active page?
+#     classes+=(active)              #    yes → mark it only “active”
+#   else
+#     is_occupied && classes+=(occupied)   #    no  → maybe “occupied”
+#   fi
+#
+#   if ((${#classes[@]})); then
+#     printf '{"text":"%s","class":"%s"}\n' \
+#            "${icons[page]}" "$(IFS=' '; echo "${classes[*]}")"
+#   else
+#     printf '{"text":"%s"}\n' "${icons[page]}"
+#   fi
+# }
+#
+# # ── initial state ────────────────────────────────────────────────
+# active_ws=$(hyprctl activeworkspace | awk '/^ID /{print $2}')
+# current_page=$(to_page "${active_ws:-1}")
+# emit "$current_page"
+# current_occ=$(is_occupied && echo 1 || echo 0)
+#
+# # ── live updates via Hyprland socket2 ───────────────────────────
+# socket="$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock"
+# socat -U - UNIX-CONNECT:"$socket" | while read -r line; do
+#   [[ $line =~ ^(workspace|openwindow|closewindow) ]] || continue
+#
+#   # recompute state if anything relevant changed
+#   if [[ $line == workspace* ]]; then
+#     ws=${line#*>>}; ws=${ws%% *}
+#     new_page=$(to_page "$ws")
+#   else
+#     new_page=$current_page
+#   fi
+#   new_occ=$(is_occupied && echo 1 || echo 0)
+#
+#   # update Waybar only when something actually changed
+#   if (( new_page != current_page || new_occ != current_occ )); then
+#     emit "$new_page"
+#     current_page=$new_page
+#     current_occ=$new_occ
+#   fi
+# done
+#
--- a/roles/hyprland/files/waybar/style.css
+++ b/roles/hyprland/files/waybar/style.css
@ -1,91 +1,134 @@
-/* --- GENERAL BAR STYLE (unchanged) --- */
+/* ==== Waybar GTK CSS: Cosmic glass (v2 lighter) ================= */
+
+/* Palette */
+@define-color glass         rgba(12, 14, 20, 0.34);   /* was 0.62 → much more transparent */
+@define-color glass_strong  rgba(12, 14, 20, 0.46);   /* chips / active */
+@define-color fg            #DDE1EA;
+@define-color fg_dim        #B8BECC;
+@define-color accent1       #7F5AF0;
+@define-color accent2       #00D1FF;
+
+/* Whole bar: more vertical padding, no border, stronger shadow */
+window#waybar {
+  background: @glass;
+  color: @fg;
+  border-radius: 12px;
+  margin: 6px 8px;
+  border: none;                         /* ← removed border */
+  box-shadow: 0 10px 34px rgba(0,0,0,0.34);
+  -gtk-outline-radius: 12px;
+}
+
+/* Global typography: Roboto Mono Nerd Font */
 * {
  border: none;
-  /* padding: 0 6px; */
-  padding: 0 6px;
-  margin-top: 2px;
-  font-family: "JetBrains Mono", monospace;
+  padding: 2px 6px;
+  margin-top: 0;
+  font-family: "RobotoMono Nerd Font", "Roboto Mono Nerd Font", "RobotoMono NF", monospace;
  font-size: 14px;
+  font-weight: 500;
 }
-window#waybar { background: transparent; color: #ffffff; }

-/* --- PAGE BUTTONS --- */
-/* IDs are #custom-page1, #custom-page2, #custom-page3            */
-#custom-page1, #custom-page2, #custom-page3, #custom-page4, #custom-page5, #custom-page6, #custom-page7, #custom-page8, #custom-page9, #custom-page10 {
+/* Keep groups transparent */
+#modules-left, #modules-center, #modules-right { background: transparent; }
+
+/* Common modules stay transparent; compact rounded hit area */
+#tray, #window, #clock, #cpu, #memory, #disk, #network, #bluetooth, #pulseaudio {
  background: transparent;
-  min-width: 18px;                  /* keeps them evenly spaced */
-	padding-left: 2px;
-	color: #fff;
-  /* text-align: center; */
-}
-#custom-page1.active,
-#custom-page2.active,
-#custom-page3.active,
-#custom-page4.active,
-#custom-page5.active,
-#custom-page6.active,
-#custom-page7.active,
-#custom-page8.active,
-#custom-page9.active,
-#custom-page10.active
-{
-  background: rgba(255,255,255,0.15);
  border-radius: 8px;
-	color: #fff;
+  color: @fg;
 }

-#custom-page1.occupied:not(.active),
-#custom-page2.occupied:not(.active),
-#custom-page3.occupied:not(.active),
-#custom-page4.occupied:not(.active),
-#custom-page5.occupied:not(.active),
-#custom-page6.occupied:not(.active),
-#custom-page7.occupied:not(.active),
-#custom-page8.occupied:not(.active),
-#custom-page9.occupied:not(.active),
-#custom-page10.occupied:not(.active) {
-    color: #42A5F5;        /* blue – pick any shade you like */
+/* Subtle separators */
+#custom-separator {
+  color: rgba(200,200,200,0.20);
+  padding: 0 4px;
 }

-#custom-page1.active.occupied,
-#custom-page2.active.occupied,
-#custom-page3.active.occupied,
-#custom-page4.active.occupied,
-#custom-page5.active.occupied,
-#custom-page6.active.occupied,
-#custom-page7.active.occupied,
-#custom-page8.active.occupied,
-#custom-page9.active.occupied,
-#custom-page10.active.occupied {
-    background: rgba(255,255,255,0.15);   /* same as .active */
-    /* optional: keep the icon white, or turn it blue: */
-    /* color: #42A5F5; */
+/* --- PAGE BUTTONS --------------------------------------------------------- */
+#custom-page1, #custom-page2, #custom-page3, #custom-page4, #custom-page5,
+#custom-page6, #custom-page7, #custom-page8, #custom-page9, #custom-page10 {
+  background: transparent;
+  min-width: 18px;
+  padding-left: 2px;
+  color: @fg_dim;
 }

-/* --- OTHER MODULES (carry-over from your previous setup) --- */
-#window, #tray, #clock { background: transparent;}
-
-#tray {
-	margin-right: -5;
+/* Active page: glass chip, no border */
+#custom-page1.active, #custom-page2.active, #custom-page3.active, #custom-page4.active,
+#custom-page5.active, #custom-page6.active, #custom-page7.active, #custom-page8.active,
+#custom-page9.active, #custom-page10.active {
+  background: @glass_strong;
+  border-radius: 8px;
+  color: @fg;
+  box-shadow: inset 0 0 0 9999px rgba(255,255,255,0.015);
 }

-#tray * {
-	padding-left: 0px;
-	padding-right: 0px;
+/* Occupied (not active): cyan glyph */
+#custom-page1.occupied:not(.active), #custom-page2.occupied:not(.active),
+#custom-page3.occupied:not(.active), #custom-page4.occupied:not(.active),
+#custom-page5.occupied:not(.active), #custom-page6.occupied:not(.active),
+#custom-page7.occupied:not(.active), #custom-page8.occupied:not(.active),
+#custom-page9.occupied:not(.active), #custom-page10.occupied:not(.active) {
+  color: @accent2;
 }

-/* ─── kill the gap your * rule adds ─────────────────────────────── */
-#tray menu {           /* the whole right-click window             */
-    padding: 5px 0;        /* 0 instead of the 6 px from *             */
-    margin: 0;         /* 0 instead of the 2 px top margin         */
-	border: 1px solid #555;
+/* Hover feedback (very light) */
+#custom-page1:hover, #custom-page2:hover, #custom-page3:hover, #custom-page4:hover,
+#custom-page5:hover, #custom-page6:hover, #custom-page7:hover, #custom-page8:hover,
+#custom-page9:hover, #custom-page10:hover {
+  background: rgba(255,255,255,0.03);
+  border-radius: 8px;
 }

-/* ─── (optional) give the rows some room & hover style ─────────── */
-#tray menu menuitem {
-    padding: 4px 12px;           /* tweak to taste                  */
+/* Tray tweaks */
+#tray { margin-right: 0px; }
+#tray * { padding-left: 0px; padding-right: 0px; }
+
+/* Tray menu glass look (also lighter, no border) */
+#tray menu {
+  padding: 6px 0;
+  margin: 0;
+  background: @glass_strong;
+  border-radius: 10px;
+  border: none;
+  box-shadow: 0 10px 34px rgba(0,0,0,0.38);
+}
+#tray menu menuitem { padding: 6px 12px; }
+#tray menu menuitem:hover { background: alpha(@accent1, 0.16); }
+
+
+
+#custom-hyprland-workspaces {
+    padding: 0;
+    margin: 0 4px;
 }

-#tray menu menuitem:hover {
-    background: rgba(66,165,245,.25);
+.workspace {
+    /* display: inline-block; */
+    padding: 4px 8px;
+    margin: 0 2px;
+    border-radius: 4px;
+    color: #e6e6e6; /* off-white for empty workspaces */
+    background-color: transparent;
+    border: 1px solid #444;
+    /* cursor: pointer; */
+    transition: all 0.2s ease;
+    min-width: 20px;
+    /* text-align: center; */
+}
+
+.workspace.occupied {
+    color: #a855f7; /* purple for occupied workspaces */
+    border-color: #a855f7;
+}
+
+.workspace.focused {
+    background-color: rgba(168, 85, 247, 0.2); /* light purple background for focused */
+    color: #a855f7;
+    border-color: #a855f7;
+}
+
+.workspace:hover {
+    background-color: rgba(168, 85, 247, 0.1);
 }