From 5d4605f58df93d677f19c9901a1c316432e5dbda Mon Sep 17 00:00:00 2001
From: KoenDR06 <koen.de.ruiter@hotmail.com>
Date: Wed, 3 Sep 2025 16:45:40 +0200
Subject: [PATCH] some changes so config works for all situations

---
 machines/luna/modules.nix       | 1 +
 modules/apps/visual/firefox.nix | 6 +++---
 modules/wm/hyprland/options.nix | 4 ++--
 modules/wm/hyprland/waybar.nix  | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/machines/luna/modules.nix b/machines/luna/modules.nix
index f49daa2..45a9a10 100644
--- a/machines/luna/modules.nix
+++ b/machines/luna/modules.nix
@@ -29,6 +29,7 @@
             bar = "right";
           }
         ];
+        monitors.bindWorkspaces = "interlaced";
       };
     };
 
diff --git a/modules/apps/visual/firefox.nix b/modules/apps/visual/firefox.nix
index f895326..61bef58 100644
--- a/modules/apps/visual/firefox.nix
+++ b/modules/apps/visual/firefox.nix
@@ -61,9 +61,9 @@ in {
             install_url = "https://addons.mozilla.org/firefox/downloads/latest/istilldontcareaboutcookies/latest.xpi";
             installation_mode = "force_installed";
           };
-          # Ghostery
-          "firefox@ghostery.com" = {
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/ghostery/latest.xpi";
+          # Tridactyl
+          "tridactyl.vim@cmcaine.co.uk" = {
+            install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi";
             installation_mode = "force_installed";
           };
         };
diff --git a/modules/wm/hyprland/options.nix b/modules/wm/hyprland/options.nix
index e7c0b7b..472701a 100644
--- a/modules/wm/hyprland/options.nix
+++ b/modules/wm/hyprland/options.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib) mkOption types mkIf recursiveUpdate trivial strings lists;
-  inherit (builtins) concatStringsSep elem genList elemAt;
+  inherit (builtins) concatStringsSep elem genList elemAt length;
   inherit (trivial) boolToString;
   inherit (strings) floatToString;
   inherit (lists) remove;
@@ -1714,7 +1714,7 @@ in {
         ${
           concatStringsSep "\n" (
             if cfg.config.monitors.bindWorkspaces == "interlaced"
-            then (map (x: "workspace = ${toString (x + 1)}, persistent:true, monitor:${(elemAt cfg.config.monitors.displays (x - (2 * (x / 2)))).output}") (genList (x: x) 10))
+            then (map (x: "workspace = ${toString (x + 1)}, persistent:true, monitor:${(elemAt cfg.config.monitors.displays (x - ((length cfg.config.monitors.displays) * (x / (length cfg.config.monitors.displays))))).output}") (genList (x: x) 10))
             else []
           )
         }
diff --git a/modules/wm/hyprland/waybar.nix b/modules/wm/hyprland/waybar.nix
index f84d10f..4f9a0c2 100644
--- a/modules/wm/hyprland/waybar.nix
+++ b/modules/wm/hyprland/waybar.nix
@@ -98,6 +98,7 @@ in {
 
             tooltip-format = " {bandwidthDownBits} , {bandwidthDownBits} ";
             tooltip-format-wifi = "{essid}:  {bandwidthDownBits} , {bandwidthDownBits} ";
+            on-click = "nm-applet";
           };
 
           "battery" = {