From 77bce04e390e080d13c87e097a7f411fb3ad28fd Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Thu, 12 Jun 2025 13:00:10 +0100
Subject: [PATCH] Refactor

---
 flake.nix                                                       | 2 +-
 .../coding/neovim/{nixvim.nix => config/default.nix}            | 0
 modules/home-manager/coding/neovim/{ => config}/keymaps.nix     | 0
 modules/home-manager/coding/neovim/{ => config}/options.nix     | 0
 modules/home-manager/coding/neovim/{ => config}/plugins/cmp.nix | 0
 .../home-manager/coding/neovim/{ => config}/plugins/conform.nix | 0
 .../home-manager/coding/neovim/{ => config}/plugins/fidget.nix  | 0
 .../coding/neovim/{ => config}/plugins/fugitive.nix             | 0
 .../coding/neovim/{ => config}/plugins/gitsigns.nix             | 0
 .../home-manager/coding/neovim/{ => config}/plugins/harpoon.nix | 0
 .../home-manager/coding/neovim/{ => config}/plugins/lint.nix    | 0
 modules/home-manager/coding/neovim/{ => config}/plugins/lsp.nix | 0
 .../home-manager/coding/neovim/{ => config}/plugins/lualine.nix | 0
 .../home-manager/coding/neovim/{ => config}/plugins/luasnip.nix | 0
 .../home-manager/coding/neovim/{ => config}/plugins/mini.nix    | 0
 .../coding/neovim/{ => config}/plugins/nvim-autopairs.nix       | 0
 modules/home-manager/coding/neovim/{ => config}/plugins/oil.nix | 0
 .../coding/neovim/{ => config}/plugins/phpactor.nix             | 0
 .../coding/neovim/{ => config}/plugins/refactoring.nix          | 0
 .../coding/neovim/{ => config}/plugins/telescope.nix            | 0
 .../coding/neovim/{ => config}/plugins/treesitter.nix           | 0
 .../coding/neovim/{ => config}/plugins/undotree.nix             | 0
 .../coding/neovim/{ => config}/plugins/vim-dadbod.nix           | 0
 .../coding/neovim/{ => config}/plugins/vim-highlightedyank.nix  | 0
 .../coding/neovim/{ => config}/plugins/vim-test.nix             | 0
 .../coding/neovim/{ => config}/plugins/web-devicons.nix         | 0
 modules/home-manager/coding/neovim/default.nix                  | 2 +-
 27 files changed, 2 insertions(+), 2 deletions(-)
 rename modules/home-manager/coding/neovim/{nixvim.nix => config/default.nix} (100%)
 rename modules/home-manager/coding/neovim/{ => config}/keymaps.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/options.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/cmp.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/conform.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/fidget.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/fugitive.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/gitsigns.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/harpoon.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/lint.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/lsp.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/lualine.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/luasnip.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/mini.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/nvim-autopairs.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/oil.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/phpactor.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/refactoring.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/telescope.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/treesitter.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/undotree.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/vim-dadbod.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/vim-highlightedyank.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/vim-test.nix (100%)
 rename modules/home-manager/coding/neovim/{ => config}/plugins/web-devicons.nix (100%)

