refactor zprofile

2 files changed, 42 insertions, 54 deletions

diff --git a/home/config/zsh/pfetch_logos b/home/config/zsh/pfetch_logos
deleted file mode 100644
index 65c8488..0000000
--- a/home/config/zsh/pfetch_logos
+++ /dev/null
@@ -1,10 +0,0 @@
-[Aa]rch*)
-        read_ascii 4 <<- EOF
-				${c6}       /\\
-				${c6}      /  \\
-				${c6}     /\\   \\
-				${c4}    / ^ w ^\\
-				${c4}   /   ,,   \\
-				${c4}  /   |  |   \\
-				${c4} /_-''    ''-_\\
-			EOF
diff --git a/home/config/zsh/zprofile b/home/config/zsh/zprofile
index 4fa1205..fe27d97 100644
--- a/home/config/zsh/zprofile
+++ b/home/config/zsh/zprofile
@@ -1,42 +1,51 @@
-# locale
+# =================================================================== LOCALE ==
 export LANG=en_US.UTF-8
 export LC_COLLATE=C
 
+# ================================================================== PROFILE ==
+export XDG_RUNTIME_DIR="/run/user/$(id -u)"
+export LIBSEAT_BACKEND=logind
+
+# Guix
+. "$HOME/.guix-home/setup-environment"
+"$HOME/.guix-home/on-first-login"
+export GUIX_PROFILE
+
+# NixOS
+if [ -f "/run/current-system/profile/etc/profile.d/nix.sh" ]; then
+    source /run/current-system/profile/etc/profile.d/nix.sh
+fi
+
+# ~/.local
+export PATH="$PATH:$HOME/.local/bin"
+export XDG_DATA_DIRS="$XDG_DATA_DIRS:$HOME/.local/share"
+
+# =================================================================== CONFIG ==
+
 # wayland
+export CLUTTER_BACKEND=wayland
+export ELM_DISPLAY=wl
+export XDG_SESSION_TYPE=wayland
+export GDK_BACKEND=wayland,x11
+export SDL_VIDEODRIVER=wayland
+
+# java
 export _JAVA_AWT_WM_NONREPARENTING=1
+
+# mozilla
 export MOZ_ENABLE_WAYLAND=1
 export MOZ_USE_XINPUT2=1
-export WLR_NO_HARDWARE_CURSORS=0
-export GDK_BACKEND=wayland,x11
-export SDL_VIDEODRIVER=wayland
-export CLUTTER_BACKEND=wayland
-export ELM_DISPLAY=wl
-export QT_AUTO_SCREEN_SCALE_FACTOR=1
+
+# qt
 export QT_QPA_PLATFORM="wayland;xcb"
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 
-# xdg
-export XDG_RUNTIME_DIR=/run/user/$(id -u)
-export XDG_SESSION_TYPE=wayland
-export XDG_CURRENT_DESKTOP=sway
-export LIBSEAT_BACKEND=logind
-
 # programs
 export TERMINAL=kitty
 export EDITOR=nvim
-export CC=$(which gcc)
-export LD=$(which gcc)
-
-# nvidia
-#export LIBVA_DRIVER_NAME=nvidia
-#export GBM_BACKEND=nvidia-drm
-#export __GLX_VENDOR_LIBRARY_NAME=nvidia
-#export __NV_PRIME_RENDER_OFFLOAD=1
-#export __VK_LAYER_NV_optimus=NVIDIA_only
-
-# nvk
-#export MESA_LOADER_DRIVER_OVERRIDE=zink
-#export NOUVEAU_USE_ZINK=1
+export CC="$(which gcc)"
+export LD="$(which gcc)"
 
 # ricing
 export QT_QPA_PLATFORM_THEME=gtk2
@@ -44,32 +53,21 @@ export GTK_THEME=Orchis-Teal-Dark
 export XCURSOR_THEME=Adwaita
 export XCURSOR_SIZE=24
 
-# guix
-export GUIX_PROFILE=$HOME/.guix-profile
-$HOME/.guix-home/on-first-login
-. $HOME/.guix-home/setup-environment
-
-# nix
-export NIX_PROFILE=$HOME/.nix-profile
-export XDG_DATA_DIRS=$XDG_DATA_DIRS:$NIX_PROFILE/share
-export PATH=$PATH:$NIX_PROFILE/bin
-export LIBRARY_PATH=$LIBRARY_PATH:$NIX_PROFILE/lib
-
-# local
-export LOCAL_PROFILE=$HOME/.local
-export XDG_DATA_DIRS=$XDG_DATA_DIRS:$LOCAL_PROFILE/share
-export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share
-export XDG_DATA_DIRS=$XDG_DATA_DIRS:$LOCAL_PROFILE/share/flatpak/exports/share
-export PATH=$PATH:$LOCAL_PROFILE/bin
-
 # certs
 export SSL_CERT_FILE=/run/current-system/profile/etc/ssl/certs/ca-certificates.crt
 export SSL_CERT_DIR=/run/current-system/profile/etc/ssl/certs
 
+# ==================================================================== ENTRY ==
+
+# dont prompt tmux to start
+# another graphical env
 if [ -n "$TMUX" ]; then
     return
 fi
 
+# prompt the user logging in (me)
+# for which graphical env i want to use
+
 clear
 printf "\t\n\t\n\t\n\t\n"
 printf "\tPlease select an environment...\n"