diff --git a/neovim/config/plugins/diffview.lua b/neovim/config/plugins/diffview.lua
deleted file mode 100644
index f9630bb..0000000
--- a/neovim/config/plugins/diffview.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-vim.pack.add({ 'https://github.com/sindrets/diffview.nvim' })
-
-require('diffview').setup()
-
-local function map(lhs, rhs, desc)
-  vim.keymap.set('n', lhs, rhs, { desc = desc })
-end
-
-map('<leader>gd', '<Cmd>DiffviewOpen<CR>', 'Diff against index')
-map('<leader>gc', '<Cmd>DiffviewClose<CR>', 'Close diff view')
-map('<leader>gh', '<Cmd>DiffviewFileHistory %<CR>', 'File history')
-map('<leader>gH', '<Cmd>DiffviewFileHistory<CR>', 'Branch history')
diff --git a/neovim/config/plugins/init.lua b/neovim/config/plugins/init.lua
index fc2c8eb..708bbb7 100644
--- a/neovim/config/plugins/init.lua
+++ b/neovim/config/plugins/init.lua
@@ -1,4 +1,3 @@
-require('config.plugins.diffview')
 require('config.plugins.fzf-lua')
 require('config.plugins.gitsigns')
 require('config.plugins.nvim-tree')
diff --git a/neovim/config/plugins/which-key.lua b/neovim/config/plugins/which-key.lua
index a663754..634bd35 100644
--- a/neovim/config/plugins/which-key.lua
+++ b/neovim/config/plugins/which-key.lua
@@ -8,7 +8,6 @@ wk.setup()
 wk.add({
   { '<leader>d', group = 'diagnostics' },
   { '<leader>f', group = 'find' },
-  { '<leader>g', group = 'diff' },
   { '<leader>h', group = 'hunks' },
   { '<leader>t', group = 'toggles' },
 })
diff --git a/neovim/nvim-pack-lock.json b/neovim/nvim-pack-lock.json
index 335a0f8..02bc8b6 100644
--- a/neovim/nvim-pack-lock.json
+++ b/neovim/nvim-pack-lock.json
@@ -1,9 +1,5 @@
 {
   "plugins": {
-    "diffview.nvim": {
-      "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
-      "src": "https://github.com/sindrets/diffview.nvim"
-    },
     "fzf-lua": {
       "rev": "8671012a7b2a1648595952c655039d51fb301c14",
       "src": "https://github.com/ibhagwan/fzf-lua"
diff --git a/tmux b/tmux
index 45329ff..49182f0 100644
--- a/tmux
+++ b/tmux
@@ -14,10 +14,6 @@ set -g renumber-windows on
 # don't detach when closing a window if other windows remain
 set -g detach-on-destroy off
 
-# prompt for a name and create a session in one step, instead of
-# `<prefix> :` then `new -s name`
-bind-key S command-prompt -p "New session name:" "new-session -s '%%'"
-
 # reload config file (change file location to your the tmux.conf you want to use)
 unbind r
 bind r source-file ~/.tmux.conf
@@ -55,7 +51,5 @@ set-hook -g client-dark-theme 'source-file ~/.tmux-dark.conf'
 # client attaches. Sourcing is idempotent, so the overlap is harmless.
 set-hook -g client-attached 'if -F "#{==:#{client_theme},light}" "source-file ~/.tmux-light.conf" "source-file ~/.tmux-dark.conf"'
 
-# Default before any client has attached and reported a theme. This also
-# runs on manual reload (`r` below), so check the invoking client's theme
-# rather than always falling back to dark and clobbering a light session.
-if -F "#{==:#{client_theme},light}" "source-file ~/.tmux-light.conf" "source-file ~/.tmux-dark.conf"
+# Default before any client has attached and reported a theme.
+source-file ~/.tmux-dark.conf