some changes so config works for all situations

This commit is contained in:
KoenDR06 2025-09-03 16:45:40 +02:00
parent abb9c5f946
commit 5d4605f58d
4 changed files with 7 additions and 5 deletions

View file

@ -29,6 +29,7 @@
bar = "right"; bar = "right";
} }
]; ];
monitors.bindWorkspaces = "interlaced";
}; };
}; };

View file

@ -61,9 +61,9 @@ in {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/istilldontcareaboutcookies/latest.xpi"; install_url = "https://addons.mozilla.org/firefox/downloads/latest/istilldontcareaboutcookies/latest.xpi";
installation_mode = "force_installed"; installation_mode = "force_installed";
}; };
# Ghostery # Tridactyl
"firefox@ghostery.com" = { "tridactyl.vim@cmcaine.co.uk" = {
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ghostery/latest.xpi"; install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi";
installation_mode = "force_installed"; installation_mode = "force_installed";
}; };
}; };

View file

@ -4,7 +4,7 @@
... ...
}: let }: let
inherit (lib) mkOption types mkIf recursiveUpdate trivial strings lists; 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 (trivial) boolToString;
inherit (strings) floatToString; inherit (strings) floatToString;
inherit (lists) remove; inherit (lists) remove;
@ -1714,7 +1714,7 @@ in {
${ ${
concatStringsSep "\n" ( concatStringsSep "\n" (
if cfg.config.monitors.bindWorkspaces == "interlaced" 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 [] else []
) )
} }

View file

@ -98,6 +98,7 @@ in {
tooltip-format = " {bandwidthDownBits} , {bandwidthDownBits} "; tooltip-format = " {bandwidthDownBits} , {bandwidthDownBits} ";
tooltip-format-wifi = "{essid}: {bandwidthDownBits} , {bandwidthDownBits} "; tooltip-format-wifi = "{essid}: {bandwidthDownBits} , {bandwidthDownBits} ";
on-click = "nm-applet";
}; };
"battery" = { "battery" = {