diff --git a/home/base.nix b/home/base.nix
index a89c422..db9bbe9 100644
--- a/home/base.nix
+++ b/home/base.nix
@@ -18,8 +18,17 @@
       "$HOME/scripts"
     ];
     sessionVariables = {
-      SSH_AUTH_SOCK = /home/chase/.bitwarden-ssh-agent.sock;
+      # Aspell stuff
+      ASPELL_CONF = "per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_DATA_HOME/aspell/en.pws; repl $XDG_DATA_HOME/aspell/en.prepl";
+      # Bitwarden stuff
+      BITWARDEN_SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
+      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
       ELECTRON_OZONE_PLATFORM_HINT = "wayland";
+      # Java stuff
+      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='$XDG_CONFIG_HOME'/java";
+      # libx11 stuff
+      XCOMPOSECACHE = "$XDG_CACHE_HOME/X11/xcompose";
+      XCOMPOSEFILE = "$XDG_CONFIG_HOME/X11/xcompose";
     };
     shellAliases = {
       gs = "git status";
diff --git a/home/desktop.nix b/home/desktop.nix
index 0754640..b52df17 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -175,31 +175,6 @@
     defaultEditor = true;
   };
 
-  services.mako = {
-    enable = true;
-    settings = {
-      actions = true;
-      anchor = "top-right";
-      background-color = "#1e1e2e";
-      border-color = "#cba6f7";
-      border-radius = 0;
-      default-timeout = 0;
-      font = "monospace 10";
-      height = 100;
-      width = 300;
-      icons = true;
-      ignore-timeout = false;
-      layer = "top";
-      margin = 10;
-      markup = true;
-
-      # Section example
-      "actionable=true" = {
-        anchor = "top-left";
-      };
-    };
-  };
-
   services.mpd = {
     enable = true;
     extraConfig = ''
diff --git a/home/hypr.nix b/home/hypr.nix
index d2c2f0e..b053b61 100644
--- a/home/hypr.nix
+++ b/home/hypr.nix
@@ -64,6 +64,31 @@
     };
   };
 
+  services.mako = {
+    enable = true;
+    settings = {
+      actions = true;
+      anchor = "top-right";
+      background-color = "#1e1e2e";
+      border-color = "#cba6f7";
+      border-radius = 0;
+      default-timeout = 0;
+      font = "monospace 10";
+      height = 100;
+      width = 300;
+      icons = true;
+      ignore-timeout = false;
+      layer = "top";
+      margin = 10;
+      markup = true;
+
+      # Section example
+      "actionable=true" = {
+        anchor = "top-left";
+      };
+    };
+  };
+
   services.network-manager-applet.enable = true;
 
   wayland.windowManager.hyprland = {
diff --git a/hosts/ichigo/configuration.nix b/hosts/ichigo/configuration.nix
index 5ea2f87..bce55da 100644
--- a/hosts/ichigo/configuration.nix
+++ b/hosts/ichigo/configuration.nix
@@ -6,7 +6,7 @@
   imports = [
     ./hardware-configuration.nix
     ../../nixos/desktop.nix
-    ../../nixos/hypr.nix
+    #../../nixos/hypr.nix
   ];
 
   hardware.graphics = {
diff --git a/hosts/ichigo/home.nix b/hosts/ichigo/home.nix
index 469e193..8518606 100644
--- a/hosts/ichigo/home.nix
+++ b/hosts/ichigo/home.nix
@@ -5,7 +5,7 @@
 }: {
   imports = [
     ../../home/desktop.nix
-    ../../home/hypr.nix
+    #../../home/hypr.nix
     ../../home/plasma.nix
   ];