Merge branch 'master' into rai-master

1 files changed, 86 insertions, 65 deletions

diff --git a/sh/profile b/sh/profile
index 3aa7fd7..068b6f1 100644
--- a/sh/profile
+++ b/sh/profile
@@ -1,12 +1,16 @@
-# Import ENV from system
-. /etc/profile
-[ -f /etc/profile.d/nix-daemon.sh ] && . /etc/profile.d/nix-daemon.sh
-
-# Other XDG paths
+# XDG paths
 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"}
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/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_STATE_HOME="${HOME}/.local/state"
+export XDG_VIDEOS_DIR=${HOME}/Videos
+
+export XDG_DATA_DIRS="${XDG_DATA_DIRS}:$HOME/.nix-profile/share"
 
 # Doesn't seem to work
 export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
@@ -18,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
@@ -32,98 +40,111 @@ 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 CARGO_HOME="$XDG_DATA_HOME"/cargo
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
 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 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
-
-# Configure apps
-export BEMENU_OPTS="-H 36 --fn \"mononoki Nerd Font Mono 24\" --nb \"#000000\" --nf \"#c5c8c6\" --hb \"#39c1ed\" --hf \"#000000\" --cb \"#000000\" --cf \"#000000\" --tf \"#000000\" --tb \"#39c1ed\" --fb \"#000000\" --ff \"#c5c8c6\" --fbb \"#39c1ed\" --fbf \"#198844\""
+export QT_QPA_PLATFORMTHEME=qt6ct
 
 # Fix wayland stuff
 export MOZ_ENABLE_WAYLAND=1
 export XKB_DEFAULT_OPTIONS=caps:escape
-export XDG_CURRENT_DESKTOP=Unity
 
 # Default Apps
 export EDITOR="nvim"
 export READER="zathura"
 export VISUAL="nvim"
-export TERMINAL="alacritty"
+export TERMINAL="st"
 export BROWSER="browser"
 export VIDEO="mpv"
 export IMAGE="sxiv"
 export OPENER="xdg-open"
 export PAGER="less"
 
-# DIRS
-export SRCDIR="$HOME/.local/src"
+# ZVM
+export ZVM_INSTALL="$HOME/.zvm/self"
+export ZVMPATH="$HOME/.zvm/bin"
 
-# MKSH
-#export ENV="$XDG_CONFIG_HOME/mksh/mkshrc"
+# Modern SDK
+export N64_LIBGCCDIR="/opt/crashsdk/lib/gcc/mips64-elf/12.2.0"
+export ROOT=/etc/n64
+export BLENDER_3_0="/usr/bin/blender"
 
-# OKSH
-export ENV="$XDG_CONFIG_HOME/kshrc"
+# DIRS
+export SRCDIR="$HOME/.local/src"
 
 # OLD PATH
-export SYSPATH="$PATH"
+export PATHS="$(echo "$PATH" | sed 's/:/\n/g')"
+USERPATH=""
+
+addtopath () {
+  local USERPATHS="$(echo "$USERPATH" | sed 's/:/\n/g')"
+  if [ -d "$1" ]; then
+    echo "$PATHS" | /usr/bin/grep -qE "^$1$" && return
+    echo "$USERPATHS" | /usr/bin/grep -qE "^$1$" && return
+    [ -n "$USERPATH" ] && USERPATH="${USERPATH}:"
+    USERPATH="${USERPATH}$1"
+  fi
+}
 
 # NEW PATH
-unset PATH
-if [ -d "$HOME/.local/bin/testing" ]; then
-  PATH="$HOME/.local/bin/testing"
-fi
-if [ -d "$HOME/.local/bin/shortcmds" ]; then
-  PATH="$PATH:$HOME/.local/bin/shortcmds"
-fi
-if [ -d "$HOME/.local/bin/generics" ]; then
-  PATH="$PATH:$HOME/.local/bin/generics"
-fi
-if [ -d "$HOME/.local/bin/scripts" ]; then
-  PATH="$PATH:$HOME/.local/bin/scripts"
-fi
-if [ -d "$HOME/.local/bin/sp" ]; then
-  PATH="$PATH:$HOME/.local/bin/sp"
-fi
-if [ -d "$HOME/.local/bin/blocks" ]; then
-  PATH="$PATH:$HOME/.local/bin/blocks"
-fi
-if [ -d "$HOME/.local/bin/ignore" ]; then
-  PATH="$PATH:$HOME/.local/bin/ignore"
-fi
-if [ -d "$HOME/.local/bin" ]; then
-  PATH="$PATH:$HOME/.local/bin"
-fi
-if [ -d "$HOME/.local/bin/flatpak-sc" ]; then
-  PATH="$PATH:$HOME/.local/bin/flatpak-sc"
-fi
-if [ -d "$HOME/.local/bin/flatpak/exports/bin" ]; then
-  PATH="$PATH:$HOME/.local/share/flatpak/exports/bin/"
-fi
-if [ -d "$CARGO_HOME/bin" ]; then
-  PATH="$PATH:$CARGO_HOME/bin"
-fi
-if [ -d "$GOPATH/bin" ]; then
-  PATH="$PATH:$GOPATH/bin"
-fi
+addtopath "$HOME/.local/bin/testing"
+addtopath "$HOME/.local/bin/shortcmds"
+addtopath "$HOME/.local/bin/generics"
+addtopath "$HOME/.local/bin/scripts"
+addtopath "$HOME/.local/bin/sp"
+addtopath "$HOME/.local/bin/blocks"
+addtopath "$HOME/.local/bin/ignore"
+addtopath "$HOME/.local/bin/volsv"
+addtopath "$HOME/.local/bin"
+addtopath "$HOME/.local/bin/flatpak-sc"
+addtopath "$HOME/.local/share/flatpak/exports/bin/"
+addtopath "$CARGO_HOME/bin"
+addtopath "$GOPATH/bin"
+addtopath "$ZVMPATH"
+addtopath "$ZVM_INSTALL"
+addtopath "/var/lib/flatpak/exports/bin"
 
 # MERGE PATHS
-export PATH="$PATH:$SYSPATH"
-
-# CLEANUP
-unset SYSPATH 
+[ -n "$USERPATH" ] && export PATH="$USERPATH:$PATH"
+
+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