diff --git a/flake.lock b/flake.lock
index bb2d662..4b07d5e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -290,8 +290,8 @@
         ]
       },
       "locked": {
-        "lastModified": 1687479458,
-        "narHash": "sha256-7ZeYakvK1Raz4oFwGrbcMbDe12nf9TXdXJvgp/e+N8Y=",
+        "lastModified": 1687747647,
+        "narHash": "sha256-1gkAQLFAnlzp2P55Wql8fV0o8dJjsosRtyEFSdxGj8k=",
         "path": "/home/gerg/Projects/spicetify-nix",
         "type": "path"
       },
diff --git a/hosts/gerg-desktop/default.nix b/hosts/gerg-desktop/default.nix
index 5e86572..f9415c4 100644
--- a/hosts/gerg-desktop/default.nix
+++ b/hosts/gerg-desktop/default.nix
@@ -19,6 +19,7 @@
       kmscon.enable = true;
     };
   };
+  boot.binfmt.emulatedSystems = ["aarch64-linux"];
   hardware.nvidia = {
     package = config.boot.kernelPackages.nvidiaPackages.beta;
     nvidiaPersistenced = false;
diff --git a/hosts/gerg-desktop/spicetify.nix b/hosts/gerg-desktop/spicetify.nix
index 3635167..47c3df9 100644
--- a/hosts/gerg-desktop/spicetify.nix
+++ b/hosts/gerg-desktop/spicetify.nix
@@ -6,8 +6,6 @@ in {
   nixpkgs.allowedUnfree = ["spotify"];
   programs.spicetify = {
     enable = true;
-    spotifyPackage = spicePkgs.spotify;
-    spicetifyPackage = spicePkgs.spicetify-cli;
     enabledExtensions = [
       ex.adblock
       ex.hidePodcasts
diff --git a/modules/direnv.nix b/modules/direnv.nix
index 803b9d3..69198e0 100644
--- a/modules/direnv.nix
+++ b/modules/direnv.nix
@@ -1,27 +1,34 @@
 _: {pkgs, ...}: {
   environment = {
-    systemPackages = builtins.attrValues {
-      inherit
-        (pkgs)
-        nix-direnv
-        direnv
-        ;
-    };
-
+    systemPackages = [pkgs.direnv];
     variables = {
       DIRENV_LOG_FORMAT = "";
-      DIRENV_CONFIG = "${pkgs.nix-direnv}/share/nix-direnv";
+      DIRENV_CONFIG = "/etc/direnv";
     };
+    etc."direnv/direnvrc".text = ''
+      source ${pkgs.nix-direnv}/share/nix-direnv/direnvrc
+      if [ -e $HOME/.config/direnv/direnvrc ] ; then
+        source $HOME/.config/direnv/direnvrc
+      fi
+    '';
   };
   programs = {
     zsh.interactiveShellInit = ''
-      eval "$(direnv hook zsh)"
+      if [[ -o interactive ]] && ! printenv PATH | grep -qc '/nix/store' && [ -z "$IN_NIX_SHELL" ] ; then
+        eval "$(direnv hook zsh)"
+      fi
     '';
     bash.interactiveShellInit = ''
-      eval "$(direnv hook bash)"
-    '';
-    fish.interactiveShellInit = ''
-      direnv hook fish | source
+      if [ $- == *i* ] && ! printenv PATH | grep -qc '/nix/store' && [ -z "$IN_NIX_SHELL" ] ; then
+        eval "$(direnv hook bash)"
+      fi
     '';
+    #   fish.enable = true;
+    #   fish.interactiveShellInit = ''
+    #     if status --is-interactive; and not printenv PATH | grep -qc '/nix/store'; and  [ -z "$IN_NIX_SHELL" ];
+    #       direnv hook fish | source;
+    #       echo "loaded direnv";
+    #     end
+    #   '';
   };
 }
diff --git a/modules/nix.nix b/modules/nix.nix
index b53d38f..a7ba53e 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -8,7 +8,6 @@ inputs: {pkgs, ...}: {
       warn-dirty = false;
       #ignore global registry
       flake-registry = builtins.toFile "empty-flake-registry.json" ''{"flakes":[],"version":2}'';
-      use-xdg-base-directories = true;
       #use for testing
       #allow-import-from-derivation = false;
       trusted-users = [
@@ -17,6 +16,11 @@ inputs: {pkgs, ...}: {
       ];
       allowed-users = [
       ];
+      use-xdg-base-directories = true;
     };
   };
+  #fix for use-xdg-base-directories
+  environment.profiles = [
+    "$HOME/.local/state/nix/profiles/profile"
+  ];
 }