update hyprland conf; fix nvim lspconfig

update conf
update hyprland conf
2025-11-21 13:37:39 +01:00 · 2025-10-17 14:22:01 +02:00 · 2025-09-16 06:38:45 +02:00 · 2025-09-13 17:43:18 +02:00 · 2025-09-13 17:33:02 +02:00 · 2025-09-13 15:28:12 +02:00
13 changed files with 228 additions and 443 deletions
--- a/playbook.yml
+++ b/playbook.yml
@ -11,7 +11,7 @@
  pre_tasks:
    - name: Create btrfs snapshot before changes
      shell: |
-        sudo btrfs subvolume snapsho / /.snapshots/before-dotfiles-$(date +%Y%m%d-%H%M%S)
+        sudo btrfs subvolume snapshot / /.snapshots/before-dotfiles-$(date +%Y%m%d-%H%M%S)
      tags: [snapshot]
      become: true
      become_method: sudo
--- a/roles/ghostty/files/config
+++ b/roles/ghostty/files/config
@ -1,3 +1,6 @@
+# Ctrl+Backspace -> backward-kill-word (send ESC + DEL)
+# keybind = ctrl+delete=text:\x1b\x7f
+
 shell-integration = zsh
 shell-integration-features = cursor,sudo,title

--- a/roles/hyprland/files/hypr/hyprland.conf
+++ b/roles/hyprland/files/hypr/hyprland.conf
@ -5,43 +5,7 @@
 # See https://wiki.hypr.land/Configuring/Monitors/
 monitor=,preferred,auto,auto
 source = ./monitors.conf
-# monitor = DP-2, 2560x1440@165, 0x0, 1
-# monitor = DP-1, 2560x1440@165, 2560x0, 1
-# monitor = HDMI-A-2, 1920x1080@60, 5120x-360, 1, transform, 3
-
-workspace = 1, monitor:DP-1, persistent:true, default:true
-workspace = 4, monitor:DP-1, persistent:true
-workspace = 7, monitor:DP-1, persistent:true
-workspace = 10, monitor:DP-1, persistent:true
-workspace = 13, monitor:DP-1, persistent:true
-workspace = 16, monitor:DP-1, persistent:true
-workspace = 19, monitor:DP-1, persistent:true
-workspace = 22, monitor:DP-1, persistent:true
-workspace = 25, monitor:DP-1, persistent:true
-workspace = 28, monitor:DP-1, persistent:true
-
-workspace = 2, monitor:HDMI-A-2,   persistent:true, default:true
-workspace = 5, monitor:HDMI-A-2,   persistent:true
-workspace = 8, monitor:HDMI-A-2,   persistent:true
-workspace = 11, monitor:HDMI-A-2,   persistent:true
-workspace = 14, monitor:HDMI-A-2,   persistent:true
-workspace = 17, monitor:HDMI-A-2,   persistent:true
-workspace = 20, monitor:HDMI-A-2,   persistent:true
-workspace = 23, monitor:HDMI-A-2,   persistent:true
-workspace = 26, monitor:HDMI-A-2,   persistent:true
-workspace = 29, monitor:HDMI-A-2,   persistent:true
-
-workspace = 3, monitor:DP-2,   persistent:true, default:true
-workspace = 6, monitor:DP-2,   persistent:true
-workspace = 9, monitor:DP-2,   persistent:true
-workspace = 12, monitor:DP-2,   persistent:true
-workspace = 15, monitor:DP-2,   persistent:true
-workspace = 18, monitor:DP-2,   persistent:true
-workspace = 21, monitor:DP-2,   persistent:true
-workspace = 24, monitor:DP-2,   persistent:true
-workspace = 27, monitor:DP-2,   persistent:true
-workspace = 30, monitor:DP-2,   persistent:true
-
+source = ./workspaces.conf

 ###################
 ### MY PROGRAMS ###
@ -49,7 +13,6 @@ workspace = 30, monitor:DP-2,   persistent:true

 # See https://wiki.hypr.land/Configuring/Keywords/

-# Set programs that you use
 $terminal = ghostty
 $fileManager = thunar
 $menu = wofi --show drun
@ -61,10 +24,14 @@ $menu = wofi --show drun
 # Autostart necessary processes (like notifications daemons, status bars, etc.)
 # Or execute your favorite apps at launch like this:
 exec-once = waybar
