From a6e13a12533bbd1c4412676ba6bba754733746e3 Mon Sep 17 00:00:00 2001 From: Myned Date: Fri, 27 Sep 2024 15:12:15 -0500 Subject: [PATCH] nix: use hm path for local binaries Signed-off-by: Myned --- options/custom/desktops/hyprland/binds.nix | 8 ++++---- options/custom/desktops/hyprland/rules.nix | 2 +- options/custom/desktops/hyprland/settings.nix | 8 ++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/options/custom/desktops/hyprland/binds.nix b/options/custom/desktops/hyprland/binds.nix index 0665cd9..c5783ef 100644 --- a/options/custom/desktops/hyprland/binds.nix +++ b/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 = "~/.local/bin/inhibit"; + inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source; 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 = "~/.local/bin/vm"; - vrr = "~/.local/bin/vrr"; + 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; walker = "${config.home-manager.users.${config.custom.username}.programs.walker.package}/bin/walker"; waydroid = "${pkgs.waydroid}/bin/waydroid"; - zoom = "~/.local/bin/zoom"; + zoom = config.home-manager.users.${config.custom.username}.home.file.".local/bin/zoom".source; cfg = config.custom.desktops.hyprland.binds; in { diff --git a/options/custom/desktops/hyprland/rules.nix b/options/custom/desktops/hyprland/rules.nix index d85f38d..849c161 100644 --- a/options/custom/desktops/hyprland/rules.nix +++ b/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 = "~/.local/bin/launch"; + launch = config.home-manager.users.${config.custom.username}.home.file.".local/bin/launch".source; loupe = "${pkgs.loupe}/bin/loupe"; onlyoffice = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors"; pgrep = "${pkgs.procps}/bin/pgrep"; diff --git a/options/custom/desktops/hyprland/settings.nix b/options/custom/desktops/hyprland/settings.nix index 2a8384e..e1ce435 100644 --- a/options/custom/desktops/hyprland/settings.nix +++ b/options/custom/desktops/hyprland/settings.nix @@ -8,18 +8,14 @@ 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 {