options/custom/desktops/hyprland/binds.nix

@@ -14,7 +14,7 @@ with lib; let
   hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock";
   hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
-  inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source;
+  inhibit = "~/.local/bin/inhibit";
   jq = "${pkgs.jq}/bin/jq";
   kill = "${pkgs.procps}/bin/kill";
   kitty = "${config.home-manager.users.${config.custom.username}.programs.kitty.package}/bin/kitty";
@@ -37,11 +37,11 @@ with lib; let
   systemctl = "${pkgs.systemd}/bin/systemctl";
   toggle = "~/.local/bin/toggle";
   virt-manager = "${config.programs.virt-manager.package}/bin/virt-manager";
-  vm = config.home-manager.users.${config.custom.username}.home.file.".local/bin/vm".source;
-  vrr = config.home-manager.users.${config.custom.username}.home.file.".local/bin/vrr".source;
+  vm = "~/.local/bin/vm";
+  vrr = "~/.local/bin/vrr";
   walker = "${config.home-manager.users.${config.custom.username}.programs.walker.package}/bin/walker";
   waydroid = "${pkgs.waydroid}/bin/waydroid";
-  zoom = config.home-manager.users.${config.custom.username}.home.file.".local/bin/zoom".source;
+  zoom = "~/.local/bin/zoom";
 
   cfg = config.custom.desktops.hyprland.binds;
 in {

options/custom/desktops/hyprland/rules.nix

@@ -9,7 +9,7 @@ with lib; let
   gamescope = "${config.programs.gamescope.package}/bin/gamescope";
   hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   kitty = "${config.home-manager.users.${config.custom.username}.programs.kitty.package}/bin/kitty";
-  launch = config.home-manager.users.${config.custom.username}.home.file.".local/bin/launch".source;
+  launch = "~/.local/bin/launch";
   loupe = "${pkgs.loupe}/bin/loupe";
   onlyoffice = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors";
   pgrep = "${pkgs.procps}/bin/pgrep";

options/custom/desktops/hyprland/settings.nix

@@ -8,14 +8,18 @@ with lib; let
   _1password = "${config.programs._1password-gui.package}/bin/1password";
   audio = config.home-manager.users.${config.custom.username}.home.file.".local/bin/audio".source;
   clipse = "${pkgs.clipse}/bin/clipse";
-  firefox-esr = "${config.home-manager.users.${config.custom.username}.programs.firefox.finalPackage}/bin/firefox-esr";
+  firefox-esr = "${
+    config.home-manager.users.${config.custom.username}.programs.firefox.finalPackage
+  }/bin/firefox-esr";
   left = config.home-manager.users.${config.custom.username}.home.file.".local/bin/left".source;
   pkill = "${pkgs.procps}/bin/pkill";
   rm = "${pkgs.coreutils}/bin/rm";
   sleep = "${pkgs.coreutils}/bin/sleep";
   sway-audio-idle-inhibit = "${pkgs.sway-audio-idle-inhibit}/bin/sway-audio-idle-inhibit";
   systemctl = "${pkgs.systemd}/bin/systemctl";
-  waybar = "${config.home-manager.users.${config.custom.username}.programs.waybar.package}/bin/waybar";
+  waybar = "${
+    config.home-manager.users.${config.custom.username}.programs.waybar.package
+  }/bin/waybar";
 
   cfg = config.custom.desktops.hyprland.settings;
 in {

options/custom/scripts/zoom.sh

@@ -4,25 +4,19 @@
 #
 # https://github.com/sigoden/argc
 
-# @arg factor=1.0 Absolute or relative factor to zoom to, empty to reset
+# @arg factor=1 Absolute or relative factor to zoom to, empty to reset
 
 eval "$(argc --argc-eval "$0" "$@")"
 
 factor="$(hyprctl -j getoption cursor:zoom_factor | jq -r .float)" # Current factor
 
-# Match regex for zero-padded decimals
-if [[ "${argc_factor:-}" =~ ^[+|-][0-9]\.[0-9]+$ ]]; then
+if [[ "${argc_factor:-}" =~ ^[+|-][1-9]\.*[0-9]*$ ]]; then
   factor="$(bc <<< "$factor ${argc_factor}")"
-elif [[ "${argc_factor:-}" =~ ^[0-9]\.[0-9]+$ ]]; then
+elif [[ "${argc_factor:-}" =~ ^[1-9]\.*[0-9]*$ ]]; then
   factor="${argc_factor:-}"
 else
-  echo "Factor must be an absolute or relative decimal between 1.0 and 9.9"
+  echo "Factor must be an absolute or relative decimal between 1 and 9"
   exit 1
 fi
 
-# Reset if outside range
-if (("$(bc <<< "$factor < 1")")); then
-  factor=1.0
-fi
-
 hyprctl keyword cursor:zoom_factor "$factor"