+exec-once = hyprpanel
 exec-once = dunst
 exec-once = firefox
 exec-once = hyprpaper
-exec-once = spotify
+exec-once = [workspace 9 silent] spotify
+
+# gnome keyring secret service
+exec-once = dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE

 #############################
 ### ENVIRONMENT VARIABLES ###
@ -75,6 +42,9 @@ env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
 env = QT_QPA_PLATFORM,waylandl;xcb
 env = QT_QPA_PLATFORMTHEME,qt5ct
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+# env = QT_STYLE_OVERRIDE,kvantum

 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_TYPE,wayland
@ -171,7 +141,6 @@ layerrule = ignorezero, wofi    # keep blur even on near-opaque colors
 layerrule = dimaround, wofi     # optional: dim background behind wofi
 layerrule = ignorealpha 0.90, wofi  # target overall opacity for the layer

-
 # waybar
 layerrule = blur, waybar
 layerrule = ignorealpha 0.15, waybar 
@ -275,7 +244,8 @@ bind = $mainMod, N, exec, $fileManager
 bind = $mainMod, V, togglefloating,
 bind = $mainMod, Space, exec, $menu
 bind = $mainMod, G, togglesplit, # dwindle
-bind = $mainMod, F, fullscreen
+bind = $mainMod, F, fullscreen, 1
+bind = $mainMod SHIFT, F, fullscreen, 0
 bind = $mainMod, B, exec, firefox
 bind = $mainMod, M, exec, thunderbird
 bind = $mainMod, L, exec, hyprlock
@ -286,79 +256,6 @@ bind = $mainMod, right, movefocus, r
 bind = $mainMod, up, movefocus, u
 bind = $mainMod, down, movefocus, d

-# Switch workspaces with mainMod + [0-9]
-# -------- PAGE 1  →  1-2-3
-bind = SUPER, 1, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 1; \
-    dispatch focusmonitor DP-2;    dispatch workspace 2; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 3; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 2, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 4; \
-    dispatch focusmonitor DP-2;    dispatch workspace 5; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 6; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 3, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 7; \
-    dispatch focusmonitor DP-2;    dispatch workspace 8; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 9; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 4, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 10; \
-    dispatch focusmonitor DP-2;    dispatch workspace 11; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 12; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 5, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 13; \
-    dispatch focusmonitor DP-2;    dispatch workspace 14; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 15; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 6, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 16; \
-    dispatch focusmonitor DP-2;    dispatch workspace 17; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 18; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 7, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 19; \
-    dispatch focusmonitor DP-2;    dispatch workspace 20; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 21; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 8, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 22; \
-    dispatch focusmonitor DP-2;    dispatch workspace 23; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 24; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 9, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 25; \
-    dispatch focusmonitor DP-2;    dispatch workspace 26; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 27; \
-    dispatch focusmonitor DP-1"
-
-bind = SUPER, 0, exec, hyprctl --batch " \
-    dispatch focusmonitor DP-1; dispatch workspace 28; \
-    dispatch focusmonitor DP-2;    dispatch workspace 29; \
-    dispatch focusmonitor HDMI-A-2;    dispatch workspace 30; \
-    dispatch focusmonitor DP-1"
-
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 4
-bind = $mainMod SHIFT, 3, movetoworkspace, 7
-bind = $mainMod SHIFT, 4, movetoworkspace, 10
-bind = $mainMod SHIFT, 5, movetoworkspace, 13
-bind = $mainMod SHIFT, 6, movetoworkspace, 16
-bind = $mainMod SHIFT, 7, movetoworkspace, 19
-bind = $mainMod SHIFT, 8, movetoworkspace, 22
-bind = $mainMod SHIFT, 9, movetoworkspace, 25
-bind = $mainMod SHIFT, 0, movetoworkspace, 28
-
 bind = $mainMod SHIFT, left, movewindow, l
 bind = $mainMod SHIFT, right, movewindow, r
 bind = $mainMod SHIFT, up, movewindow, u
@ -393,6 +290,7 @@ bind = CTRL ALT, Up, exec, playerctl --player=spotify volume 0.05+
 bind = CTRL ALT, Down, exec, playerctl --player=spotify volume 0.05-

 bind = ,F7,pass,class:^(discord)$
