summaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
authoryuzu-eva <cafebabe@disroot.org>2024-12-20 12:39:17 +0100
committeryuzu-eva <cafebabe@disroot.org>2024-12-20 12:39:17 +0100
commit2fa513acc7eaf72a158e26bc46f5ff4dec4a2b86 (patch)
treebcc66b448d13d9e3d17d16e15fe0bced1ca27426 /.config
parent59c4e1f54ba1d2453f02b326c502d47ff16f9855 (diff)
fix
Diffstat (limited to '.config')
-rw-r--r--.config/shell/aliasrc5
1 files changed, 0 insertions, 5 deletions
diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index abe48ce..459a714 100644
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -19,12 +19,7 @@ alias tmn='tmux new-session -A -s'
alias wgu='sudo wg-quick up /etc/wireguard/wg0.conf'
alias wgd='sudo wg-quick down /etc/wireguard/wg0.conf'
alias zzz='sudo zzz'
-<<<<<<< HEAD
-
-alias mvsave='rm Mizuki.ds2party.bak && mv Mizuki.ds2party Mizuki.ds2party.bak && mv Mizuki.ds2party.tmp Mizuki.ds2party'
-=======
alias ska="ps -u $USER | awk 'NR > 1 { print $1 }' | xargs -t kill"
->>>>>>> b1d6a43 (updated and removed some aliases)
# compiler
alias clang='clang -march=native -O3 -flto=thin'