diff --git a/tasks/dotfiles.yml b/tasks/dotfiles.yml
index 1d097f9..44445b2 100644
--- a/tasks/dotfiles.yml
+++ b/tasks/dotfiles.yml
@@ -38,15 +38,9 @@
     - src: '{{ ansible_env.HOME }}/dotfiles/.profile'
       dest: '{{ ansible_env.HOME }}/.profile'
 
-    - src: '{{ ansible_env.HOME }}/dotfiles/tmux/tmux.conf'
+    - src: '{{ ansible_env.HOME }}/dotfiles/.tmux.conf'
       dest: '{{ xdg_config_dir }}/tmux/tmux.conf'
 
-    - src: '{{ ansible_env.HOME }}/dotfiles/tmux/light.conf'
-      dest: '{{ xdg_config_dir }}/tmux/light.conf'
-
-    - src: '{{ ansible_env.HOME }}/dotfiles/tmux/dark.conf'
-      dest: '{{ xdg_config_dir }}/tmux/dark.conf'
-
     - src: '{{ ansible_env.HOME }}/dotfiles/.gitignore'
       dest: '{{ xdg_config_dir }}/git/ignore'
 
@@ -55,9 +49,3 @@
     src: 'templates/gitconfig.j2'
     dest: '{{ xdg_config_dir }}/git/config'
     mode: '0755'
-
-- name: Copy tmux toggle script
-  ansible.builtin.template:
-    src: 'templates/tmux-toggle.j2'
-    dest: '{{ ansible_env.HOME }}/.local/bin/tmux-toggle.sh'
-    mode: '0755'
diff --git a/tasks/neovim.yml b/tasks/neovim.yml
index ef4b2e3..f6e0696 100644
--- a/tasks/neovim.yml
+++ b/tasks/neovim.yml
@@ -123,6 +123,3 @@
 
     - src: 'templates/nvim/lua/formatting.lua.j2'
       dest: '{{ xdg_config_dir }}/nvim/lua/formatting.lua'
-
-    - src: 'templates/nvim/lua/diagnostic.lua.j2'
-      dest: '{{ xdg_config_dir }}/nvim/lua/diagnostic.lua'
diff --git a/templates/nvim/init.lua.j2 b/templates/nvim/init.lua.j2
index d017527..309c912 100644
--- a/templates/nvim/init.lua.j2
+++ b/templates/nvim/init.lua.j2
@@ -12,4 +12,3 @@ require('_nvim-tree')
 require('lua-line')
 require('_source-link')
 require('formatting')
-require('diagnostic')
diff --git a/templates/nvim/lua/diagnostic.lua.j2 b/templates/nvim/lua/diagnostic.lua.j2
deleted file mode 100644
index 97baa9e..0000000
--- a/templates/nvim/lua/diagnostic.lua.j2
+++ /dev/null
@@ -1,11 +0,0 @@
--- {{ ansible_managed }}
-
-vim.diagnostic.config {
-  float = {
-    suffix = function(diagnostic)
-      return (' %s | [%s]'):format(diagnostic.code, diagnostic.source)
-    end
-  },
-
-  virtual_text = { current_line = true }
-}
diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2
index 55da53c..b324de2 100644
--- a/templates/nvim/lua/lsp.lua.j2
+++ b/templates/nvim/lua/lsp.lua.j2
@@ -186,3 +186,11 @@ cmp.setup {
     end,
   },
 }
+
+vim.diagnostic.config {
+  float = {
+    suffix = function(diagnostic)
+      return (' %s | [%s]'):format(diagnostic.code, diagnostic.source)
+    end
+  },
+}
diff --git a/templates/tmux-toggle.j2 b/templates/tmux-toggle.j2
deleted file mode 100644
index 3a2bda6..0000000
--- a/templates/tmux-toggle.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env sh
-#
-# {{ ansible_managed }}
-#
-# Toggle the current window (all panes) between light and dark themes.
-
-set -e
-
-current_window_style=$(tmux show -Av window-style)
-
-case $current_window_style in
-    'fg=#000000,bg=#eff0f1')
-        tmux source-file ~/.config/tmux/dark.conf
-        ;;
-    *)
-        # Change back to the default window style.
-        tmux source-file ~/.config/tmux/light.conf
-        ;;
-esac