+bind = ,F8,pass,class:^(discord)$

 # Printscreen
 # Screenshot a selected region (interactive)
@ -400,7 +298,7 @@ bind = ,F7,pass,class:^(discord)$
 bind = , Print, exec, hyprshot -zm region

 ##############################
-### WINDOWS AND WORKSPACES ###
+### WINDOWRULES ###
 ##############################

 # See https://wiki.hypr.land/Configuring/Window-Rules/ for more
@ -415,3 +313,10 @@ windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned
 windowrulev2 = tag +jb, class:^jetbrains-.+$,floating:1
 windowrulev2 = stayfocused, tag:jb
 windowrulev2 = noinitialfocus, tag:jb
+
+# 1) Do not allow these windows to inhibit Hyprland shortcuts
+windowrulev2 = noshortcutsinhibit, class:^(jetbrains-.*|android-studio)$
+
+# 2) Float and center transient dialogs from these apps
+windowrulev2 = float,  class:^(jetbrains-.*|android-studio)$,  windowtype:^(dialog|utility|popup)$
+windowrulev2 = center, class:^(jetbrains-.*|android-studio)$,  windowtype:^(dialog|utility|popup)$
--- a/roles/hyprland/files/hypr/monitors.conf
+++ b/roles/hyprland/files/hypr/monitors.conf
@ -1,8 +1,8 @@
-# Generated by nwg-displays on 2025-09-07 at 18:49:18. Do not edit manually.
+# Generated by nwg-displays on 2025-11-09 at 17:18:32. Do not edit manually.

 monitor=DP-1,2560x1440@165.0,6626x876,1.0
 monitor=DP-2,2560x1440@165.0,4066x876,1.0
-monitor=HDMI-A-1,3840x2160@60.0,226x156,1.0
-monitor=HDMI-A-1,disable
 monitor=HDMI-A-2,1920x1080@60.0,9186x396,1.0
 monitor=HDMI-A-2,transform,3
+monitor=HDMI-A-1,3840x2160@60.0,226x156,1.0
+monitor=HDMI-A-1,disable
--- a/roles/hyprland/files/hypr/workspaces.conf
+++ b/roles/hyprland/files/hypr/workspaces.conf
@ -0,0 +1,34 @@
+$mainMod = SUPER # Sets "Super" key as main modifier
+
+workspace = 1, monitor:DP-1, persistent:true, default:true
+workspace = 2, monitor:DP-1, persistent:true
+workspace = 3, monitor:DP-1, persistent:true
+workspace = 4, monitor:DP-2, persistent:true, default:true
+workspace = 5, monitor:DP-2, persistent:true
+workspace = 6, monitor:DP-2, persistent:true
+workspace = 7, monitor:HDMI-A-2, persistent:true
+workspace = 8, monitor:HDMI-A-2, persistent:true
+workspace = 9, monitor:HDMI-A-2, persistent:true, default:true
+workspace = 10, monitor:HDMI-A-1, persistent:true, default:true
+
+bind = $mainMod, 1, exec, hyprctl --batch "dispatch focusmonitor DP-1; dispatch workspace 1;"
+bind = $mainMod, 2, exec, hyprctl --batch "dispatch focusmonitor DP-1; dispatch workspace 2;"
+bind = $mainMod, 3, exec, hyprctl --batch "dispatch focusmonitor DP-1; dispatch workspace 3;"
+bind = $mainMod, 4, exec, hyprctl --batch "dispatch focusmonitor DP-2; dispatch workspace 4;"
+bind = $mainMod, 5, exec, hyprctl --batch "dispatch focusmonitor DP-2; dispatch workspace 5;"
+bind = $mainMod, 6, exec, hyprctl --batch "dispatch focusmonitor DP-2; dispatch workspace 6;"
+bind = $mainMod, 7, exec, hyprctl --batch "dispatch focusmonitor HDMI-A-2; dispatch workspace 7;"
+bind = $mainMod, 8, exec, hyprctl --batch "dispatch focusmonitor HDMI-A-2; dispatch workspace 8;"
+bind = $mainMod, 9, exec, hyprctl --batch "dispatch focusmonitor HDMI-A-2; dispatch workspace 9;"
+bind = $mainMod, 0, exec, hyprctl --batch "dispatch focusmonitor HDMI-A-1; dispatch workspace 10;"
+
+bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
+bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
+bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
+bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
+bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
+bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
+bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
+bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
+bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
+bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10
--- a/roles/hyprland/files/waybar/config.jsonc
+++ b/roles/hyprland/files/waybar/config.jsonc
@ -8,64 +8,74 @@
 	"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-left": ["hyprland/workspaces"],
