From 134876505f2505884fcb9a547c6a03f06f5f93b2 Mon Sep 17 00:00:00 2001
From: DustVoice <info@dustvoice.de>
Date: Mon, 17 Aug 2020 17:00:34 +0200
Subject: [PATCH] Create sane alias handling within zsh

---
 .gitignore |  1 +
 .zsh_alias | 14 ++++++++++++++
 .zshenv    | 11 +++--------
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 .zsh_alias

diff --git a/.gitignore b/.gitignore
index cf19e71c..2f0c2eaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 !/.Xmodmap.example
 !/.Xresources
 !/.xsession
+!/.zsh_alias
 !/.zshenv
 !/.zshpath.example
 !/.zshrc
diff --git a/.zsh_alias b/.zsh_alias
new file mode 100644
index 00000000..3052c766
--- /dev/null
+++ b/.zsh_alias
@@ -0,0 +1,14 @@
+alias la='ls -lahF'
+alias ll='ls -lhF'
+alias ls='ls -F --color=tty'
+alias lsa='ls -aF'
+alias layout='xkblayout-state print "%s(%v)" && echo -n "\n"'
+alias picom-default='picom -bGC --backend glx --unredir-if-possible-delay 1000 --vsync'
+alias screenkey-obs='screenkey --no-systray -t 2 -p fixed -s small -g 960x88+960+4 --key-mode composed --bak-mode full --mods-mode normal -f Hack --font-color "#f8f8f2" --bg-color "#44475a" --opacity "1.0"'
+alias tmate-obs='tmate -k tmk-ET35fx5m9cA7cxOt4jjWkSmaOy -r DustVoice'
+alias xfce-polkit='/usr/lib/xfce-polkit/xfce-polkit'
+alias davinci-resolve='/opt/resolve/bin/resolve'
+
+alias rofi-scripts='alias | sed -e "s/=.*//"'
+
+alias lock-screen='xset 600 60 && env XSECURELOCK_AUTH_BACKGROUND_COLOR=rgb:28/2a/36 XSECURELOCK_AUTH_FOREGROUND_COLOR=rgb:f8/f8/f2 XSECURELOCK_AUTH_TIMEOUT=10 XSECURELOCK_BLANK_TIMEOUT=-1 XSECURELOCK_BLANK_DPMS_STATE=on XSECURELOCK_DISCARD_FIRST_KEYPRESS=1 XSECURELOCK_PASSWORD_PROMPT=cursor XSECURELOCK_SHOW_DATETIME=1 XSECURELOCK_SHOW_HOSTNAME=1 XSECURELOCK_SHOW_USERNAME=1 xsecurelock &'
diff --git a/.zshenv b/.zshenv
index b0ad6556..98ce4509 100644
--- a/.zshenv
+++ b/.zshenv
@@ -48,11 +48,6 @@ export XDG_CONFIG_HOME="$HOME/.config"
 
 export WINIT_X11_SCALE_FACTOR=1
 
-alias layout='xkblayout-state print "%s %v"'
-alias picom-default='picom -bgc --backend glx --unredir-if-possible-delay 1000 --vsync'
-alias screenkey-obs='screenkey --no-systray -t 2 -p fixed -s small -g 960x88+960+4 --key-mode composed --bak-mode full --mods-mode normal -f Hack --font-color "#f8f8f2" --bg-color "#44475a" --opacity "1.0"'
-alias tmate-obs='tmate -k tmk-et35fx5m9ca7cxot4jjwksmaoy -r dustvoice'
-alias xfce-polkit='/usr/lib/xfce-polkit/xfce-polkit'
-alias davinci-resolve='/opt/resolve/bin/resolve'
-
-alias rofi-scripts='alias | sed -e "s/=.*//"'
+if [[ -f $HOME/.zsh_alias ]]; then
+    source $HOME/.zsh_alias
+fi