changed loading of aliases to be more portable

3 files changed, 13 insertions, 19 deletions

diff --git a/zsh/aliasrc b/zsh/aliasrc
index 87300fe..beb232a 100755
--- a/zsh/aliasrc
+++ b/zsh/aliasrc
@@ -31,27 +31,12 @@ alias \
 	cdw="cd ~/.local/src/sites" \
 	hw="cd ~/docs/school" \
 
-# Package management
-[ "$COMPUTER" = "laptop" ] && alias \
-	xi="sudo xbps-install" \
-	xq="xbps-query -R --search" \
-	xr="sudo xbps-remove"
-[ "$COMPUTER" = "desktop" ] && alias \
-	e="sudo emerge" \
-	eaum="sudo emerge --autounmask-continue" \
-
 # Power scripts
 alias \
-	halt="sudo poweroff" \
-	off="sudo poweroff" \
-	reboot="sudo reboot" \
-
-[ "$COMPUTER" = "laptop" ] && alias \
-	zzz="sudo zzz" \
-	xbs="xbacklight -set" \
-
-[ "$COMPUTER" = "desktop" ] && alias \
-	zzz="sudo s2ram" \
+	halt="launch shutdown" \
+	off="launch shutdown" \
+	reboot="launch reboot" \
+	zzz="launch suspend" \
 
 # Colorize command output
 alias \
diff --git a/zsh/zprofile.G3N2 b/zsh/zprofile.G3N2
index 5aca0b9..eedd9d0 100644
--- a/zsh/zprofile.G3N2
+++ b/zsh/zprofile.G3N2
@@ -3,4 +3,8 @@
 export WIFIDEV="wlp2s0f0u3"
 export ETHEDEV="eno1"
 export PATH="/home/timmy/scripts/pkgmgt/emerge:$PATH"
+alias \
+	e="sudo emerge" \
+	eaum="sudo emerge --autounmask-continue" \
+
 source /home/timmy/.config/zsh/zprofile.base
diff --git a/zsh/zprofile.voidx250 b/zsh/zprofile.voidx250
index 96e6ec4..19ff378 100644
--- a/zsh/zprofile.voidx250
+++ b/zsh/zprofile.voidx250
@@ -3,4 +3,9 @@
 export WIFIDEV="wlp3s0"
 export ETHEDEV="enp0s25"
 export PATH="/home/timmy/scripts/pkgmgt/xbps:$PATH"
+alias \
+	xi="sudo xbps-install" \
+	xq="xbps-query -R --search" \
+	xr="sudo xbps-remove" \
+
 source /home/timmy/.config/zsh/zprofile.base