+	"modules-center": ["wlr/taskbar"],
 	"modules-right": [ "tray", "custom/separator", "network", "bluetooth", "custom/separator", "disk", "cpu", "memory", "pulseaudio", "custom/separator", "clock"],

-	"custom/page1": {
-		"exec": "~/.config/waybar/scripts/page.sh 1",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page2": {
-		"exec": "~/.config/waybar/scripts/page.sh 2",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page3": {
-		"exec": "~/.config/waybar/scripts/page.sh 3",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page4": {
-		"exec": "~/.config/waybar/scripts/page.sh 4",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page5": {
-		"exec": "~/.config/waybar/scripts/page.sh 5",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page6": {
-		"exec": "~/.config/waybar/scripts/page.sh 6",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page7": {
-		"exec": "~/.config/waybar/scripts/page.sh 7",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page8": {
-		"exec": "~/.config/waybar/scripts/page.sh 8",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page9": {
-		"exec": "~/.config/waybar/scripts/page.sh 9",
-		"exec-persistent": true,
-		"return-type": "json"
-	},
-	"custom/page10": {
-		"exec": "~/.config/waybar/scripts/page.sh 10",
-		"exec-persistent": true,
-		"return-type": "json"
+
+	"hyprland/workspaces": {
+		"disable-scroll": true,
+		"all-outputs": true,
+		"warp-on-scroll": false,
+		"format": "{icon}{windows}",
+		"format-icons": {
+            "1": "1",
+            "2": "2", 
+            "3": "3",
+            "4": "4",
+            "5": "5",
+            "6": "6",
+            "7": "7",
+            "8": "8",
+            "9": "9",
+            "10": "0"
+        },
+		"window-rewrite-default": " 󱃶",
+		"format-window-separator": "",
+		"window-rewrite": {
+			"class<firefox>": " ",
+			"class<com.mitchellh.ghostty>": " ",
+			"class<com.mitchellh.ghostty> title<vim.*>": " ",
+			"class<Spotify>": " ",
+			"class<QOwnNotes>": " ",
+			"class<thunderbird>": " ",
+			"class<thunar>": " ",
+			"class<jetbrains-webstorm>": " ",
+			"class<jetbrains-pycharm>": " ",
+			"class<steam>": " ",
+			"class<discord>": " "
+			// "": "",
+			// "": "",
+			// "": "",
+			// "": "",
+			// "": "",
+			// "": "",
+			// "": "",
+			// "": ""
+		},
+        "persistent-workspaces": {
+            "1": [],
+            "2": [],
+            "3": [],
+            "4": [],
+            "5": [],
+            "6": [],
+            "7": [],
+            "8": [],
+            "9": [],
+            "10": []
+        }
 	},

-	"hyprland/window": { "format": "{title}", "max-length": 60 },
-	// "tray":            { "icon-size": 16, "spacing": 6 },
+
+	// "hyprland/window": { "format": "{title}", "max-length": 60 },
+	"wlr/taskbar": {
+		"format": "{icon}",
+		"icon-theme": "Ars-Dark-Icons",
+		"tooltip-format": "{title}",
+		"on-click": "activate",
+		"on-click-middle": "close"
+	},
 	"tray":            { "icon-size": 16, "spacing": 10 },

 	"pulseaudio": {
--- a/roles/hyprland/files/waybar/scripts/groups.sh
+++ b/roles/hyprland/files/waybar/scripts/groups.sh
@ -0,0 +1,40 @@
+#!/bin/bash
+
+current=$(hyprctl activeworkspace -j | jq -r '.id')
+
+if [ "$1" = "click" ]; then
+	group=$2
+    start=$(( (group - 1) * 3 + 1 ))
+
+	hyprctl --batch " \
+		dispatch focusmonitor DP-1; dispatch workspace $start; \
+		dispatch focusmonitor DP-2;    dispatch workspace $((start+1)); \
+		dispatch focusmonitor HDMI-A-2;    dispatch workspace $((start+2)); \
+		dispatch focusmonitor DP-1"
+    
+else
+    # Display button state
+    group=$1
+	start=$(( (group - 1) * 3 + 1 ))
+    end=$(( start + 2 ))
+    case $group in
+        1) range="1-3"; icon="" ;;
+        2) range="4-6"; icon="" ;;
+        3) range="7-9"; icon="" ;;
+        4) range="10-12"; icon="" ;;
+        5) range="13-15"; icon="" ;;
+        6) range="16-18"; icon="" ;;
+        7) range="19-21"; icon="" ;;
+        8) range="22-24"; icon="" ;;
+        9) range="25-27"; icon="󰝚" ;;
+        10) range="28-30"; icon="" ;;
+    esac
+    
+    if [ $current -ge $start ] && [ $current -le $end ]; then
+		# Active group - return with active class
+        echo "{\"text\": \"$icon\", \"class\": \"active\"}"
+    else
+        # Inactive group
+        echo "{\"text\": \"$icon\", \"class\": \"inactive\"}"
+    fi
+fi
--- a/roles/hyprland/files/waybar/scripts/page.sh
+++ b/roles/hyprland/files/waybar/scripts/page.sh
@ -1,150 +0,0 @@
-#!/usr/bin/env bash
-# page.sh 1‒10 – Waybar “page” indicator
-# deps: socat, awk, sed, grep
-
-page=$1
-icons=( "" "" "" "" "" "" "" "" "" "" "󰝚" )
-
-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
-}
-
-# Return 0 if THIS page has at least one window, else 1
-is_occupied() {
-  # 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
-    classes+=(active)
-  else
-    is_occupied && classes+=(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
-socket="$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock"
-socat -U - UNIX-CONNECT:"$socket" | while read -r line; do
-  [[ $line =~ ^(workspace|openwindow|closewindow|movewindow) ]] || continue
-  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)
-  if (( new_page != current_page || new_occ != current_occ )); then
-    emit "$new_page"
-    current_page=$new_page
-    current_occ=$new_occ
-  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,25 +1,23 @@
-/* ==== 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 glass         rgba(12, 14, 20, 0.34);
+@define-color glass_strong  rgba(12, 14, 20, 0.46);
@define-color fg            #DDE1EA;
@define-color fg_dim        #B8BECC;
@define-color accent1       #7F5AF0;
@define-color accent2       #00D1FF;
+@define-color occupied		#a8557f;

 /* Whole bar: more vertical padding, no border, stronger shadow */
 window#waybar {
  background: @glass;
  color: @fg;
  border-radius: 12px;
-  margin: 6px 8px;
+  /* 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: 2px 6px;
@ -45,42 +43,6 @@ window#waybar {
  padding: 0 4px;
 }

-/* --- 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;
-}
-
-/* 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);
-}
-
-/* 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;
-}
-
-/* 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;
-}
-
 /* Tray tweaks */
 #tray { margin-right: 0px; }
 #tray * { padding-left: 0px; padding-right: 0px; }
@ -97,38 +59,42 @@ window#waybar {
 #tray menu menuitem { padding: 6px 12px; }
 #tray menu menuitem:hover { background: alpha(@accent1, 0.16); }

-
-
-#custom-hyprland-workspaces {
-    padding: 0;
-    margin: 0 4px;
-}
-
-.workspace {
-    /* display: inline-block; */
-    padding: 4px 8px;
-    margin: 0 2px;
-    border-radius: 4px;
-    color: #e6e6e6; /* off-white for empty workspaces */
+#workspaces button {
+    padding: 0 2px;
    background-color: transparent;
-    border: 1px solid #444;
-    /* cursor: pointer; */
-    transition: all 0.2s ease;
-    min-width: 20px;
-    /* text-align: center; */
+    color: #6c7086;
+    border-radius: 3px;
+    margin: 2px;
+    transition: all 0.2s ease-in-out;
 }

