From cf2cbbf19b76d6e10dd1162ee22cac8d4155ec91 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Mon, 30 Dec 2024 18:45:50 +0000
Subject: [PATCH] Simplify Neovim configuration
---
.../home-manager/features/cli/neovim.nix | 29 ++----------
nvim/plugin/dial.lua | 45 -------------------
nvim/plugin/fidget.lua | 7 ---
nvim/plugin/mini.lua | 2 +
nvim/plugin/nvim-tmux-navigation.lua | 12 -----
nvim/plugin/sort.lua | 10 -----
nvim/plugin/spectre.lua | 1 -
nvim/plugin/terminal.lua | 25 -----------
nvim/plugin/treesj.lua | 8 ----
9 files changed, 6 insertions(+), 133 deletions(-)
delete mode 100644 nvim/plugin/dial.lua
delete mode 100644 nvim/plugin/fidget.lua
delete mode 100644 nvim/plugin/nvim-tmux-navigation.lua
delete mode 100644 nvim/plugin/sort.lua
delete mode 100644 nvim/plugin/spectre.lua
delete mode 100644 nvim/plugin/terminal.lua
delete mode 100644 nvim/plugin/treesj.lua
diff --git a/nix/modules/home-manager/features/cli/neovim.nix b/nix/modules/home-manager/features/cli/neovim.nix
index d4070e2d..2ebf6e43 100644
--- a/nix/modules/home-manager/features/cli/neovim.nix
+++ b/nix/modules/home-manager/features/cli/neovim.nix
@@ -17,49 +17,28 @@ with lib;
plugins = with pkgs.vimPlugins; [
comment-nvim
- dial-nvim
- fidget-nvim
+ conf-vim
+ edit-alternate-vim
gitsigns-nvim
harpoon
- impatient-nvim
mini-nvim
- neodev-nvim
- nvim-spectre
nvim-web-devicons
oil-nvim
refactoring-nvim
- sort-nvim
- treesj
+ standard-vim
undotree
- vim-abolish
- vim-eunuch
- vim-highlightedyank
- vim-just
vim-nix
- vim-obsession
vim-pasta
vim-repeat
vim-sleuth
- vim-sort-motion
- vim-terraform
- vim-textobj-user
- vim-unimpaired
-
- conf-vim
- edit-alternate-vim
- nvim-tmux-navigation
- standard-vim
- vim-autoread
vim-textobj-indent
vim-textobj-xmlattr
- vim-zoom
+ vim-unimpaired
# Testing
vim-test
# Git
- committia-vim
- diffview-nvim
vim-fugitive
# Debugging
diff --git a/nvim/plugin/dial.lua b/nvim/plugin/dial.lua
deleted file mode 100644
index 10f33cfa..00000000
--- a/nvim/plugin/dial.lua
+++ /dev/null
@@ -1,45 +0,0 @@
-local augend = require "dial.augend"
-local dial_config = require "dial.config"
-
-dial_config.augends:register_group {
- visual = {
- augend.integer.alias.decimal,
- augend.integer.alias.hex,
- augend.date.alias["%Y/%m/%d"],
- augend.constant.alias.alpha,
- augend.constant.alias.Alpha,
- },
-
- mygroup = {
- augend.constant.new {
- elements = { "TRUE", "FALSE" },
- word = true,
- cyclic = true,
- },
-
- augend.constant.new {
- elements = { "public", "protected", "private" },
- word = true,
- cyclic = true,
- },
-
- augend.constant.new {
- elements = { "&&", "||" },
- word = false,
- cyclic = true,
- },
-
- augend.date.alias["%d/%m/%Y"],
- augend.constant.alias.bool, -- boolean value (true <-> false)
- augend.integer.alias.decimal,
- augend.integer.alias.hex,
- augend.semver.alias.semver,
- },
-}
-
-local dial_map = require "dial.map"
-
-vim.keymap.set("n", "<C-a>", dial_map.inc_normal "mygroup")
-vim.keymap.set("n", "<C-x>", dial_map.dec_normal "mygroup")
-vim.keymap.set("v", "<C-a>", dial_map.inc_normal "visual")
-vim.keymap.set("v", "<C-x>", dial_map.dec_normal "visual")
diff --git a/nvim/plugin/fidget.lua b/nvim/plugin/fidget.lua
deleted file mode 100644
index 2a0375fa..00000000
--- a/nvim/plugin/fidget.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-require("fidget").setup {
- notification = {
- window = {
- winblend = 0,
- },
- },
-}
diff --git a/nvim/plugin/mini.lua b/nvim/plugin/mini.lua
index 4ffaf890..2caa5de6 100644
--- a/nvim/plugin/mini.lua
+++ b/nvim/plugin/mini.lua
@@ -15,4 +15,6 @@ require("mini.move").setup {}
require("mini.operators").setup {}
+require("mini.splitjoin").setup {}
+
require("mini.surround").setup {}
diff --git a/nvim/plugin/nvim-tmux-navigation.lua b/nvim/plugin/nvim-tmux-navigation.lua
deleted file mode 100644
index ace897a5..00000000
--- a/nvim/plugin/nvim-tmux-navigation.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-require("nvim-tmux-navigation").setup {
- disable_when_zoomed = true,
-
- keybindings = {
- left = "<C-h>",
- down = "<C-j>",
- up = "<C-k>",
- right = "<C-l>",
- last_active = "<C-\\>",
- next = "<C-Space>",
- },
-}
diff --git a/nvim/plugin/sort.lua b/nvim/plugin/sort.lua
deleted file mode 100644
index bdf96d76..00000000
--- a/nvim/plugin/sort.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-require("sort").setup()
-
-vim.cmd([[
- nnoremap <silent> go" vi"<Esc><Cmd>Sort<CR>
- nnoremap <silent> go' vi'<Esc><Cmd>Sort<CR>
- nnoremap <silent> go( vi(<Esc><Cmd>Sort<CR>
- nnoremap <silent> go[ vi[<Esc><Cmd>Sort<CR>
- nnoremap <silent> gop vip<Esc><Cmd>Sort<CR>
- nnoremap <silent> go{ vi{<Esc><Cmd>Sort<CR>
-]])
diff --git a/nvim/plugin/spectre.lua b/nvim/plugin/spectre.lua
deleted file mode 100644
index b67854e6..00000000
--- a/nvim/plugin/spectre.lua
+++ /dev/null
@@ -1 +0,0 @@
-require("spectre").setup()
diff --git a/nvim/plugin/terminal.lua b/nvim/plugin/terminal.lua
deleted file mode 100644
index d0ee393a..00000000
--- a/nvim/plugin/terminal.lua
+++ /dev/null
@@ -1,25 +0,0 @@
-local set = vim.opt_local
-
--- Set local settings for terminal buffers
-vim.api.nvim_create_autocmd("TermOpen", {
- group = vim.api.nvim_create_augroup("custom-term-open", {}),
- callback = function()
- set.number = false
- set.relativenumber = false
- set.scrolloff = 0
-
- vim.bo.filetype = "terminal"
- end,
-})
-
--- Easily hit escape in terminal mode.
-vim.keymap.set("t", "<esc><esc>", "<c-\\><c-n>")
-
--- Open a terminal at the bottom of the screen with a fixed height.
-vim.keymap.set("n", ",st", function()
- vim.cmd.new()
- vim.cmd.wincmd "J"
- vim.api.nvim_win_set_height(0, 12)
- vim.wo.winfixheight = true
- vim.cmd.term()
-end)
diff --git a/nvim/plugin/treesj.lua b/nvim/plugin/treesj.lua
deleted file mode 100644
index a23b3ce3..00000000
--- a/nvim/plugin/treesj.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-local tsj = require "treesj"
-
-tsj.setup {
- use_default_keymaps = false,
-}
-
-vim.keymap.set("n", "gJ", tsj.join)
-vim.keymap.set("n", "gS", tsj.split)