Fixed merge conflict
This commit is contained in:
+1
-1
@@ -20,7 +20,7 @@ _comp_options+=(globdots) # include hidden files
|
||||
|
||||
autoload -U colors && colors
|
||||
|
||||
source $HOME/.config/zsh/variables
|
||||
source /etc/zsh/zshenv
|
||||
source $HOME/.config/zsh/aliases
|
||||
source $HOME/.config/zsh/zsh-autosuggestions.zsh
|
||||
source $HOME/.config/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
|
||||
@@ -11,6 +11,8 @@ alias live-server='live-server --port=1111 --host=127.0.0.1 --no-css-inject'
|
||||
alias pac='doas pacman'
|
||||
alias minecraft-launcher='minecraft-launcher --workDir /home/johannes/.local/share/minecraft'
|
||||
alias enablebluetooth='doas modprobe btusb'
|
||||
alias virt-manager='/bin/sudo -i virt-manager'
|
||||
|
||||
# Typos
|
||||
alias al="ls -lAh --color=auto"
|
||||
alias s=""
|
||||
|
||||
Reference in New Issue
Block a user