diff --git a/modules/home/vim/after/ftplugin/bp.vim b/modules/home/vim/after/ftplugin/bp.vim
deleted file mode 100644
index 1224e7a..0000000
--- a/modules/home/vim/after/ftplugin/bp.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-" Create the `b:undo_ftplugin` variable if it doesn't exist
-call ftplugined#check_undo_ft()
-
-" Add comment format
-setlocal comments=b://,s1:/*,mb:*,ex:*/
-setlocal commentstring=//\ %s
-let b:undo_ftplugin.='|setlocal comments< commentstring<'
diff --git a/modules/home/vim/after/plugin/mappings/commentary.lua b/modules/home/vim/after/plugin/mappings/commentary.lua
deleted file mode 100644
index 6ed3b89..0000000
--- a/modules/home/vim/after/plugin/mappings/commentary.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local wk = require("which-key")
-
-local keys = {
-    name = "Comment/uncomment",
-    c = "Current line",
-    u = "Uncomment the current and adjacent commented lines",
-    ["gc"] = "Uncomment the current and adjacent commented lines",
-}
-
-wk.register(keys, { prefix = "gc" })
diff --git a/modules/home/vim/default.nix b/modules/home/vim/default.nix
index 07711cc..509ae58 100644
--- a/modules/home/vim/default.nix
+++ b/modules/home/vim/default.nix
@@ -40,7 +40,6 @@ in
       lualine-lsp-progress # Show progress for LSP servers
 
       # tpope essentials
-      vim-commentary # Easy comments
       vim-eunuch # UNIX integrations
       vim-fugitive # A 'git' wrapper
       vim-git # Sane git syntax files
@@ -58,7 +57,6 @@ in
 
       # General enhancements
       vim-qf # Better quick-fix list
-      nvim-osc52 # Send clipboard data through terminal escape for SSH
 
       # Other wrappers
       git-messenger-vim # A simple blame window
@@ -70,7 +68,6 @@ in
       none-ls-nvim # LSP integration for linters and formatters
       nvim-treesitter.withAllGrammars # Better highlighting
       nvim-treesitter-textobjects # More textobjects
-      nvim-ts-context-commentstring # Comment string in nested language blocks
       plenary-nvim # 'null-ls', 'telescope' dependency
 
       # Completion
diff --git a/modules/home/vim/ftdetect/blueprint.lua b/modules/home/vim/ftdetect/blueprint.lua
deleted file mode 100644
index d3fb395..0000000
--- a/modules/home/vim/ftdetect/blueprint.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Use `bp` filetype for Blueprint files
-vim.filetype.add({
-    extension = {
-        bp = "bp",
-    },
-})
diff --git a/modules/home/vim/ftdetect/gn.lua b/modules/home/vim/ftdetect/gn.lua
deleted file mode 100644
index 37d772e..0000000
--- a/modules/home/vim/ftdetect/gn.lua
+++ /dev/null
@@ -1,7 +0,0 @@
--- Use GN filetype for Chromium Generate Ninja files
-vim.filetype.add({
-    extension = {
-        gn = "gn",
-        gni = "gn",
-    },
-})
diff --git a/modules/home/vim/ftdetect/kbuild.lua b/modules/home/vim/ftdetect/kbuild.lua
deleted file mode 100644
index 799570e..0000000
--- a/modules/home/vim/ftdetect/kbuild.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Kbuild is just a Makefile under a different name
-vim.filetype.add({
-    filename = {
-        ["Kbuild"] = "make",
-    },
-})
diff --git a/modules/home/vim/ftdetect/tikz.lua b/modules/home/vim/ftdetect/tikz.lua
deleted file mode 100644
index 93b7db0..0000000
--- a/modules/home/vim/ftdetect/tikz.lua
+++ /dev/null
@@ -1,6 +0,0 @@
--- Use LaTeX filetype for TikZ files
-vim.filetype.add({
-    extension = {
-        tikz = "tex",
-    },
-})
diff --git a/modules/home/vim/init.vim b/modules/home/vim/init.vim
index c94fc53..3a74c4f 100644
--- a/modules/home/vim/init.vim
+++ b/modules/home/vim/init.vim
@@ -86,8 +86,6 @@ set mouse=
 " Set dark mode by default
 set background=dark
 
-" 24 bit colors
-set termguicolors
 " Setup some overrides for gruvbox
 lua << EOF
 local gruvbox = require("gruvbox")
diff --git a/modules/home/vim/plugin/settings/ssh.lua b/modules/home/vim/plugin/settings/ssh.lua
deleted file mode 100644
index 992a707..0000000
--- a/modules/home/vim/plugin/settings/ssh.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-if not require("ambroisie.utils").is_ssh() then
-    return
-end
-
-local function copy(lines, _)
-    require("osc52").copy(table.concat(lines, "\n"))
-end
-
-local function paste()
-    return { vim.fn.split(vim.fn.getreg(""), "\n"), vim.fn.getregtype("") }
-end
-
-vim.g.clipboard = {
-    name = "osc52",
-    copy = { ["+"] = copy, ["*"] = copy },
-    paste = { ["+"] = paste, ["*"] = paste },
-}