From 8fd23957603c813555d62feead5db767fd39e094 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 5 Nov 2023 08:10:23 +0000
Subject: [PATCH] Trim workspaces a bit more, switch to using octicons for
 icons

---
 home/hyprland/config.nix         | 14 --------------
 home/hyprland/waybar/default.nix | 23 ++++++++---------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 80646403..647db52e 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -110,8 +110,6 @@ in ''
   bind = SUPER ALT, W, exec, [workspace 3] nyxt
   bind = SUPER ALT, F, exec, [workspace 4] thunar
   bind = SUPER ALT, C, exec, [workspace 5] fractal
-  bind = SUPER ALT, G, exec, [workspace 6] steam
-  bind = SUPER ALT, R, exec, [workspace 7] nxplayer
 
   # Misc useful binds
   bind=,XF86Calculator,exec,rofi -replace -show calc
@@ -198,18 +196,6 @@ in ''
   windowrule = workspace 5, (discord)
   windowrule = workspace 5, (teams-for-linux)
 
-  # 6: [g]aming
-  bind = SUPER, G, moveworkspacetomonitor, 6 current
-  bind = SUPER, G, workspace, 6
-  bind = SUPER SHIFT, G, movetoworkspace, 6
-  windowrule = workspace 6, (steam)
-
-  # 7: [r]emote
-  bind = SUPER, R, moveworkspacetomonitor, 7 current
-  bind = SUPER, R, workspace, 7
-  bind = SUPER SHIFT, R, movetoworkspace, 7
-  windowrule = workspace 7, (Nxplayer.bin)
-
   # Special workspaces
   bind = SUPER, comma, workspace, m-1
   bind = SUPER SHIFT, comma, movetoworkspace, r-1
diff --git a/home/hyprland/waybar/default.nix b/home/hyprland/waybar/default.nix
index f72c9cbc..3cf1a0d2 100644
--- a/home/hyprland/waybar/default.nix
+++ b/home/hyprland/waybar/default.nix
@@ -49,24 +49,17 @@
       "hyprland/workspaces" = {
         format = "{icon}";
         format-icons = {
-          # "1" = "󰛡"; # [a]ny (or def[a]ult)
-          "1" = "󰟀"; # [t]erminal
-          "2" = "󰳼"; # [e]ditor
-          "3" = "󰖟"; # [w]eb browser
-          "4" = "󰝰"; # [f]iles
-          "5" = "󰭹"; # [c]hat
-          "6" = "󰊗"; # [g]aming
-          "7" = "󰢹"; # [r]emote
-          default = "󰛡";
-          special = "󰓎";
-          urgent = "󰣘";
+          "1" = ""; # [t]erminal
+          "2" = ""; # [e]ditor
+          "3" = ""; # [w]eb browser
+          "4" = ""; # [f]iles
+          "5" = ""; # [c]hat
+          default = "";
+          special = "";
+          urgent = "⚡";
         };
         show-special = true;
       };
-      "hyprland/window" = {
-        format = "{title}";
-        separate-outputs = true;
-      };
       mpris = {
         "format" =
           "{player_icon} <b>{title}</b> [{position}/{length}] {status_icon}";