Install .profile separately from .zshenv

3 files changed, 143 insertions, 129 deletions

diff --git a/Makefile b/Makefile
index 966bde8..0faf846 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,12 @@ VIM := $(shell command -v vim 2>/dev/null)
 NVIM := $(shell command -v nvim 2>/dev/null)
 XCONFS := X11/Xresources
 ZCONFS := zsh/.zshenv
+SCONFS := sh/profile
 DCONFS := doas.conf
 
 all:
 
-install: install-xconfigs install-zshconfigs vimplug-vim vimplug-nvim
+install: install-xconfigs install-shconfigs install-zshconfigs vimplug-vim vimplug-nvim
 
 install-xconfigs: $(XCONFS)
 	@echo "Installing Xorg conf files..."
@@ -14,6 +15,12 @@ install-xconfigs: $(XCONFS)
 	@ln -sf `pwd`/X11/Xresources ~/.Xresources
 	@echo "Done."
 
+install-shconfigs: $(SCONFS)
+	@echo "Installing SH conf files..."
+	@echo ".profile..."
+	@ln -sf `pwd`/sh/profile ~/.profile
+	@echo "Done."
+
 install-zshconfigs: $(ZCONFS)
 	@echo "Installing zsh conf files..."
 	@echo ".zshenv..."
diff --git a/sh/profile b/sh/profile
new file mode 100644
index 0000000..09a81c1
--- /dev/null
+++ b/sh/profile
@@ -0,0 +1,134 @@
+# Import ENV from system
+. /etc/profile
+[ -f /etc/profile.d/nix-daemon.sh ] && . /etc/profile.d/nix-daemon.sh
+
+# Other 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"
+
+# Doesn't seem to work
+export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
+export ANDROID_AVD_HOME="$XDG_DATA_HOME"/android/
+export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/
+export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
+
+# Disable files
+export LESSHISTFILE=-
+
+# Fixing Paths
+export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc
+export ATOM_HOME="$XDG_DATA_HOME"/atom
+export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
+export XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc
+export GEM_SPEC_CACHE="$XDG_DATA_HOME/ruby/specs"
+export GEM_HOME="$XDG_DATA_HOME/ruby/gems"
+export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
+export GOPATH="$XDG_DATA_HOME"/go
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
+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 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"
+
+# Scaling
+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\""
+
+# 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 BROWSER="browser"
+export VIDEO="mpv"
+export IMAGE="sxiv"
+export OPENER="xdg-open"
+export PAGER="less"
+
+# 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"
+
+# DIRS
+export SRCDIR="$HOME/.local/src"
+
+# OLD PATH
+export SYSPATH="$PATH"
+
+# 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/volsv" ]; then
+  PATH="$PATH:$HOME/.local/volsv"
+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
+if [ -d "/var/lib/flatpak/exports/bin" ]; then
+  PATH="$PATH:/var/lib/flatpak/exports/bin"
+fi
+
+# MERGE PATHS
+export PATH="$PATH:$SYSPATH"
+
+# CLEANUP
+unset SYSPATH 
diff --git a/zsh/.zshenv b/zsh/.zshenv
index 1ac6756..286e11a 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -1,130 +1,3 @@
-# Import ENV from system
-. /etc/profile
-[ -f /etc/profile.d/nix-daemon.sh ] && . /etc/profile.d/nix-daemon.sh
-
+# ZSH SPECIFIC CONFIGS
 unset HISTFILE
-
-# Other 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"
-
-# Doesn't seem to work
-export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
-export ANDROID_AVD_HOME="$XDG_DATA_HOME"/android/
-export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/
-export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
-
-# Disable files
-export LESSHISTFILE=-
-
-# Fixing Paths
-export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc
-export ATOM_HOME="$XDG_DATA_HOME"/atom
-export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
-export XSERVERRC="$XDG_CONFIG_HOME"/X11/xserverrc
-export GEM_SPEC_CACHE="$XDG_DATA_HOME/ruby/specs"
-export GEM_HOME="$XDG_DATA_HOME/ruby/gems"
-export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
-export GOPATH="$XDG_DATA_HOME"/go
-export GNUPGHOME="$XDG_DATA_HOME"/gnupg
-export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
-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 HISTFILE="$XDG_DATA_HOME"/zsh/history
-export CARGO_HOME="$XDG_DATA_HOME"/cargo
-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"
-
-# Scaling
-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\""
-
-# 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 BROWSER="browser"
-export VIDEO="mpv"
-export IMAGE="sxiv"
-export OPENER="xdg-open"
-export PAGER="less"
-
-# DIRS
-export SRCDIR="$HOME/.local/src"
-
-# KSH
-export ENV="$XDG_CONFIG_HOME/mksh/mkshrc"
-
-# OLD PATH
-export SYSPATH="$PATH"
-
-# 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
-
-# MERGE PATHS
-export PATH="$PATH:$SYSPATH"
-
-# CLEANUP
-unset SYSPATH