address

@@ -2,4 +2,4 @@
 khard email "$@" | grep -E -o "\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"
 
 s="$@"
-[ "$#" -gt 0 ] && notmuch address "$s" | grep -i "$s"
+[ "$#" -gt 0 ] && notmuch address "$@" | grep -i "$s"

emails

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# We setup xauthority file to display stuff
-xauthority="$(cat ~/.Xauthority)"
-exec sudo -u emails  sh -c "echo \"$xauthority\" > ~/.Xauthority && . ~/.bashrc && exec aerc"

lock_and_suspend

@@ -1,3 +1,3 @@
 #!/bin/sh
 # Lock screen and suspend if enabled in config file
-i3lock -e -c 000000 -u && [ -z "$(grep off "/run/user/1000/enable_suspend")" ] && systemctl suspend
+DISPLAY=:0 i3lock -e -c 000000 -u && [ -z "$(grep off "/run/user/1000/enable_suspend")" ] && systemctl suspend

switch-wifi

@@ -0,0 +1,8 @@
+#!/bin/sh
+if [[ "$(nmcli radio wifi)" = "enabled" ]] ; then
+	nmcli radio wifi off
+	notify-send "Wifi is now" off
+else
+	nmcli radio wifi on
+	notify-send "Wifi is now" on
+fi

toggle_suspend

@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ -z "$(grep off "$XDG_RUNTIME_DIR/enable_suspend")" ] ; then
+if [ -z "$(grep off "/run/user/1000/enable_suspend")" ] ; then
 	echo off > "$XDG_RUNTIME_DIR/enable_suspend"
 	notify-send "Sleep mode is now" "off"
 else

wifi_chooser

@@ -2,32 +2,6 @@
 # choose a wifi signal in range and try to connect to it
 
 verb=0
-action=start
-
-while true ; do
-    case "$1" in
-    	"-v")
-    		verb=1
-    		;;
-    	"stop")
-    		action=stop
-    		;;
-		"start") ;;
-		"") break ;;
-    	*)
-			echo "Invalid parameter '$1'"
-    		break;;
-    esac
-    shift
-done
-# Remaining args are garbage
-if [ "$#" -ne 0 ] ; then
-	echo "Usage: $0 [-v] [start|stop]"
-	echo "-v verbose output"
-	echo "start or stop the wifi"
-	exit -1
-fi
-
 
 title="Wifi Selector"
 id=""
@@ -39,18 +13,10 @@ notify () {
 	fi
 }
 
-# Stop the wifi if asked
-if [ "$action" == "stop" ] ; then
-	nmcli radio wifi off
-	notify "Wifi stopped"
-	exit "$?"
-fi
-
-# Else, start it if needed
 if ( nmcli radio wifi | grep disabled > /dev/null ) ; then
  	notify "Turning on"
  	nmcli radio wifi on 
- 	sleep 2
+ 	sleep 1
 fi
 
 notify "Scanning networks in range..."