summaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
Diffstat (limited to 'sh')
-rw-r--r--sh/aliases23
-rw-r--r--sh/profile30
2 files changed, 42 insertions, 11 deletions
diff --git a/sh/aliases b/sh/aliases
index 1b6606e..93784e7 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"
+ alias ls="eza"
+ ;;
+ "Darwin")
+ 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")
+ 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/profile b/sh/profile
index de79a65..45911b5 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
@@ -50,20 +54,20 @@ 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
# Theming
-export QT_QPA_PLATFORMTHEME=qt5ct
+export QT_QPA_PLATFORMTHEME=qt6ct
# Fix wayland stuff
export MOZ_ENABLE_WAYLAND=1
@@ -130,3 +134,17 @@ addtopath "/var/lib/flatpak/exports/bin"
unset -f addtopath
unset USERPATH
unset PATHS
+
+command_not_found_handle() {
+# don't run if not in a container
+ if [ ! -e /run/.containerenv ] && [ ! -e /.dockerenv ]; then
+ exit 127
+ fi
+
+ distrobox-host-exec "${@}"
+}
+if [ -n "${ZSH_VERSION-}" ]; then
+ command_not_found_handler() {
+ command_not_found_handle "$@"
+ }
+fi