diff --git a/home/sway.nix b/home/sway.nix index 4fb629f..a2ddef2 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -7,14 +7,14 @@ ... }: let cliphist_sway = pkgs.writeShellScriptBin "cliphist_sway" '' - ${pkgs.cliphist}/bin/cliphist list | \ - ${pkgs.wofi}/bin/wofi --dmenu --insensitive | \ - ${pkgs.cliphist}/bin/cliphist decode | \ + ${lib.getExe pkgs.cliphist} list | \ + ${lib.getExe pkgs.wofi} --dmenu --insensitive | \ + ${lib.getExe pkgs.cliphist} decode | \ ${pkgs.wl-clipboard}/bin/wl-copy ''; screenshot_clip = pkgs.writeShellScriptBin "screenshot_clip" '' - GEOM="$(${pkgs.slurp}/bin/slurp -d)" - ${pkgs.grim}/bin/grim -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy + GEOM="$(${lib.getExe pkgs.slurp} -d)" + ${lib.getExe pkgs.grim} -g "$GEOM" - | ${pkgs.wl-clipboard}/bin/wl-copy ''; swaysw = inputs.swaysw.packages.${system}.swaysw; viber = pkgs.callPackage ../packages/viber/default.nix {}; @@ -75,7 +75,7 @@ in { style = "Bold Semi-Condensed"; size = 12.0; }; - statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ~/.config/i3status-rust/config-top.toml"; + statusCommand = "${lib.getExe pkgs.i3status-rust} ~/.config/i3status-rust/config-top.toml"; } ]; @@ -126,11 +126,11 @@ in { "Alt+bracketleft" = "focus output left"; "Mod4+l" = '' - exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${pkgs.python3}/bin/python3''; - "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${pkgs.zapzap}/bin/zapzap"; + exec ${pkgs.sway}/bin/swaymsg [app_id="python3"] scratchpad show || exec ${term} -a python3 ${lib.getExe pkgs.python3}''; + "Mod4+h" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.rtosta.zapzap] scratchpad show || exec ${lib.getExe pkgs.zapzap}"; "Mod4+j" = "exec ${pkgs.sway}/bin/swaymsg [app_id=com.viber] scratchpad show || exec ${viber}/bin/viber"; "Mod4+y" = '' - exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${pkgs.pulsemixer}/bin/pulsemixer''; + exec ${pkgs.sway}/bin/swaymsg [app_id="pulsemixer"] scratchpad show || exec ${term} -a pulsemixer ${lib.getExe pkgs.pulsemixer}''; "Mod4+p" = "exec ${lib.getExe pkgs.tessen} -a copy"; }; };