From 21b51184c6c04249e072fbf664468ad2d3da9c95 Mon Sep 17 00:00:00 2001
From: hesam-init <hesam.init@gmail.com>
Date: Sat, 24 Feb 2024 22:16:34 +0330
Subject: [PATCH] feat: workspace rules moved to workspace.conf file

---
 hyprland/.config/hypr/conf/rules.conf                 |  2 ++
 .../{windowrules/default.conf => rules/windows.conf}  | 10 +---------
 hyprland/.config/hypr/conf/rules/workspaces.conf      | 11 +++++++++++
 hyprland/.config/hypr/conf/windowrule.conf            |  1 -
 hyprland/.config/hypr/hyprland.conf                   |  2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 hyprland/.config/hypr/conf/rules.conf
 rename hyprland/.config/hypr/conf/{windowrules/default.conf => rules/windows.conf} (75%)
 create mode 100644 hyprland/.config/hypr/conf/rules/workspaces.conf
 delete mode 100644 hyprland/.config/hypr/conf/windowrule.conf

diff --git a/hyprland/.config/hypr/conf/rules.conf b/hyprland/.config/hypr/conf/rules.conf
new file mode 100644
index 0000000..34efe9a
--- /dev/null
+++ b/hyprland/.config/hypr/conf/rules.conf
@@ -0,0 +1,2 @@
+source = ~/.config/hypr/conf/rules/windows.conf
+source = ~/.config/hypr/conf/rules/workspaces.conf
diff --git a/hyprland/.config/hypr/conf/windowrules/default.conf b/hyprland/.config/hypr/conf/rules/windows.conf
similarity index 75%
rename from hyprland/.config/hypr/conf/windowrules/default.conf
rename to hyprland/.config/hypr/conf/rules/windows.conf
index eaa6526..47ad6ca 100644
--- a/hyprland/.config/hypr/conf/windowrules/default.conf
+++ b/hyprland/.config/hypr/conf/rules/windows.conf
@@ -33,12 +33,4 @@ windowrulev2= animation popin,class:^(Steam|steam)$,title:^(.*)$
 windowrulev2= stayfocused,class:(steam),title:(^$)
 
 # chrome rules :
-windowrulev2= float,title:^(Google Chrome)$
-
-# wrokspace rules :
-windowrulev2 = workspace 1,class:^(chrome|google-chrome|Chrome|Firefox|firefox)$
-windowrulev2 = workspace 2,class:^(Code)$
-windowrulev2 = workspace 3,class:^(nekoray|Nekoray)$
-windowrulev2 = workspace 4,class:^(org.telegram.desktop|telegramdesktop|discord)$
-windowrulev2 = workspace 4,class:^(org.telegram.desktop|telegramdesktop|discord)$
-windowrulev2 = workspace 5,class:^(Steam|steam)$,title:^(Steam)$
\ No newline at end of file
+windowrulev2= float,title:^(Google Chrome)$
\ No newline at end of file
diff --git a/hyprland/.config/hypr/conf/rules/workspaces.conf b/hyprland/.config/hypr/conf/rules/workspaces.conf
new file mode 100644
index 0000000..0c47a14
--- /dev/null
+++ b/hyprland/.config/hypr/conf/rules/workspaces.conf
@@ -0,0 +1,11 @@
+# -----------------------------------------------------
+# workspaces rules
+# -----------------------------------------------------
+
+windowrulev2 = workspace 1,class:^(chrome|google-chrome|Chrome|Firefox|firefox)$
+windowrulev2 = workspace 2,class:^(Code)$
+windowrulev2 = workspace 3,class:^(nekoray|Nekoray)$
+windowrulev2 = workspace 4,class:^(org.telegram.desktop|telegramdesktop|discord)$
+windowrulev2 = workspace 4,class:^(org.telegram.desktop|telegramdesktop|discord)$
+windowrulev2 = workspace 5,class:^(Steam|steam)$,title:^(Steam)$
+windowrulev2 = workspace 6,class:^(Spotify)$
diff --git a/hyprland/.config/hypr/conf/windowrule.conf b/hyprland/.config/hypr/conf/windowrule.conf
deleted file mode 100644
index a03ddb4..0000000
--- a/hyprland/.config/hypr/conf/windowrule.conf
+++ /dev/null
@@ -1 +0,0 @@
-source = ~/.config/hypr/conf/windowrules/default.conf
diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
index 0545961..2881f6e 100644
--- a/hyprland/.config/hypr/hyprland.conf
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -40,7 +40,7 @@ source = ~/.config/hypr/conf/decoration.conf
 source = ~/.config/hypr/conf/layout.conf
 source = ~/.config/hypr/conf/misc.conf
 source = ~/.config/hypr/conf/keybinding.conf
-source = ~/.config/hypr/conf/windowrule.conf
+source = ~/.config/hypr/conf/rules.conf
 
 gestures {
     workspace_swipe = on