version 3 refactor

config/i3/config

@@ -6,10 +6,8 @@ set $mod Mod4
 
 font pango:monospace 20
 
-set $CONFIG /home/w0ryn/.config/wryn
 set $UTILS /home/w0ryn/.config/wryn/i3utils
 
-
 set $SLACK_CLIENT_CLASS ^Slack$
 set $MESSAGE_CLIENT_CLASS ^android-messages-desktop$
 set $MEDIA_CLIENT_CLASS ^youtubemusic-nativefier

config/i3/utils

@@ -1,6 +1,8 @@
 #!/bin/sh
 
-UTIL_BIN="$HOME/.wryn/bin/desktop"
+source "$HOME/.config/wryn/env/env"
+
+UTIL_BIN="$DOTWRYN/bin/desktop"
 APP_BIN="$HOME/.config/wryn/default-applications"
 
 MEDIA__NEXT="$UTIL_BIN/youtube-music/next.sh"

config/xorg/set_randr_layout

@@ -1,6 +1,6 @@
 #!/bin/zsh
-source $HOME/.wryn/env/env.zsh
-XSERVER_DIR="$DOTWRYN/config/xserver"
+source "$HOME/.config/wryn/env/env"
+XSERVER_DIR="$DOTWRYN/config/xorg"
 
 AT_HOME(){
 	xrandr -q | grep -q 'DP2-1 connected' && xrandr -q | grep -q '3840';

config/xorg/xinitrc

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+source "$HOME/.config/wryn/env/env"
+
 X11_SCRIPTS='/etc/X11/xinit/xinitrc.d';
 if [ -d $X11_SCRIPTS ] ; then
 	for script in $(find "$X11_SCRIPTS" -name \*.sh); do
@@ -14,6 +16,6 @@ CUSTOM_DMENU_COMMANDS="$HOME/.local/custom_dmenu"
 export PATH="$CUSTOM_DMENU_COMMANDS:$PATH"
 
 
-"$HOME/.wryn/config/xserver/set_randr_layout" &
+"$DOTWRYN/config/xorg/set_randr_layout" &
 
 exec i3;