From 35c527c42120e393c2777dd89bebca85b4a464d4 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 10 Jan 2025 13:16:25 -0600 Subject: [PATCH] Fix terminal resizing causing command-complete notifications --- modules/home-manager/fish/interactiveShellInit.fish | 9 ++++++++- modules/nixos/default.nix | 7 ++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/home-manager/fish/interactiveShellInit.fish b/modules/home-manager/fish/interactiveShellInit.fish index b58f71b..85844c1 100644 --- a/modules/home-manager/fish/interactiveShellInit.fish +++ b/modules/home-manager/fish/interactiveShellInit.fish @@ -1,3 +1,5 @@ +set this_shell_should_notify 1 + # prompt function get_hostname if test (uname) = Linux || test (uname) = Darwin @@ -61,8 +63,9 @@ end function _last_cmd_duration set_color -b normal green set -q CMD_DURATION && printf " %dms" $CMD_DURATION - if test $CMD_DURATION -gt 5000 + if test $CMD_DURATION -gt 5000 && test $this_shell_should_notify = 1 printf "\e]777;notify;%s;%s\e\\" "WezTerm: Command Finished" (history --max 1) + set this_shell_should_notify 0 end end @@ -115,6 +118,10 @@ function _prompt_prefix printf "# " end +function preexec --on-event fish_preexec + set this_shell_should_notify 1 +end + function fish_prompt set last_cmd_status $status _prompt_marker diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 88bd885..69cc8a1 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -522,7 +522,6 @@ nodePackages.yaml-language-server xh curl - google-chrome ]; hardware.gpgSmartcards.enable = true; @@ -588,10 +587,6 @@ enable = true; }; - programs.chromium = { - enable = true; - }; - programs.btop = { enable = true; package = pkgs.btop.override { @@ -701,6 +696,8 @@ }; environment = { systemPackages = with pkgs; [ + firefox + google-chrome libnotify slides slack