-.workspace.occupied {
-    color: #a855f7; /* purple for occupied workspaces */
-    border-color: #a855f7;
+/* Hover effect */
+#workspaces button:hover {
+    background-color: #74c7ec;
+    color: #1e1e2e;
 }

-.workspace.focused {
-    background-color: rgba(168, 85, 247, 0.2); /* light purple background for focused */
-    color: #a855f7;
-    border-color: #a855f7;
+#workspaces button:not(.active):not(.empty) {
+    color: #cdd6f4;
+    background-color: #585b70;
 }

-.workspace:hover {
-    background-color: rgba(168, 85, 247, 0.1);
+/* Active/focused workspace */
+#workspaces button.active {
+    color: #1e1e2e;
+    background-color: @occupied;
+    font-weight: bold;
 }
+
+#workspaces button.visible {
+    color: #f9e2af;
+    /* background-color: #45475a; */
+    border: 1px solid #f9e2af;
+}
+
+/* Default state for persistent workspaces */
+#workspaces button {
+    color: #6c7086;
+    background-color: @glass;
+}
+
--- a/roles/nvim/files/lazy-lock.json
+++ b/roles/nvim/files/lazy-lock.json
@ -1,41 +1,41 @@
 {
  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
-  "alpha-nvim": { "branch": "main", "commit": "2b3cbcdd980cae1e022409289245053f62fb50f6" },
-  "auto-session": { "branch": "main", "commit": "ee320d7a59c1dfe83df7c9d58150d9f194690d53" },
+  "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" },
+  "auto-session": { "branch": "main", "commit": "4cd20bb5c0138d1ce00ab35f8d7ac0f4fb4a403a" },
  "bufdelete.nvim": { "branch": "master", "commit": "f6bcea78afb3060b198125256f897040538bcb81" },
  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
