diff --git a/flake.lock b/flake.lock
index 4f6372a..84dc686 100644
--- a/flake.lock
+++ b/flake.lock
@@ -189,6 +189,26 @@
         "type": "github"
       }
     },
+    "paneru": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770939321,
+        "narHash": "sha256-OVF0sxT7mgZroAhOjK3QZqtnzOFcxN3wnxgghSYGgNw=",
+        "owner": "karinushka",
+        "repo": "paneru",
+        "rev": "c0537d166144f0776eb1bf0539942bda218716d5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "karinushka",
+        "repo": "paneru",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -199,7 +219,8 @@
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "paneru": "paneru"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 8c83c52..a70af20 100755
--- a/flake.nix
+++ b/flake.nix
@@ -17,6 +17,10 @@
     home-manager.url = "github:nix-community/home-manager/release-25.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
+    # Paneru
+    paneru.url = "github:karinushka/paneru";
+    paneru.inputs.nixpkgs.follows = "nixpkgs";
+
     # Nix Homebrew
     nix-homebrew.url = "github:zhaofengli/nix-homebrew";
     homebrew-core = {
@@ -32,6 +36,7 @@
   outputs =
     inputs@{
       self,
+      paneru,
       nixpkgs,
       nix-darwin,
       flake-parts,
@@ -80,6 +85,7 @@
             "MacBook-Air-de-Laurent" = nix-darwin.lib.darwinSystem {
               specialArgs = {
                 self = self;
+                paneru = paneru;
                 import-tree = import-tree;
                 home-manager = home-manager;
                 homebrew-core = homebrew-core;
diff --git a/hosts/common/nix.nix b/hosts/common/nix.nix
index 7a7c781..882d93a 100644
--- a/hosts/common/nix.nix
+++ b/hosts/common/nix.nix
@@ -2,6 +2,7 @@
 {
   nix = {
     settings = {
+      use-xdg-base-directories = true;
       experimental-features = "nix-command flakes";
       trusted-users = [
         # Needed by Devenv
diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index 926bdcf..307af2a 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -3,6 +3,7 @@
   home-manager.users.alistreaza = {
     imports = [
       (import-tree ../../../modules/home/common)
+      ./derivations/paneru.nix
     ];
 
     home = {
diff --git a/hosts/darwin/home/derivations/paneru.nix b/hosts/darwin/home/derivations/paneru.nix
new file mode 100644
index 0000000..2b6739a
--- /dev/null
+++ b/hosts/darwin/home/derivations/paneru.nix
@@ -0,0 +1,6 @@
+let
+  pkgs = import <nixpkgs> { };
+in
+pkgs.paneru.overrideAttrs (old: {
+  old.package.doCheck = false;
+})
diff --git a/modules/home/common/env/openjdk.nix b/modules/home/common/env/openjdk.nix
index 4c8f622..fc3c55f 100644
--- a/modules/home/common/env/openjdk.nix
+++ b/modules/home/common/env/openjdk.nix
@@ -20,6 +20,9 @@ in
 
     home.sessionVariables = {
       JAVA_HOME = "${pkgs.jdk25}";
+      M2_HOME = "${config.xdg.dataHome}/maven";
+      MVN_HOME = "${config.xdg.dataHome}/maven";
+      MAVEN_HOME = "${config.xdg.dataHome}/maven";
     };
 
   };
diff --git a/modules/home/common/env/rust.nix b/modules/home/common/env/rust.nix
index 8c3ba64..19680d1 100644
--- a/modules/home/common/env/rust.nix
+++ b/modules/home/common/env/rust.nix
@@ -19,7 +19,8 @@ in
     ];
 
     home.sessionVariables = {
-      RUSTUP_HOME = ".rustup";
+      CARGO_HOME = "${config.xdg.dataHome}/cargo";
+      RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
     };
 
   };
diff --git a/modules/home/common/zsh.nix b/modules/home/common/zsh.nix
index 2ef461a..7af3902 100644
--- a/modules/home/common/zsh.nix
+++ b/modules/home/common/zsh.nix
@@ -13,9 +13,13 @@ in
       enable = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
+      dotDir = "${config.xdg.configHome}/zsh";
+      history = {
+        path = "${config.xdg.dataHome}/zsh/history";
+      };
       oh-my-zsh = {
         enable = true;
-        theme = "af-magic";
+        theme = "dieter";
       };
     };