diff --git a/.gitmodules b/.gitmodules
index 21c48eb..d2f5cbd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -39,11 +39,6 @@
 	url = https://github.com/tmux-plugins/tmux-yank.git
 	ignore = dirty
 
-[submodule "tmux/tmux-window-name"]
-	path = config/tmux/plugins/tmux-window-name
-	url = https://github.com/ivuorinen/tmux-window-name.git
-	ignore = dirty
-
 [submodule "dotbot-pip"]
 	path = tools/dotbot-pip
 	url = https://github.com/sobolevn/dotbot-pip.git
diff --git a/add-submodules.sh b/add-submodules.sh
index d22de4b..a6bdf93 100755
--- a/add-submodules.sh
+++ b/add-submodules.sh
@@ -34,8 +34,6 @@ git submodule add --name tmux/tmux-sessionist \
   -f https://github.com/tmux-plugins/tmux-sessionist.git config/tmux/plugins/tmux-sessionist
 git submodule add --name tmux/tmux-suspend \
   -f https://github.com/MunifTanjim/tmux-suspend.git config/tmux/plugins/tmux-suspend
-git submodule add --name tmux/tmux-window-name \
-  -f https://github.com/ivuorinen/tmux-window-name.git config/tmux/plugins/tmux-window-name
 git submodule add --name tmux/tmux-yank \
   -f https://github.com/tmux-plugins/tmux-yank.git config/tmux/plugins/tmux-yank
 git submodule add --name tmux/tmux-current-pane-hostname \
@@ -61,6 +59,7 @@ folders=(
   "config/tmux/plugins/tmux-menus"
   "tools/dotbot-crontab"
   "tools/dotbot-snap"
+  "config/tmux/plugins/tmux-window-name"
   "config/nvim-kickstart"
   "local/bin/asdf"
   "local/asdf"
diff --git a/base/zshrc b/base/zshrc
index 016ae1a..f3a0f9a 100644
--- a/base/zshrc
+++ b/base/zshrc
@@ -33,24 +33,7 @@ source_fzf_config()
   fi
 }
 
-# Function to set up tmux window name plugin if tmux is active
-setup_tmux_window_name_plugin()
-{
-  if [[ -n "$TMUX" ]]; then
-    local tmux_window_name_plugin="$TMUX_PLUGINS/tmux-window-name/scripts/rename_session_windows.py"
-    if [[ -f "$tmux_window_name_plugin" ]]; then
-      tmux_window_name()
-      {
-        ($tmux_window_name_plugin &)
-      }
-      add-zsh-hook chpwd tmux_window_name
-      tmux_window_name
-    fi
-  fi
-}
-
 source_fzf_config
-setup_tmux_window_name_plugin
 x-have antidot && eval "$(antidot init)"
 
 autoload -Uz compinit bashcompinit
diff --git a/config/tmux/plugins/tmux-window-name b/config/tmux/plugins/tmux-window-name
deleted file mode 160000
index 9a75967..0000000
--- a/config/tmux/plugins/tmux-window-name
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9a75967ced4f3925de0714e96395223aa7e2b4ad
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
index c68d667..ccee5c1 100644
--- a/config/tmux/tmux.conf
+++ b/config/tmux/tmux.conf
@@ -103,17 +103,6 @@ bind -N "sesh ui"                  N display-popup -E "sesh ui"
 # https://github.com/MunifTanjim/tmux-suspend
 # set -g @suspend_key 'F8' # Default is F12
 
-##  A plugin to name your tmux windows smartly.
-## https://github.com/ofirgall/tmux-window-name
-### Maximum name length of a window
-set -g @tmux_window_name_max_name_len "25"
-### Replace $HOME with ~ in window names
-set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_ignored_programs "['sqlite3', 'antidote', 'direnv', 'md5']" # Default is []
-set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
-set -g @tmux_window_name_substitute_sets "[('.+ipython2', 'ipython2'), ('.+ipython3', 'ipython3'), ('.+\.local', '.local'), ('.+asdf', 'asdf')]"
-set -g @tmux_window_name_use_tilde "True"
-
 # https://github.com/erikw/tmux-dark-notify
 set -g @dark-notify-theme-path-light "$HOME/.dotfiles/config/tmux/theme-light.conf"
 set -g @dark-notify-theme-path-dark "$HOME/.dotfiles/config/tmux/theme-dark.conf"