From df0035aba9e047fb53cce1ca434b47d6d88609b6 Mon Sep 17 00:00:00 2001
From: Barrett Ruth <br@barrettruth.com>
Date: Tue, 10 Feb 2026 20:29:05 -0500
Subject: [PATCH] more misc fixes

---
 home/modules/bootstrap.nix | 2 +-
 home/modules/packages.nix  | 2 +-
 home/modules/shell.nix     | 7 ++++++-
 home/modules/theme.nix     | 2 +-
 home/modules/ui.nix        | 5 -----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/home/modules/bootstrap.nix b/home/modules/bootstrap.nix
index fd62405..484525c 100644
--- a/home/modules/bootstrap.nix
+++ b/home/modules/bootstrap.nix
@@ -14,7 +14,7 @@ let
     "dl"
     "img"
     "img/screen"
-    "wp"
+    "img/wp"
   ];
 in
 {
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 6721be8..fac6901 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -60,7 +60,7 @@ in
       fi
 
       profile=""
-      for d in "$zen_config"/*.Default\ \(release\); do
+      for d in "$zen_config"/*.Default\ Profile; do
         [ -d "$d" ] && profile="$d" && break
       done
 
diff --git a/home/modules/shell.nix b/home/modules/shell.nix
index 3a43d12..ab58772 100644
--- a/home/modules/shell.nix
+++ b/home/modules/shell.nix
@@ -170,7 +170,7 @@ in
 
   programs.zsh = {
     enable = true;
-    dotDir = "${config.xdg.configHome}/zsh";
+    dotDir = ".config/zsh";
 
     history = {
       path = "${config.xdg.stateHome}/zsh_history";
@@ -266,6 +266,10 @@ in
     '';
   };
 
+  home.activation.removeZshenvBridge = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+    [ -L "$HOME/.zshenv" ] && rm "$HOME/.zshenv" || true
+  '';
+
   programs.fzf = {
     enable = true;
     enableZshIntegration = true;
@@ -434,6 +438,7 @@ in
       set -g lock-after-time 300
       set -g lock-command "pipes -p 2"
 
+      set -g @resurrect-dir '~/.local/state/tmux/resurrect'
       set -g @resurrect-capture-pane-contents on
     '';
   };
diff --git a/home/modules/theme.nix b/home/modules/theme.nix
index 74a2072..0f63c88 100644
--- a/home/modules/theme.nix
+++ b/home/modules/theme.nix
@@ -69,7 +69,7 @@ in
       package = pkgs.apple-cursor;
       size = 24;
       gtk.enable = true;
-      x11.enable = true;
+      x11.enable = false;
     };
 
     home.file.".local/share/fonts".source =
diff --git a/home/modules/ui.nix b/home/modules/ui.nix
index 06d2ca3..7a6b1e3 100644
--- a/home/modules/ui.nix
+++ b/home/modules/ui.nix
@@ -38,9 +38,6 @@ in
     pamixer
     socat
     (python3.withPackages (ps: [ ps.pillow ]))
-    xinit
-    xmodmap
-    xrdb
   ];
 
   wayland.windowManager.hyprland = {
@@ -540,6 +537,4 @@ in
     $DRY_RUN_CMD ln -sf "${config.xdg.configHome}/waybar/themes/${config.theme}.css" "$target"
   '';
 
-  xdg.configFile."X11".source =
-    config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/X11";
 }