From 1c11f54cb1bb00e3adf050d4c62d3999c4857260 Mon Sep 17 00:00:00 2001
From: The_miro <amir@abdelbaki.eu>
Date: Sun, 24 Nov 2024 01:28:33 +0100
Subject: [PATCH] made waybar not as confusing with workspaces

---
 desktopenvs/hyprland/hypr/hyprland.conf | 81 +++++++++++++------------
 desktopenvs/hyprland/waybar/config      | 31 +++++-----
 2 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/desktopenvs/hyprland/hypr/hyprland.conf b/desktopenvs/hyprland/hypr/hyprland.conf
index d54dbe5..ee5a40f 100644
--- a/desktopenvs/hyprland/hypr/hyprland.conf
+++ b/desktopenvs/hyprland/hypr/hyprland.conf
@@ -1,3 +1,45 @@
+
+#############
+### INPUT ###
+#############
+
+# https://wiki.hyprland.org/Configuring/Variables/#input
+input {
+    kb_layout = de
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+	#left_handed = true
+    follow_mouse = 1
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+
+    touchpad {
+        natural_scroll = false
+    }
+}
+
+input{
+	tablet {
+		active_area_size = 276.48 155.52
+	}
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#gestures
+gestures {
+    workspace_swipe = true
+}
+
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = epic-mouse-v1
+    sensitivity = -0.5
+}
+
+
+
 # #######################################################################################
 # AUTOGENERATED HYPR CONFIG.
 # PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
@@ -162,45 +204,6 @@ misc {
 }
 
 
-#############
-### INPUT ###
-#############
-
-# https://wiki.hyprland.org/Configuring/Variables/#input
-input {
-    kb_layout = de
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-	#left_handed = true
-    follow_mouse = 1
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-    touchpad {
-        natural_scroll = false
-    }
-}
-
-input{
-	tablet {
-		active_area_size = 276.48 155.52
-	}
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
-    workspace_swipe = true
-}
-
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-device {
-    name = epic-mouse-v1
-    sensitivity = -0.5
-}
-
 
 ####################
 ### KEYBINDINGSS ###
diff --git a/desktopenvs/hyprland/waybar/config b/desktopenvs/hyprland/waybar/config
index 07f5b6a..08701c9 100644
--- a/desktopenvs/hyprland/waybar/config
+++ b/desktopenvs/hyprland/waybar/config
@@ -11,21 +11,22 @@
   },
 
   "hyprland/workspaces": {
-	"format": "{icon}",
-	"format-icons": {
-		"1": "",
-		"2": "",
-		"3": "",
-		"4": "",
-		"5": "",
-		"6": "",
-		"active": "",
-		"default": "" 
-	},
-       "persistent-workspaces": {
-         "*": [ 2, 3, 4, 5, 6 ]
-       }
-},
+  			"format": "{name}",
+  			"format-icons": {
+  					"default": " ",
+  					"active": "@",
+  					"urgent": "!"
+  				},
+  			"on-scroll-up": "hyprctl dispatch workspace e+1",
+  			"on-scroll-down": "hyprctl dispatch workspace e-1",
+  			},
+  			"clock": {
+  				"format": "{:L%H:%M}",
+  				"tooltip": true,
+  				"tooltip-format": "<big>{:%A, %d.%B %Y }</big>\n<tt><small>{calendar}</small></tt>"
+  			}
+  },
+  
 
 "idle_inhibitor":{
   "format": "<span font='12'>{icon} </span>",