diff --git a/apps/default.nix b/apps/default.nix
index ae864f53110a4465322bdf4946828ed0729a3eb6..299598b22f4a3c7db9af5942e7fbecfc4a595e49 100644
--- a/apps/default.nix
+++ b/apps/default.nix
@@ -21,6 +21,7 @@     ./spotifyd.nix
     ./ssh.nix
     ./tiny.nix
     ./wezterm.nix
+    ./xdg.nix
     ./zoxide.nix
   ];
   home = {

diff --git a/apps/go.nix b/apps/go.nix
index 8fa1bca795f95dab07d2947216765ef46fcee3ee..264945ec744666c38cd617f06fa94e893ca6bbe3 100644
--- a/apps/go.nix
+++ b/apps/go.nix
@@ -1 +1,7 @@
-{programs.go.enable = true;}
+{config, ...}: {
+  programs.go = rec {
+    enable = true;
+    goPath = "${config.xdg.dataHome}/go";
+    goBin = "${goPath}/bin";
+  };
+}

diff --git a/apps/nushell.nix b/apps/nushell.nix
index 60845ab2001b297ca9a59da8687e148620dff5f3..e03f202dadf0e482037165e5463ad12edbfa1573 100644
--- a/apps/nushell.nix
+++ b/apps/nushell.nix
@@ -1,4 +1,9 @@
+{
+  pkgs,
+  config,
+    enable = true;
 {pkgs, ...}: {
+}: {
   programs.nushell = {
     enable = true;
     configFile.source = ./nushell/config.nu;
@@ -18,6 +23,10 @@       use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
       use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
       use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/just/just.nu *
       use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
+    '';
+    extraEnv = ''
+      let-env GOPATH = "${config.xdg.dataHome}/go"
+      let-env PATH = ($env.PATH | split row (char esep) | prepend '${config.xdg.dataHome}/go/bin')
     '';
   };
   xdg.configFile = {

diff --git a/apps/nushell/env.nu b/apps/nushell/env.nu
index 3006c8de1bc054160d617e974a6bad8e54732a7f..0269f3ffc9dccb2e36dfb0508298cb8f96d0c863 100644
--- a/apps/nushell/env.nu
+++ b/apps/nushell/env.nu
@@ -60,4 +60,3 @@ ]
 
 # To add entries to PATH (on Windows you might use Path), you can use the following pattern:
 # let-env PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
-

diff --git a/apps/wezterm/wezterm.lua b/apps/wezterm/wezterm.lua
index 25e64315da6d0c3a2343f7f599d7ad0e38fb81f0..0ec2d06669b1e55aabc4691f8ba8ded2f3697ae5 100644
--- a/apps/wezterm/wezterm.lua
+++ b/apps/wezterm/wezterm.lua
@@ -33,7 +33,7 @@ end)
 
 -- config
 return {
-  default_prog = { "nu", "--config", "~/.config/nushell/config.nu", "--env-config", "~/.config/nushell/config.nu" },
+  default_prog = { "nu", "--config", "~/.config/nushell/config.nu", "--env-config", "~/.config/nushell/env.nu" },
   color_scheme = theme_for_appearance(wezterm.gui.get_appearance()),
   window_close_confirmation = 'NeverPrompt',
   window_background_opacity = opacity,

diff --git a/apps/xdg.nix b/apps/xdg.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7f478142fabab8e136227363d99e9033d4413d0d
--- /dev/null
+++ b/apps/xdg.nix
@@ -0,0 +1,9 @@
+{config, ...}: {
+  xdg = {
+    enable = true;
+    userDirs.enable = true;
+    cacheHome = "${config.home.homeDirectory}/.cache";
+    configHome = "${config.home.homeDirectory}/.config";
+    dataHome = "${config.home.homeDirectory}/.local/share";
+  };
+}

diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index cd80fd19f9e336794a680998afa40c8dfb16d88d..bed3cc6c00216f200e11d3b3f62d90fabf6c6f5f 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -41,7 +41,6 @@
   users.users."${username}" = {
     extraGroups = ["wheel" "docker"];
     isNormalUser = true;
-    shell = pkgs.nushell;
   };
 
   environment.systemPackages = with pkgs; [

diff --git a/machines/matcha/default.nix b/machines/matcha/default.nix
index d29994c03c77897f1f5fdcff3bc20dc80047cd33..6660eecb255bef10e768a668915ffe58aff35b0c 100644
--- a/machines/matcha/default.nix
+++ b/machines/matcha/default.nix
@@ -43,7 +43,6 @@
   users.users."${username}" = {
     extraGroups = ["wheel" "docker" "storage"];
     isNormalUser = true;
-    shell = pkgs.nushell;
   };
 
   system.stateVersion = "22.11";