-  "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "flutter-tools.nvim": { "branch": "main", "commit": "65b7399804315a1160933b64292d3c5330aa4e9f" },
+  "flutter-tools.nvim": { "branch": "main", "commit": "69db9cdac65ce536e20a8fc9a83002f007cc049c" },
  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
-  "lazygit.nvim": { "branch": "main", "commit": "cdd3527e251f96eb0527162b156ad839286fcd97" },
-  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
+  "lazygit.nvim": { "branch": "main", "commit": "2305deed25bc61b866d5d39189e9105a45cf1cfb" },
+  "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
+  "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" },
  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
  "mason.nvim": { "branch": "main", "commit": "4da89f3ab04783da990f9bd40aaa36c22e59375b" },
-  "monokai-nightasty.nvim": { "branch": "main", "commit": "8182c45dcaf82e7316cfda6d439ee8ad783ae594" },
+  "monokai-nightasty.nvim": { "branch": "main", "commit": "91b0798334534394d77b0b6e6089fe0655b241b3" },
  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" },
-  "none-ls.nvim": { "branch": "main", "commit": "3ce66bc62eb363f19cceeb1fae2e71ea2bede56d" },
-  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
-  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "402c6b5c29f0ab57fac924b863709f37f55dc298" },
+  "none-ls.nvim": { "branch": "main", "commit": "a96172f673f720cd4f3572e1fcd08400ed3eb25d" },
+  "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
+  "nvim-cmp": { "branch": "main", "commit": "a7bcf1d88069fc67c9ace8a62ba480b8fe879025" },
  "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" },
-  "nvim-lspconfig": { "branch": "master", "commit": "4d3b3bb8815fbe37bcaf3dbdb12a22382bc11ebe" },
-  "nvim-surround": { "branch": "main", "commit": "7a7a78a52219a3312c1fcabf880cea07a7956a5f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "a9156c013916d3c8a2905ab2e26e9dd74beb642e" },
+  "nvim-lspconfig": { "branch": "master", "commit": "87d30189b24caa496b54affd65594a309ac6d929" },
+  "nvim-surround": { "branch": "main", "commit": "fcfa7e02323d57bfacc3a141f8a74498e1522064" },
+  "nvim-tree.lua": { "branch": "master", "commit": "64e2192f5250796aa4a7f33c6ad888515af50640" },
  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "4a8369f4c78ef6f6f895f0cec349e48f74330574" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },
  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
