zshrc, aliasrc changes

1 files changed, 38 insertions, 23 deletions

diff --git a/zsh/aliasrc b/zsh/aliasrc
index 0c8dff2..6aa57c2 100755
--- a/zsh/aliasrc
+++ b/zsh/aliasrc
@@ -5,45 +5,60 @@ alias -s \
 	{c,h,txt,md}=nvim
 
 ## Normal Aliases ##
+# Replacement programs
+alias \
+	sudo="doas" \
+	ls="exa --icons -a --group-directories-first" \
+	htop="htim" \
+	vim="nvim" \
+
 # Shorten program names
 alias \
-	xi="sudo xbps-install" \
-	xq="xbps-query -Rs" \
-	xr="sudo xbps-remove" \
 	spotify="flatpak run com.spotify.Client" \
-	xbs="xbacklight -set" \
 	smi="sudo make install" \
 	smci="sudo make clean install"
-# Replacement programs
+
+# Quick navigate to directories / open specific files
+alias \
+	zrc="cd ~/.config/zsh" \
+	xrc="cd ~/.config/x11" \
+	vrc="nvim ~/.config/nvim/init.vim"
+
+# Package management
+[ "$COMPUTER" = "laptop" ] && alias \
+	xi="sudo xbps-install" \
+	xq="xbps-query --search -R" \
+	xr="sudo xbps-remove"
+[ "$COMPUTER" = "desktop" ] && alias \
+	e="sudo emerge" \
+	eaum="sudo emerge --autounmask-continue"
+
+# Power scripts
 alias \
-	sudo="doas" \
 	halt="sudo poweroff" \
 	off="sudo poweroff" \
-	ls="exa --icons -a --group-directories-first" \
-	htop="htim" \
-	vim="nvim"
+	reboot="sudo reboot"
+[ "$COMPUTER" = "laptop" ] && alias \
+	zzz="sudo zzz" \
+	xbs="xbacklight -set"
+[ "$COMPUTER" = "desktop" ] && alias \
+	zzz="sudo s2ram"
+
 # Colorize command output
 alias \
-	grep="grep --color=auto -In" \
+	grep="grep --color=auto -I --line-numer --ignore-case" \
 	diff="diff --color=auto"
 	#ls="ls -hN --color=auto --group-directories-first" \
+
 # Verbosity / non-verbosity
 alias \
-	cp="cp -iv" \
-	mv="mv -iv" \
-	rm="rm -vI" \
-	mkd="mkdir -pv" \
+	cp="cp --interactive --verbose" \
+	mv="mv --interactive --verbose" \
+	rm="rm --interactive --verbose" \
+	mkd="mkdir --parents --verbose" \
 	br="br -h" \
 	ffmpeg="ffmpeg -hide_banner"
-# Auto-sudo
-alias \
-	zzz="sudo zzz" \
-	reboot="sudo reboot"
-# Quick navigate to directories / open specific files
-alias \
-	zrc="cd ~/.config/zsh" \
-	xrc="cd ~/.config/x11" \
-	vrc="nvim ~/.config/nvim/init.vim"
+
 # Make startx link to proper xinitrc location
 alias \
 	startx="startx ~/.config/x11/xinitrc" \