summaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
Diffstat (limited to 'sh')
-rw-r--r--sh/aliases23
-rw-r--r--sh/functions2
-rw-r--r--sh/profile18
3 files changed, 30 insertions, 13 deletions
diff --git a/sh/aliases b/sh/aliases
index 1b6606e..2e7ecf5 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -18,12 +18,18 @@ case `uname -s` in
alias ls="ls -h"
;;
"Linux")
- alias ls="ls -h $COLOR_FLAGS_GNU"
+ #alias ls="ls -h $COLOR_FLAGS_GNU"
+ type eza >/dev/null && alias ls="eza"
+ ;;
+ "Darwin")
+ type eza >/dev/null && alias ls="eza --color"
;;
esac
alias ll='ls -l'
-alias la='ls -A'
-alias lla='ls -lA'
+alias lt='ls -l --total-size'
+alias lts='ls -l --total-size --sort size --reverse'
+alias la='ls -a'
+alias lla='ls -la'
alias lb='lsblk'
alias md='mkdir -p'
alias ch='cd $HOME'
@@ -33,7 +39,14 @@ alias nv='nvim'
alias v='nvim'
## Change utils
-alias rm='rm -i'
+case `uname -s` in
+ "OpenBSD" | "Darwin")
+ alias rm='rm -i'
+ ;;
+ "Linux")
+ type trash-put >/dev/null && alias rm='trash-put'
+ ;;
+esac
alias cp='cp -i'
alias srsync='rsync -KPUcrtvyz'
@@ -79,7 +92,7 @@ alias s='sudo systemctl'
#alias ursm='env SVDIR="$HOME/.local/sv/" rsm'
# XDG dirs fix
-alias svn="svn --config-dir \"$XDG_CONFIG_HOME\"/subversion"
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
alias adb="HOME="$XDG_DATA_HOME"/android adb"
alias wget="wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\""
alias yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config"
diff --git a/sh/functions b/sh/functions
index e8515d8..e84ea51 100644
--- a/sh/functions
+++ b/sh/functions
@@ -72,7 +72,6 @@ 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
@@ -176,6 +175,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 effba41..845b559 100644
--- a/sh/profile
+++ b/sh/profile
@@ -22,6 +22,10 @@ export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
export LESSHISTFILE=-
# Fixing Paths
+export RENPY_PATH_TO_SAVES="$XDG_DATA_HOME"
+export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel
+export ZPLUG_HOME="$XDG_DATA_HOME/zplug"
+export DOTNET_CLI_HOME="$XDG_DATA_HOME"/dotnet
export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc
export ATOM_HOME="$XDG_DATA_HOME"/atom
export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
@@ -36,7 +40,7 @@ export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
export RXVT_SOCKET="$XDG_RUNTIME_DIR"/urxvtd
export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
-#export ZDOTDIR=$HOME/.config/zsh
+export ZDOTDIR=$HOME/.config/zsh
export CARGO_HOME="$XDG_DATA_HOME"/cargo
export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat
@@ -45,20 +49,20 @@ 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
export XAUTHORITY="$XDG_RUNTIME_DIR"/X11/Xauthority
-export VIMINIT="set nocp | source ${XDG_CONFIG_HOME:-$HOME.config}/vim/vimrc"
+#export VIMINIT="set nocp | source ${XDG_CONFIG_HOME:-$HOME.config}/vim/vimrc"
export ANDROID_USER_HOME="$XDG_DATA_HOME"/android
export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons"
export PYTHONSTARTUP="$XDG_CONFIG_HOME"/python/pythonrc
# Scaling
-export QT_AUTO_SCREEN_SCALE_FACTOR=0
-export QT_SCALE_FACTOR=1
-export QT_SCREEN_SCALE_FACTORS="1;1;1"
+#export QT_AUTO_SCREEN_SCALE_FACTOR=0
+#export QT_SCALE_FACTOR=1
+#export QT_SCREEN_SCALE_FACTORS="1;1;1"
export GDK_SCALE=1
export GDK_DPI_SCALE=1
@@ -73,7 +77,7 @@ export XKB_DEFAULT_OPTIONS=caps:escape
export EDITOR="nvim"
export READER="zathura"
export VISUAL="nvim"
-export TERMINAL="alacritty"
+export TERMINAL="st"
export BROWSER="browser"
export VIDEO="mpv"
export IMAGE="sxiv"