From 082f0bdcc50970c1c6315385802432199bf6cc90 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 10 Jan 2026 10:09:29 -0600 Subject: [PATCH] fix hyprrun --- .../home-manager/packages/scripts/default.nix | 22 +++++++++++++++++-- .../programs/terminal/zsh/default.nix | 5 ----- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/system/users/nathan/home-manager/packages/scripts/default.nix b/system/users/nathan/home-manager/packages/scripts/default.nix index 85c469e..bade622 100644 --- a/system/users/nathan/home-manager/packages/scripts/default.nix +++ b/system/users/nathan/home-manager/packages/scripts/default.nix @@ -7,7 +7,24 @@ }; }; - config = lib.mkIf config.homeconfig.scripts.enable { + config = lib.mkMerge [ + (lib.mkIf (config.homeconfig.hyprland.enable && config.homeconfig.scripts.enable) { + home.packages = [ + (pkgs.writeShellScriptBin "hyprrun" '' + uwsm app -- ''$@ + '') + ]; + }) + + (lib.mkIf (!config.homeconfig.hyprland.enable && config.homeconfig.scripts.enable) { + home.packages = [ + (pkgs.writeShellScriptBin "hyprrun" '' + eval "''$@" + '') + ]; + }) + + (lib.mkIf config.homeconfig.scripts.enable { home.packages = [ #scripts @@ -102,6 +119,7 @@ '') ]; - }; + }) + ]; } diff --git a/system/users/nathan/home-manager/programs/terminal/zsh/default.nix b/system/users/nathan/home-manager/programs/terminal/zsh/default.nix index 9d7a926..be18b6a 100644 --- a/system/users/nathan/home-manager/programs/terminal/zsh/default.nix +++ b/system/users/nathan/home-manager/programs/terminal/zsh/default.nix @@ -21,11 +21,6 @@ python = "python3.13"; python3 = "python3.13"; - - hyprrun = with lib; mkMerge [ - (mkIf config.homeconfig.hyprland.enable "uwsm app --") - (mkIf (!config.homeconfig.hyprland.enable) ";") - ]; }; history = {