From 201fabbc147e59ba49f8743ceef3fe0ce84e5056 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 20 May 2024 20:18:05 +0100
Subject: [PATCH 1/5] home: vim: remove redundant ftdetect files

These have been added upstream and made redundant as part of the update
to v0.10.
---
 modules/home/vim/ftdetect/blueprint.lua | 6 ------
 modules/home/vim/ftdetect/gn.lua        | 7 -------
 modules/home/vim/ftdetect/kbuild.lua    | 6 ------
 modules/home/vim/ftdetect/tikz.lua      | 6 ------
 4 files changed, 25 deletions(-)
 delete mode 100644 modules/home/vim/ftdetect/blueprint.lua
 delete mode 100644 modules/home/vim/ftdetect/gn.lua
 delete mode 100644 modules/home/vim/ftdetect/kbuild.lua
 delete mode 100644 modules/home/vim/ftdetect/tikz.lua

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",
-    },
-})

From a60287f8cf85e1f0bc0ddf40b110b4744244dee0 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 20 May 2024 20:26:12 +0100
Subject: [PATCH 2/5] home: vim: remove 'nvim-osc52'

OSC52 supports has been added upstream, and is set up automatically when
`SSH_TTY` is set (and a few other conditions) in v0.10.
---
 modules/home/vim/default.nix             |  1 -
 modules/home/vim/plugin/settings/ssh.lua | 17 -----------------
 2 files changed, 18 deletions(-)
 delete mode 100644 modules/home/vim/plugin/settings/ssh.lua

diff --git a/modules/home/vim/default.nix b/modules/home/vim/default.nix
index 07711cc..2e85ba3 100644
--- a/modules/home/vim/default.nix
+++ b/modules/home/vim/default.nix
@@ -58,7 +58,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
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 },
-}

From cc82d7575f370f44d4ab0f12b339bee8869fc894 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 20 May 2024 20:27:39 +0100
Subject: [PATCH 3/5] home: vim: do not set 'termguicolors' explicitly

Rely on the new behaviour from v0.10 which detects it more
intelligently.
---
 modules/home/vim/init.vim | 2 --
 1 file changed, 2 deletions(-)

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")

From 212f280d921e035b5f9c015be50564240eddb074 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 20 May 2024 20:33:02 +0100
Subject: [PATCH 4/5] home: vim: remove commenting plug-ins

Rely on the new built-in support which was added upstream as part of
v0.10.

Crucially, upstream supports using tree-sitter aware comment strings by default.
---
 modules/home/vim/after/plugin/mappings/commentary.lua | 10 ----------
 modules/home/vim/default.nix                          |  2 --
 2 files changed, 12 deletions(-)
 delete mode 100644 modules/home/vim/after/plugin/mappings/commentary.lua

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 2e85ba3..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
@@ -69,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

From e0b66e89f9cd85abccad9307b4d3863955cd4818 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 20 May 2024 20:39:08 +0100
Subject: [PATCH 5/5] home: vim: ftplugin: remove bp

It's now part of the upstream runtime as of v0.10, so this file is
redundant and can be removed.
---
 modules/home/vim/after/ftplugin/bp.vim | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 modules/home/vim/after/ftplugin/bp.vim

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<'