diff --git a/flake.nix b/flake.nix
index 3d35fdf3..80aafc68 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,7 +46,7 @@
       neovimWithConfig = inputs.nixvim.legacyPackages.${system}.makeNixvimWithModule {
         inherit pkgs;
 
-        module = import ./modules/home-manager/coding/neovim/nixvim.nix;
+        module = import ./modules/home-manager/coding/neovim/config;
       };
     in
     {
diff --git a/modules/home-manager/coding/neovim/nixvim.nix b/modules/home-manager/coding/neovim/config/default.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/nixvim.nix
rename to modules/home-manager/coding/neovim/config/default.nix
diff --git a/modules/home-manager/coding/neovim/keymaps.nix b/modules/home-manager/coding/neovim/config/keymaps.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/keymaps.nix
rename to modules/home-manager/coding/neovim/config/keymaps.nix
diff --git a/modules/home-manager/coding/neovim/options.nix b/modules/home-manager/coding/neovim/config/options.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/options.nix
rename to modules/home-manager/coding/neovim/config/options.nix
diff --git a/modules/home-manager/coding/neovim/plugins/cmp.nix b/modules/home-manager/coding/neovim/config/plugins/cmp.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/cmp.nix
rename to modules/home-manager/coding/neovim/config/plugins/cmp.nix
diff --git a/modules/home-manager/coding/neovim/plugins/conform.nix b/modules/home-manager/coding/neovim/config/plugins/conform.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/conform.nix
rename to modules/home-manager/coding/neovim/config/plugins/conform.nix
diff --git a/modules/home-manager/coding/neovim/plugins/fidget.nix b/modules/home-manager/coding/neovim/config/plugins/fidget.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/fidget.nix
rename to modules/home-manager/coding/neovim/config/plugins/fidget.nix
diff --git a/modules/home-manager/coding/neovim/plugins/fugitive.nix b/modules/home-manager/coding/neovim/config/plugins/fugitive.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/fugitive.nix
rename to modules/home-manager/coding/neovim/config/plugins/fugitive.nix
diff --git a/modules/home-manager/coding/neovim/plugins/gitsigns.nix b/modules/home-manager/coding/neovim/config/plugins/gitsigns.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/gitsigns.nix
rename to modules/home-manager/coding/neovim/config/plugins/gitsigns.nix
diff --git a/modules/home-manager/coding/neovim/plugins/harpoon.nix b/modules/home-manager/coding/neovim/config/plugins/harpoon.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/harpoon.nix
rename to modules/home-manager/coding/neovim/config/plugins/harpoon.nix
diff --git a/modules/home-manager/coding/neovim/plugins/lint.nix b/modules/home-manager/coding/neovim/config/plugins/lint.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/lint.nix
rename to modules/home-manager/coding/neovim/config/plugins/lint.nix
diff --git a/modules/home-manager/coding/neovim/plugins/lsp.nix b/modules/home-manager/coding/neovim/config/plugins/lsp.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/lsp.nix
rename to modules/home-manager/coding/neovim/config/plugins/lsp.nix
diff --git a/modules/home-manager/coding/neovim/plugins/lualine.nix b/modules/home-manager/coding/neovim/config/plugins/lualine.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/lualine.nix
rename to modules/home-manager/coding/neovim/config/plugins/lualine.nix
diff --git a/modules/home-manager/coding/neovim/plugins/luasnip.nix b/modules/home-manager/coding/neovim/config/plugins/luasnip.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/luasnip.nix
rename to modules/home-manager/coding/neovim/config/plugins/luasnip.nix
diff --git a/modules/home-manager/coding/neovim/plugins/mini.nix b/modules/home-manager/coding/neovim/config/plugins/mini.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/mini.nix
rename to modules/home-manager/coding/neovim/config/plugins/mini.nix
diff --git a/modules/home-manager/coding/neovim/plugins/nvim-autopairs.nix b/modules/home-manager/coding/neovim/config/plugins/nvim-autopairs.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/nvim-autopairs.nix
rename to modules/home-manager/coding/neovim/config/plugins/nvim-autopairs.nix
diff --git a/modules/home-manager/coding/neovim/plugins/oil.nix b/modules/home-manager/coding/neovim/config/plugins/oil.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/oil.nix
rename to modules/home-manager/coding/neovim/config/plugins/oil.nix
diff --git a/modules/home-manager/coding/neovim/plugins/phpactor.nix b/modules/home-manager/coding/neovim/config/plugins/phpactor.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/phpactor.nix
rename to modules/home-manager/coding/neovim/config/plugins/phpactor.nix
diff --git a/modules/home-manager/coding/neovim/plugins/refactoring.nix b/modules/home-manager/coding/neovim/config/plugins/refactoring.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/refactoring.nix
rename to modules/home-manager/coding/neovim/config/plugins/refactoring.nix
diff --git a/modules/home-manager/coding/neovim/plugins/telescope.nix b/modules/home-manager/coding/neovim/config/plugins/telescope.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/telescope.nix
rename to modules/home-manager/coding/neovim/config/plugins/telescope.nix
diff --git a/modules/home-manager/coding/neovim/plugins/treesitter.nix b/modules/home-manager/coding/neovim/config/plugins/treesitter.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/treesitter.nix
rename to modules/home-manager/coding/neovim/config/plugins/treesitter.nix
diff --git a/modules/home-manager/coding/neovim/plugins/undotree.nix b/modules/home-manager/coding/neovim/config/plugins/undotree.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/undotree.nix
rename to modules/home-manager/coding/neovim/config/plugins/undotree.nix
diff --git a/modules/home-manager/coding/neovim/plugins/vim-dadbod.nix b/modules/home-manager/coding/neovim/config/plugins/vim-dadbod.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/vim-dadbod.nix
rename to modules/home-manager/coding/neovim/config/plugins/vim-dadbod.nix
diff --git a/modules/home-manager/coding/neovim/plugins/vim-highlightedyank.nix b/modules/home-manager/coding/neovim/config/plugins/vim-highlightedyank.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/vim-highlightedyank.nix
rename to modules/home-manager/coding/neovim/config/plugins/vim-highlightedyank.nix
diff --git a/modules/home-manager/coding/neovim/plugins/vim-test.nix b/modules/home-manager/coding/neovim/config/plugins/vim-test.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/vim-test.nix
rename to modules/home-manager/coding/neovim/config/plugins/vim-test.nix
diff --git a/modules/home-manager/coding/neovim/plugins/web-devicons.nix b/modules/home-manager/coding/neovim/config/plugins/web-devicons.nix
similarity index 100%
rename from modules/home-manager/coding/neovim/plugins/web-devicons.nix
rename to modules/home-manager/coding/neovim/config/plugins/web-devicons.nix
diff --git a/modules/home-manager/coding/neovim/default.nix b/modules/home-manager/coding/neovim/default.nix
index 7b9d00b4..66dcb624 100644
--- a/modules/home-manager/coding/neovim/default.nix
+++ b/modules/home-manager/coding/neovim/default.nix
@@ -24,7 +24,7 @@ in
       viAlias = true;
       vimAlias = true;
 
-      imports = [ ./nixvim.nix ];
+      imports = [ ./config ];
     };
   };
 }