-  "venv-selector.nvim": { "branch": "regexp", "commit": "c677caa1030808a9f90092e522de7cc20c1390dd" },
-  "vim-floaterm": { "branch": "master", "commit": "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
+  "todo-comments.nvim": { "branch": "main", "commit": "411503d3bedeff88484de572f2509c248e499b38" },
+  "venv-selector.nvim": { "branch": "regexp", "commit": "d2326e7433fdeb10f7d0d1237c18b91b353f9f8b" },
+  "vim-floaterm": { "branch": "master", "commit": "a720490bd9dc02c5492e800aa08d4802f22b01f8" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }
--- a/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua
+++ b/roles/nvim/files/lua/config/plugins/lsp/lspconfig.lua
@ -8,7 +8,7 @@ return {
 		{ 'folke/neodev.nvim',                   opts = {} },
 	},
 	config = function()
-		local lspconfig = require('lspconfig')
+		local lspconfig = vim.lsp
 		local mason_lspconfig = require('mason-lspconfig')
 		local cmp_nvim_lsp = require('cmp_nvim_lsp')
 		local keymap = vim.keymap
@ -41,13 +41,13 @@ return {
 		mason_lspconfig.setup_handlers({
 			-- default handler for installed servers
 			function(server_name)
-				lspconfig[server_name].setup({
+				lspconfig.enable(server_name, {
 					capabilities = capabilities,
 				})
 			end,
 			-- TODO add lsp configs
 			['lua_ls'] = function()
-				lspconfig['lua_ls'].setup({
+				lspconfig.enable('lua_ls', {
 					capabilities = capabilities,
 					settings = {
 						Lua = {
@ -63,7 +63,7 @@ return {
 			end,
 			['emmet_ls'] = function()
 				-- capabilities.textDocument.completion.completionItem.snippetSupport = true
-				lspconfig['emmet_ls'].setup({
+				lspconfig.enable('emmet_ls', {
 					capabilities = capabilities,
 					filetypes = {
 						'html',
@ -81,7 +81,7 @@ return {
 				})
 			end,
 			['ts_ls'] = function()
-				lspconfig['ts_ls'].setup({
+				lspconfig.enable('ts_ls', {
 					capabilities = capabilities,
 					cmd = { "typescript-language-server", "--stdio" },
 					init_options = {
--- a/roles/nvim/files/lua/config/plugins/venv-selector.lua
+++ b/roles/nvim/files/lua/config/plugins/venv-selector.lua
@ -1,24 +0,0 @@
-return {
-	"linux-cultist/venv-selector.nvim",
-	dependencies = {
-		"neovim/nvim-lspconfig",
-		-- "mfussenegger/nvim-dap", "mfussenegger/nvim-dap-python", --optional
-		{ "nvim-telescope/telescope.nvim", branch = "0.1.x", dependencies = { "nvim-lua/plenary.nvim" } },
-	},
-	lazy = false,
-	branch = "regexp", -- This is the regexp branch, use this for the new version
-	config = function()
-		require("venv-selector").setup({
-			-- settings = {
-			-- 	search = {
-			-- 		my_envs = {
-			-- 			command = "fd python$ ~/git/cerenim/backend/"
-			-- 		}
-			-- 	}
-			-- }
-		})
-	end,
-	keys = {
-		{ ",v", "<cmd>VenvSelect<cr>" },
-	},
-}
--- a/roles/zsh/files/.zshrc
+++ b/roles/zsh/files/.zshrc
@ -49,3 +49,4 @@ fi

 alias drun='docker run -it --network=host --device=/dev/kfd --device=/dev/dri --group-add=video --ipc=host --cap-add=SYS_PTRACE --security-opt seccomp=unconfined'

+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
Author	SHA1	Message	Date
Johannes Knopp	7c918c3c17	update hyprland conf; fix nvim lspconfig	2025-11-21 13:37:39 +01:00
Johannes Knopp	4ae85ca347	update conf	2025-10-17 14:22:01 +02:00
Johannes Knopp	653a75cc18	update hyprland conf	2025-09-16 06:38:45 +02:00
Johannes Knopp	42bae035ee	resolve merge-conflict	2025-09-13 17:43:18 +02:00
Johannes Knopp	9c3f47615b	move to 1 workspace per window conf; adapt waybar accordingly	2025-09-13 17:33:02 +02:00
Johannes Knopp	a95cd6feed	update hyprland conf	2025-09-13 15:28:12 +02:00
Johannes Knopp	e0fcb2988f	pin mason v1 due to breaking changes with lazy.nvim	2025-07-28 18:05:30 +02:00