From a29ab8a5464dd04514aa645322efb4d9f2b2fc7d Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Mon, 14 Feb 2022 10:06:42 +0100
Subject: [PATCH] vim: replace trailing whitespace plugin

---
 .../lua/fs/config/vim-better-whitespace.lua   | 23 +++++++++++++++++++
 .../lua/fs/config/vim-trailing-whitespace.lua |  9 --------
 config/nvim/lua/fs/plugins.lua                |  5 ++--
 3 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 config/nvim/lua/fs/config/vim-better-whitespace.lua
 delete mode 100644 config/nvim/lua/fs/config/vim-trailing-whitespace.lua

diff --git a/config/nvim/lua/fs/config/vim-better-whitespace.lua b/config/nvim/lua/fs/config/vim-better-whitespace.lua
new file mode 100644
index 0000000..8ce70ae
--- /dev/null
+++ b/config/nvim/lua/fs/config/vim-better-whitespace.lua
@@ -0,0 +1,23 @@
+local util = require'fs.util'
+local nmap = util.nmap
+local colors = util.colors()
+local highlight = util.highlight
+
+local setup = function()
+  vim.g.better_whitespace_filetypes_blacklist = {
+    'diff', 'git', 'gitcommit', 'help', 'fugitive'
+  }
+end
+
+local config = function()
+  highlight('ExtraWhitespace') { fg = colors.orange, bg = colors.orange }
+
+  -- fix whitespace
+  nmap { '<leader>w', '<cmd>StripWhitespace<cr>' }
+
+  -- show/hide whitespace
+  nmap { '<leader>sw', '<cmd>ToggleWhitespace<cr>' }
+end
+
+return { config = config, setup = setup }
+
diff --git a/config/nvim/lua/fs/config/vim-trailing-whitespace.lua b/config/nvim/lua/fs/config/vim-trailing-whitespace.lua
deleted file mode 100644
index d1e7bf7..0000000
--- a/config/nvim/lua/fs/config/vim-trailing-whitespace.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local nmap = require'fs.util'.nmap
-
-local config = function()
-  -- fix whitespace
-  nmap { '<leader>w', '<cmd>FixWhitespace<cr>' }
-end
-
-return { config = config }
-
diff --git a/config/nvim/lua/fs/plugins.lua b/config/nvim/lua/fs/plugins.lua
index 45592bc..7d9c419 100644
--- a/config/nvim/lua/fs/plugins.lua
+++ b/config/nvim/lua/fs/plugins.lua
@@ -38,8 +38,9 @@ local plugins = function(use)
 
   -- Editing ----------------------------------------------------------------
   use {
-    'bronson/vim-trailing-whitespace',
-    config = function() require'fs.config.vim-trailing-whitespace'.config() end,
+    'ntpeters/vim-better-whitespace',
+    setup = function() require'fs.config.vim-better-whitespace'.setup() end,
+    config = function() require'fs.config.vim-better-whitespace'.config() end,
   }
   use 'godlygeek/tabular'
   use 'tpope/vim-commentary'