diff --git a/config/shell/zsh/.zprofile b/config/shell/zsh/.zprofile
index 7024cf1..16d156d 100644
--- a/config/shell/zsh/.zprofile
+++ b/config/shell/zsh/.zprofile
@@ -1,12 +1,6 @@
 __HOME_ZPROFILE_SOURCED=1
+[[ -f "$ZSH_DATA_DIR/nix_profile.sh" ]] && source "$ZSH_DATA_DIR/nix_profile.sh" 
 [[ -f "/etc/profile" ]] && emulate sh -c "source /etc/profile"
-
-if [[ -d ~/.nix-profile/etc/profile.d ]]; then
-    for file in ~/.nix-profile/etc/profile.d/*; do
-        [ -f "$file" ] && [ -r "$file" ] && emulate sh -c "source \"$file\""
-    done
-fi
-
 [[ -f "~/.profile" ]] && emulate sh -c "source ~/.profile" 
 
 
diff --git a/config/shell/zsh/.zshrc b/config/shell/zsh/.zshrc
index 7b8ed73..64455c3 100644
--- a/config/shell/zsh/.zshrc
+++ b/config/shell/zsh/.zshrc
@@ -9,9 +9,6 @@ if [ -n "$EAT_SHELL_INTEGRATION_DIR" ]; then
     source "$EAT_SHELL_INTEGRATION_DIR/zsh";
 fi
 
-ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data"
-ZSH_CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg"
-
 #Check if terminal is fullcolor
 if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then 
     __MATERUS_ZSH_256COLORS="${__MATERUS_ZSH_256COLORS:-1}"; else
diff --git a/config/shell/zsh/zshenv b/config/shell/zsh/zshenv
index 53e8e87..f12fd64 100644
--- a/config/shell/zsh/zshenv
+++ b/config/shell/zsh/zshenv
@@ -1,5 +1,6 @@
 #TODO: Set ZDOTDIR based on MKK_CONFIG_PATH
-
 __HOME_ZSHENV_SOURCED=1
 ZDOTDIR=${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg
+ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data"
+ZSH_CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg"
 setopt no_global_rcs
\ No newline at end of file
diff --git a/nix-config/shared/default.nix b/nix-config/shared/default.nix
index 16654b2..7c37d22 100644
--- a/nix-config/shared/default.nix
+++ b/nix-config/shared/default.nix
@@ -25,7 +25,7 @@ isHm:
 
   config.mkk.var = import ./private/variables.nix {};
   config._module.args.mkk = rec {
-    nixerus.pkgs = materusArgs.inputs.nixerus.packages."${config.nixpkgs.hostPlatform.system}";
+    nixerus.pkgs = materusArgs.inputs.nixerus.packages."${materusArgs.arch}";
     lib = nixerus.pkgs.lib;
     files = materusArgs.files;
     args = materusArgs;