summaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
Diffstat (limited to 'sh')
-rw-r--r--sh/aliases6
-rw-r--r--sh/functions120
-rw-r--r--sh/profile7
3 files changed, 68 insertions, 65 deletions
diff --git a/sh/aliases b/sh/aliases
index 93784e7..2e7ecf5 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -19,10 +19,10 @@ case `uname -s` in
;;
"Linux")
#alias ls="ls -h $COLOR_FLAGS_GNU"
- alias ls="eza"
+ type eza >/dev/null && alias ls="eza"
;;
"Darwin")
- alias ls="eza --color"
+ type eza >/dev/null && alias ls="eza --color"
;;
esac
alias ll='ls -l'
@@ -44,7 +44,7 @@ case `uname -s` in
alias rm='rm -i'
;;
"Linux")
- alias rm='trash-put'
+ type trash-put >/dev/null && alias rm='trash-put'
;;
esac
alias cp='cp -i'
diff --git a/sh/functions b/sh/functions
index e8515d8..e7270bc 100644
--- a/sh/functions
+++ b/sh/functions
@@ -57,67 +57,68 @@ R - /
U. - /usr
Us - /usr/share
V. - /var
-aw - /home/zachir/.config/awesome
-b. - /home/zachir/.local/bin
-bb - /home/zachir/.local/bin/blocks
-bf - /home/zachir/.local/bin/slatpak-sc
-bg - /home/zachir/.local/bin/generics
-bi - /home/zachir/.local/bin/ignore
-bsc - /home/zachir/.local/bin/scripts
-bsh - /home/zachir/.local/bin/shortcmds
-bsp - /home/zachir/.local/bin/sp
-c - /home/zachir/.config
-db - /home/zachir/.local/src/dwmbar
-dc - /home/zachir/Documents
-dl - /home/zachir/.local/src/dwl
-dm - /home/zachir/.local/src/dmenu
-do - /home/zachir/Downloads
-dp - /home/zachir/Downloads/plugin/zachir_librem.one
-dw - /home/zachir/Downloads/wine
-e - /home/zachir/Desktop
-f - /home/zachir/.var/app
-h - /home/zachir/.config/hypr
-lb - /home/zachir/.local/bin
-lc - /home/zachir/Games/cache
-lf - /home/zachir/.config/lf
-ls - /home/zachir/.local/share
-n3 - /home/zachir/.vst3/native
-ns - /home/zachir/.vst/native
-nv - /home/zachir/.config/nvim
-p - /home/zachir/Pictures
-qb - /home/zachir/.config/qutebrowser
-qp - /home/zachir/.local/share/qutebrowser-profiles
-re - /home/zachir/.local/src
+aw - $XDG_CONFIG_HOME/awesome
+b. - $HOME/.local/bin
+bb - $HOME/.local/bin/blocks
+bf - $HOME/.local/bin/slatpak-sc
+bg - $HOME/.local/bin/generics
+bi - $HOME/.local/bin/ignore
+bsc - $HOME/.local/bin/scripts
+bsh - $HOME/.local/bin/shortcmds
+bsp - $HOME/.local/bin/sp
+c - $XDG_CONFIG_HOME
+db - $SRCDIR/dwmbar
+dc - $XDG_DOCUMENTS_DIR
+dl - $SRCDIR/dwl
+dm - $SRCDIR/dmenu
+do - $XDG_DOWNLOAD_DIR
+dp - $XDG_DOWNLOAD_DIR/plugin/zachir_librem.one
+dw - $XDG_DOWNLOAD_DIR/wine
+e - $XDG_DESKTOP_DIR
+f - $HOME/.var/app
+h - $XDG_CONFIG_HOME/hypr
+lb - $HOME/.local/bin
+lc - $HOME/Games/cache
+lf - $XDG_CONFIG_HOME/lf
+ls - $XDG_DATA_HOME
+n3 - $HOME/.vst3/native
+ns - $HOME/.vst/native
+nv - $XDG_CONFIG_HOME/nvim
+p - $XDG_PICTURES_DIR
+qb - $XDG_CONFIG_HOME/qutebrowser
+qp - $XDG_DATA_HOME/qutebrowser-profiles
+re - $SRCDIR
rs - /etc/runit/sv
-sc - /home/zachir/.local/bin/scripts
-sh - /home/zachir/.config/sh
-sl - /home/zachir/.local/src/slock
+sc - $HOME/.local/bin/scripts
+sh - $XDG_CONFIG_HOME/sh
+sl - $SRCDIR/slock
ss - /etc/s6/sv
-st - /home/zachir/.local/src/st
-sx - /home/zachir/.config/sxhkd
-tr - /home/zachir/.local/share/Trash/files
-urs - /home/zachir/.runit/sv
-v3. - /home/zachir/.vst3
-v3n - /home/zachir/.vst3/native
-v3y - /home/zachir/.vst3/yabridge
-v. - /home/zachir/var
-vi - /home/zachir/Videos
-vsn - /home/zachir/.vst/native
-vs. - /home/zachir/.vst
-vsy - /home/zachir/.vst/yabridge
-wdo - /home/zachir/.local/share/wineprefixes/default/drive_c/users/zachir/Downloads
-wa - /home/zachir/.local/src/wallpapers
-wd - /home/zachir/.local/share/wineprefixes/default
-wr - /home/zachir/.local/share/wineprefixes
-wv3 - /home/zachir/.winvst3
-wvs - /home/zachir/.winvst
-ww - /home/zachir/.local/share/wineprefixes/work
-x - /home/zachir/.config/X11
-y3 - /home/zachir/.vst3/yabridge
-yb - /home/zachir/.cache/yay
-yc - /home/zachir/.config/yay
-zs - /home/zachir/.config/zsh
-zx - /home/zachir/Documents/zachir.xyz
+st - $SRCDIR/st
+sx - $XDG_CONFIG_HOME/sxhkd
+tr - $XDG_DATA_HOME/Trash/files
+urs - $HOME/.runit/sv
+v3. - $HOME/.vst3
+v3n - $HOME/.vst3/native
+v3y - $HOME/.vst3/yabridge
+v. - $HOME/var
+vi - $XDG_VIDEOS_DIR
+vsn - $HOME/.vst/native
+vs. - $HOME/.vst
+vsy - $HOME/.vst/yabridge
+vw\t- $XDG_DATA_HOME/vimwiki
+wdo - $WINEPREFIX/drive_c/users/zachir/Downloads
+wa - $SRCDIR/wallpapers
+wd - $WINEPREFIX
+wr - $WINEROOT
+wv3 - $HOME/.winvst3
+wvs - $HOME/.winvst
+ww - $WINEROOT/work
+x - $XDG_CONFIG_HOME/X11
+y3 - $HOME/.vst3/yabridge
+yb - $XDG_CACHE_HOME/yay
+yc - $XDG_CONFIG_HOME/yay
+zs - $XDG_CONFIG_HOME/zsh
+zx - $XDG_DOCUMENTS_DIR/zachir.xyz
" ;;
# STOPPRINT
# STARTPATHS
@@ -176,6 +177,7 @@ zx - /home/zachir/Documents/zachir.xyz
"vsn") cd "$HOME/.vst/native" ;;
"vs.") cd "$HOME/.vst" ;;
"vsy") cd "$HOME/.vst/yabridge" ;;
+"vw") cd "$XDG_DATA_HOME/vimwiki" ;;
"wdo") cd "$WINEPREFIX/drive_c/users/$USER/Downloads" ;;
"wa") cd "$SRCDIR/wallpapers" ;;
"wd") cd "$WINEPREFIX" ;;
diff --git a/sh/profile b/sh/profile
index e17f02d..68a1155 100644
--- a/sh/profile
+++ b/sh/profile
@@ -2,13 +2,14 @@
export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"}
export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"}
export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"}
-. "$HOME/.config/user-dirs.dirs"
+[ -f "$XDG_CONFIG_HOME/user-dirs.dirs" ] && . "$HOME/.config/user-dirs.dirs"
export XDG_CURRENT_DESKTOP="Hyprland"
export XDG_DOCUMENTS_DIR=${HOME}/Documents
export XDG_DOWNLOAD_DIR=${HOME}/Downloads
export XDG_DESKTOP_DIR=${HOME}/Desktop
+export XDG_PICTURES_DIR=${HOME}/Pictures
export XDG_STATE_HOME="${HOME}/.local/state"
-export XDG_VIDEOS_DIR=${HOME}/Videos
+export XDG_VIDEOS_DIR=${HOME}/Movies
export XDG_DATA_DIRS="${XDG_DATA_DIRS}:$HOME/.nix-profile/share"
@@ -49,7 +50,7 @@ export NOTMUCH_CONFIG="$XDG_CONFIG_HOME"/notmuch/notmuchrc
export NMBGIT="$XDG_DATA_HOME"/notmuch/nmbug
export WINEROOT="$XDG_DATA_HOME"/wineprefixes
export WINEPREFIX="$WINEROOT"/default
-export MPD_HOST="$XDG_CONFIG_HOME/mpd/socket"
+export MPD_HOST="127.0.0.1"
export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
export RENPY_PATH_TO_SAVES="$XDG_DATA_HOME"
export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc