From aa1845966d7b4b17a77680f54126b1cccbe6c9cb Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 23 Oct 2023 20:04:17 +0100
Subject: [PATCH] Update hyprland rules

---
 home/hyprland/config.nix                      |  8 +++-----
 .../waybar/modules/wlr_workspaces.nix         | 19 -------------------
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 home/hyprland/waybar/modules/wlr_workspaces.nix

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 6abf583a..d2f3da61 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -106,11 +106,10 @@ in ''
 
   # Common program shortcuts
   bind = SUPER, Space, exec, pkill anyrun || anyrun
+  bind = SUPER, E, exec, emacsclient
   bind = SUPER, Return, exec, alacritty
   bind = SUPER SHIFT, Return, exec, [float] alacritty
 
-  bind = SUPER ALT, T, exec, [workspace 2] alacritty
-  bind = SUPER ALT, D, exec, [workspace 3] emacs
   bind = SUPER ALT, W, exec, [workspace 4] firefox
   bind = SUPER ALT, F, exec, [workspace 5] thunar
   bind = SUPER ALT, S, exec, [workspace 6] spot
@@ -186,6 +185,8 @@ in ''
   windowrule = pin,(Rofi)
   windowrule = dimaround,(Rofi)
   windowrule = stayfocused,(Rofi)
+  windowrule = nofullscreenrequest,(Nxplayer.bin)
+  windowrule = nomaximizerequest,(Nxplayer.bin)
   windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox)
   windowrulev2 = float,title:^(Extension.*)$,class:(firefox)
   windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox)
@@ -215,7 +216,6 @@ in ''
   bind = SUPER, D, moveworkspacetomonitor, 3 current
   bind = SUPER, D, workspace, 3
   bind = SUPER SHIFT, D, movetoworkspace, 3
-  windowrule = workspace 3 silent,(emacs)
 
   # 4: [b]rowser
   bind = SUPER, W, moveworkspacetomonitor, 4 current
@@ -250,8 +250,6 @@ in ''
   bind = SUPER SHIFT, R, movetoworkspace, 8
   windowrule = workspace 8 silent,(org.remmina.Remmina)
   windowrule = workspace 8 silent,(Nxplayer.bin)
-  windowrule = nofullscreenrequest,(Nxplayer.bin)
-  windowrule = nomaximizerequest,(Nxplayer.bin)
 
   # 9: [g]aming
   bind = SUPER, G, moveworkspacetomonitor, 9 current
diff --git a/home/hyprland/waybar/modules/wlr_workspaces.nix b/home/hyprland/waybar/modules/wlr_workspaces.nix
deleted file mode 100644
index 8777d943..00000000
--- a/home/hyprland/waybar/modules/wlr_workspaces.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  on-click = "activate";
-  disable-scroll = true;
-  all-outputs = false;
-  format = "{icon}";
-  format-icons = {
-    "1" = "󰟀"; # [a]ny
-    "2" = "󰈹"; # [b]rowser
-    "3" = "󰳼"; # [d]ev
-    "4" = "󰝰"; # [f]iles
-    "5" = "󰓇"; # [s]potify (or mu[s]ic)
-    "6" = "󰭹"; # [c]hat
-    "7" = "󰍫"; # [v]ideo
-    "8" = "󰢹"; # [r]emote
-    "9" = "󰓓"; # [g]aming
-    urgent = "󱈸";
-  };
-  sort-by-number = true;
-}