From f8081aebc766e92274b24456ea7bd3af402dfcd2 Mon Sep 17 00:00:00 2001 From: Myned Date: Sat, 15 Feb 2025 16:02:30 -0600 Subject: [PATCH] nix: use store paths Signed-off-by: Myned --- options/custom/desktops/hyprland/keywords.nix | 6 ++++-- options/custom/desktops/hyprland/plugins.nix | 2 ++ options/custom/desktops/hyprland/rules.nix | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/options/custom/desktops/hyprland/keywords.nix b/options/custom/desktops/hyprland/keywords.nix index d31047c..98e8860 100644 --- a/options/custom/desktops/hyprland/keywords.nix +++ b/options/custom/desktops/hyprland/keywords.nix @@ -9,6 +9,7 @@ with lib; let hm = config.home-manager.users.${config.custom.username}; audio = hm.home.file.".local/bin/audio".source; + gnome-text-editor = getExe pkgs.gnome-text-editor; grep = getExe pkgs.gnugrep; left = hm.home.file.".local/bin/left".source; loupe = getExe pkgs.loupe; @@ -17,6 +18,7 @@ with lib; let sway-audio-idle-inhibit = getExe pkgs.sway-audio-idle-inhibit; uwsm = getExe pkgs.uwsm; virsh = getExe' config.virtualisation.libvirtd.package "virsh"; + wallpaper = hm.home.file.".local/bin/wallpaper".source; command = command: "${uwsm} app -- ${command}"; in { @@ -48,7 +50,7 @@ in { left_handed = true; middle_button_emulation = true; natural_scroll = true; - sensitivity = -0.6; + sensitivity = -0.7; }) (devices ["logitech-m570"] { @@ -85,7 +87,7 @@ in { hm.home.sessionVariables ) ++ [ - "EDITOR, gnome-text-editor" + "EDITOR, ${gnome-text-editor}" ]; # https://wiki.hyprland.org/Configuring/Keywords/#executing diff --git a/options/custom/desktops/hyprland/plugins.nix b/options/custom/desktops/hyprland/plugins.nix index aff4ac0..23ec514 100644 --- a/options/custom/desktops/hyprland/plugins.nix +++ b/options/custom/desktops/hyprland/plugins.nix @@ -6,8 +6,10 @@ }: with lib; let cfg = config.custom.desktops.hyprland.plugins; + hm = config.home-manager.users.${config.custom.username}; hyprctl = getExe' config.programs.hyprland.package "hyprctl"; + minimize = hm.home.file.".local/bin/minimize".source; uwsm = getExe pkgs.uwsm; command = command: "${uwsm} app -- ${command}"; diff --git a/options/custom/desktops/hyprland/rules.nix b/options/custom/desktops/hyprland/rules.nix index 1ddf6a8..cfb6060 100644 --- a/options/custom/desktops/hyprland/rules.nix +++ b/options/custom/desktops/hyprland/rules.nix @@ -9,7 +9,6 @@ with lib; let hm = config.home-manager.users.${config.custom.username}; _1password = getExe config.programs._1password-gui.package; - gamescope = getExe config.programs.gamescope.package; ghostty = getExe hm.programs.ghostty.package; launch = hm.home.file.".local/bin/launch".source; libreoffice = getExe config.custom.programs.libreoffice.package; @@ -18,9 +17,9 @@ with lib; let uwsm = getExe pkgs.uwsm; virt-manager = getExe pkgs.virt-manager; waydroid = getExe pkgs.waydroid; + youtube-music = getExe pkgs.youtube-music; command = command: "${uwsm} app -- ${command}"; - youtube-music = getExe pkgs.youtube-music; in { options.custom.desktops.hyprland.rules = { enable = mkOption {default = false;};