diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index f96a7d7..0fe7481 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -78,7 +78,6 @@ input {
     repeat_rate = 50
 }
 
-exec-once = dunst
 exec-once = wl-paste --watch cliphist store
 exec-once = [ -f "${XDG_PICTURES_DIR:-$HOME/Pictures}/Screensavers/wallpaper.jpg" ] || ctl wallpaper wall
 exec-once = [ -f "${XDG_PICTURES_DIR:-$HOME/Pictures}/Screensavers/lock.jpg" ] || ctl wallpaper lock
diff --git a/config/zsh/zshrc b/config/zsh/zshrc
index 4cf0a21..c06c9a8 100644
--- a/config/zsh/zshrc
+++ b/config/zsh/zshrc
@@ -45,11 +45,11 @@ export FZF_COMPLETION_TRIGGER=\;
 export FZF_TMUX=1
 
 fzf-config-widget() {
-    file="$(fd --type file --hidden . "$XDG_CONFIG_HOME"/nix | sed "s|$HOME|~|g" | fzf)"
+    local file="$(FZF_CTRL_T_COMMAND="fd --type file --hidden . \"$XDG_CONFIG_HOME\"/nix | sed \"s|$HOME|~|g\"" __fzf_select)"
     [ -n "$file" ] || { zle reset-prompt; return; }
-    file="${file/#\~/$HOME}"
-    BUFFER="nvim $file"
-    zle accept-line
+    file="${file/#\\~/~}"
+    LBUFFER+="$file"
+    zle reset-prompt
 }
 zle -N fzf-config-widget
 bindkey '^E' fzf-config-widget
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index b1c00c9..20b88be 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -14,7 +14,6 @@ let
   zen = true;
   sioyek = true;
   vesktop = true;
-  claude = true;
   signal = true;
 
   hexDigit =
@@ -100,10 +99,7 @@ let
   };
 in
 {
-  home.sessionVariables = lib.mkMerge [
-    (lib.mkIf zen { BROWSER = "zen-beta"; })
-    (lib.mkIf claude { CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude"; })
-  ];
+  home.sessionVariables = lib.mkIf zen { BROWSER = "zen-beta"; };
 
   programs.mpv.enable = true;
 
@@ -125,34 +121,8 @@ in
       (if hostConfig.isLinux then sioyek-wrapped else pkgs.sioyek)
     ]
     ++ lib.optionals (vesktop && hostConfig.isLinux) [ pkgs.vesktop ]
-    ++ lib.optionals claude [ pkgs.claude-code ]
     ++ lib.optionals (signal && hostConfig.isLinux) [ pkgs.signal-desktop ];
 
-  xdg.configFile."claude/settings.json" = lib.mkIf claude {
-    text = builtins.toJSON {
-      permissions.defaultMode = "acceptEdits";
-      network_access = true;
-      allowed_domains = [
-        "github.com"
-        "raw.githubusercontent.com"
-        "api.github.com"
-      ];
-      tools.web_fetch = true;
-    };
-  };
-
-  xdg.configFile."claude/CLAUDE.md" = lib.mkIf claude {
-    source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/CLAUDE.md";
-  };
-
-  xdg.configFile."claude/rules" = lib.mkIf claude {
-    source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/rules";
-  };
-
-  xdg.configFile."claude/skills" = lib.mkIf claude {
-    source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/skills";
-  };
-
   xdg.configFile."sioyek/keys_user.config" = lib.mkIf sioyek {
     text = ''
       previous_page k
diff --git a/home/modules/shell.nix b/home/modules/shell.nix
index 5a5cdbf..d293180 100644
--- a/home/modules/shell.nix
+++ b/home/modules/shell.nix
@@ -8,9 +8,11 @@
 
 let
   c = config.colors;
+  repoDir = "${config.home.homeDirectory}/.config/nix";
 
   ripgrep = config.programs.ripgrep.enable;
 
+  claude = true;
   rust = true;
   go = true;
   node = true;
@@ -44,7 +46,8 @@ in
       graphite-cli
     ]
     ++ lib.optionals hostConfig.isLinux [ xclip ]
-    ++ lib.optionals rust [ rustup ];
+    ++ lib.optionals rust [ rustup ]
+    ++ lib.optionals claude [ claude-code ];
 
   home.sessionVariables = lib.mkMerge [
     {
@@ -107,6 +110,9 @@ in
       TEXMFVAR = "${config.xdg.cacheHome}/texlive/texmf-var";
       TEXMFCONFIG = "${config.xdg.configHome}/texlive/texmf-config";
     })
+    (lib.mkIf claude {
+      CLAUDE_CONFIG_DIR = "${config.xdg.configHome}/claude";
+    })
   ];
 
   home.sessionPath = lib.mkMerge [
@@ -321,6 +327,31 @@ in
     '';
   };
 
+  xdg.configFile."claude/settings.json" = lib.mkIf claude {
+    text = builtins.toJSON {
+      permissions.defaultMode = "acceptEdits";
+      network_access = true;
+      allowed_domains = [
+        "github.com"
+        "raw.githubusercontent.com"
+        "api.github.com"
+      ];
+      tools.web_fetch = true;
+    };
+  };
+
+  xdg.configFile."claude/CLAUDE.md" = lib.mkIf claude {
+    source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/CLAUDE.md";
+  };
+
+  xdg.configFile."claude/rules" = lib.mkIf claude {
+    source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/rules";
+  };
+
+  xdg.configFile."claude/skills" = lib.mkIf claude {
+    source = config.lib.file.mkOutOfStoreSymlink "${repoDir}/config/claude/skills";
+  };
+
   xdg.configFile."tmux/themes/midnight.conf".source =
     config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/tmux/themes/midnight.conf";
   xdg.configFile."tmux/themes/daylight.conf".source =
diff --git a/scripts/theme b/scripts/theme
index b169a33..5d81d36 100755
--- a/scripts/theme
+++ b/scripts/theme
@@ -101,7 +101,7 @@ Linux)
     [ -f "$dunst_themes/$theme.conf" ] && {
       mkdir -p "$cfg/dunst/dunstrc.d"
       ln -sf "$dunst_themes/$theme.conf" "$cfg/dunst/dunstrc.d/theme.conf"
-      systemctl --user restart dunst
+      dunstctl reload
     }
 
   fi