fish: update config

diff --git a/config/fish/config.fish b/config/fish/config.fish
index 9795b1f4f907110838e7425792042aad42cb3c3a..88a1abde50bc3f3614b75dc680f2e1722ed3a9cd 100644 (file)
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -7,7 +7,7 @@ if status is-interactive
     set -g fish_greeting
 end
 
-if test "$DISPLAY" = "" -a "$XDG_VTNR" = 1
+if test "$DISPLAY" = "" -a "$WAYLAND_DISPLAY" = "" -a "$XDG_VTNR" = 1
     tbsm
 end
 

diff --git a/config/fish/functions/emergelog.fish b/config/fish/functions/emergelog.fish
index 8412d62678654cb93a2dc3e4f9cd470031570721..c1680e22fc26c5d5f08543b37a1c0641bce08e29 100644 (file)
--- a/config/fish/functions/emergelog.fish
+++ b/config/fish/functions/emergelog.fish
@@ -1,3 +1,3 @@
-function emergelog --wraps='sudo cat /var/log/emerge.log | grep completed' --wraps=sudo\ cat\ /var/log/emerge.log\ \|\ grep\ -i\ \"completed\\\|started\" --wraps=sudo\ cat\ /var/log/emerge.log\ \|\ grep\ -i\ \"started\\\|completed\\\|exiting\" --description alias\ emergelog=sudo\ cat\ /var/log/emerge.log\ \|\ grep\ -i\ \"started\\\|completed\\\|exiting\"
+function emergelog --wraps='sudo cat /var/log/emerge.log | grep completed' --wraps=sudo\ cat\ /var/log/emerge.log\ \|\ grep\ -i\ \"completed\\\|started\" --wraps=sudo\ cat\ /var/log/emerge.log\ \|\ grep\ -i\ \"started\\\|completed emerge\\\|exiting\" --description alias\ emergelog=sudo\ cat\ /var/log/emerge.log\ \|\ grep\ -i\ \"started\\\|completed\\\|exiting\"
   sudo cat /var/log/emerge.log | grep -i "started\|completed\|exiting" $argv; 
 end