diff --git a/modules/git/default.nix b/modules/git/default.nix deleted file mode 100644 index 6336b41..0000000 --- a/modules/git/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - imports = [ - ./config.nix - ./git.nix - ]; -} diff --git a/modules/modules.nix b/modules/modules.nix index 1bfc069..e4b624f 100644 --- a/modules/modules.nix +++ b/modules/modules.nix @@ -4,32 +4,11 @@ check ? true, }: let modules = [ - ./completion - ./theme - ./core ./basic - ./statusline - ./tabline - ./filetree - ./visuals - ./lsp - ./treesitter - ./autopairs - ./snippets - ./git - ./minimap - ./dashboard - ./utility - ./rich-presence - ./notes - ./terminal - ./ui - ./assistant - ./session - ./comments - ./projects + ./core ./languages - ./debugger + ./plugins + ./themes ]; pkgsModule = {config, ...}: { diff --git a/modules/assistant/copilot/config.nix b/modules/plugins/assistant/copilot/config.nix similarity index 100% rename from modules/assistant/copilot/config.nix rename to modules/plugins/assistant/copilot/config.nix diff --git a/modules/assistant/copilot/copilot.nix b/modules/plugins/assistant/copilot/copilot.nix similarity index 100% rename from modules/assistant/copilot/copilot.nix rename to modules/plugins/assistant/copilot/copilot.nix diff --git a/modules/assistant/copilot/default.nix b/modules/plugins/assistant/copilot/default.nix similarity index 100% rename from modules/assistant/copilot/default.nix rename to modules/plugins/assistant/copilot/default.nix diff --git a/modules/assistant/default.nix b/modules/plugins/assistant/default.nix similarity index 96% rename from modules/assistant/default.nix rename to modules/plugins/assistant/default.nix index a8096c8..b3c359e 100644 --- a/modules/assistant/default.nix +++ b/modules/plugins/assistant/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./copilot # ./tabnine.nix # removed until I find a way around the initialisation script the plugin requires diff --git a/modules/assistant/tabnine/config.nix b/modules/plugins/assistant/tabnine/config.nix similarity index 100% rename from modules/assistant/tabnine/config.nix rename to modules/plugins/assistant/tabnine/config.nix diff --git a/modules/assistant/tabnine/default.nix b/modules/plugins/assistant/tabnine/default.nix similarity index 100% rename from modules/assistant/tabnine/default.nix rename to modules/plugins/assistant/tabnine/default.nix diff --git a/modules/assistant/tabnine/tabnine.nix b/modules/plugins/assistant/tabnine/tabnine.nix similarity index 100% rename from modules/assistant/tabnine/tabnine.nix rename to modules/plugins/assistant/tabnine/tabnine.nix diff --git a/modules/autopairs/default.nix b/modules/plugins/autopairs/default.nix similarity index 89% rename from modules/autopairs/default.nix rename to modules/plugins/autopairs/default.nix index 742665c..cc2f69c 100644 --- a/modules/autopairs/default.nix +++ b/modules/plugins/autopairs/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-autopairs ]; diff --git a/modules/autopairs/nvim-autopairs/config.nix b/modules/plugins/autopairs/nvim-autopairs/config.nix similarity index 100% rename from modules/autopairs/nvim-autopairs/config.nix rename to modules/plugins/autopairs/nvim-autopairs/config.nix diff --git a/modules/autopairs/nvim-autopairs/default.nix b/modules/plugins/autopairs/nvim-autopairs/default.nix similarity index 100% rename from modules/autopairs/nvim-autopairs/default.nix rename to modules/plugins/autopairs/nvim-autopairs/default.nix diff --git a/modules/autopairs/nvim-autopairs/nvim-autopairs.nix b/modules/plugins/autopairs/nvim-autopairs/nvim-autopairs.nix similarity index 100% rename from modules/autopairs/nvim-autopairs/nvim-autopairs.nix rename to modules/plugins/autopairs/nvim-autopairs/nvim-autopairs.nix diff --git a/modules/comments/comment-nvim/comment-nvim.nix b/modules/plugins/comments/comment-nvim/comment-nvim.nix similarity index 100% rename from modules/comments/comment-nvim/comment-nvim.nix rename to modules/plugins/comments/comment-nvim/comment-nvim.nix diff --git a/modules/comments/comment-nvim/config.nix b/modules/plugins/comments/comment-nvim/config.nix similarity index 100% rename from modules/comments/comment-nvim/config.nix rename to modules/plugins/comments/comment-nvim/config.nix diff --git a/modules/comments/comment-nvim/default.nix b/modules/plugins/comments/comment-nvim/default.nix similarity index 100% rename from modules/comments/comment-nvim/default.nix rename to modules/plugins/comments/comment-nvim/default.nix diff --git a/modules/comments/default.nix b/modules/plugins/comments/default.nix similarity index 88% rename from modules/comments/default.nix rename to modules/plugins/comments/default.nix index cb6ac19..afc1a87 100644 --- a/modules/comments/default.nix +++ b/modules/plugins/comments/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./comment-nvim ]; diff --git a/modules/completion/default.nix b/modules/plugins/completion/default.nix similarity index 87% rename from modules/completion/default.nix rename to modules/plugins/completion/default.nix index 77d51b4..0cae45f 100644 --- a/modules/completion/default.nix +++ b/modules/plugins/completion/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-cmp ]; diff --git a/modules/completion/nvim-cmp/config.nix b/modules/plugins/completion/nvim-cmp/config.nix similarity index 100% rename from modules/completion/nvim-cmp/config.nix rename to modules/plugins/completion/nvim-cmp/config.nix diff --git a/modules/completion/nvim-cmp/default.nix b/modules/plugins/completion/nvim-cmp/default.nix similarity index 100% rename from modules/completion/nvim-cmp/default.nix rename to modules/plugins/completion/nvim-cmp/default.nix diff --git a/modules/completion/nvim-cmp/nvim-cmp.nix b/modules/plugins/completion/nvim-cmp/nvim-cmp.nix similarity index 100% rename from modules/completion/nvim-cmp/nvim-cmp.nix rename to modules/plugins/completion/nvim-cmp/nvim-cmp.nix diff --git a/modules/dashboard/alpha/alpha.nix b/modules/plugins/dashboard/alpha/alpha.nix similarity index 100% rename from modules/dashboard/alpha/alpha.nix rename to modules/plugins/dashboard/alpha/alpha.nix diff --git a/modules/dashboard/alpha/config.nix b/modules/plugins/dashboard/alpha/config.nix similarity index 100% rename from modules/dashboard/alpha/config.nix rename to modules/plugins/dashboard/alpha/config.nix diff --git a/modules/dashboard/alpha/default.nix b/modules/plugins/dashboard/alpha/default.nix similarity index 100% rename from modules/dashboard/alpha/default.nix rename to modules/plugins/dashboard/alpha/default.nix diff --git a/modules/dashboard/dashboard-nvim/config.nix b/modules/plugins/dashboard/dashboard-nvim/config.nix similarity index 100% rename from modules/dashboard/dashboard-nvim/config.nix rename to modules/plugins/dashboard/dashboard-nvim/config.nix diff --git a/modules/dashboard/dashboard-nvim/dashboard-nvim.nix b/modules/plugins/dashboard/dashboard-nvim/dashboard-nvim.nix similarity index 100% rename from modules/dashboard/dashboard-nvim/dashboard-nvim.nix rename to modules/plugins/dashboard/dashboard-nvim/dashboard-nvim.nix diff --git a/modules/dashboard/dashboard-nvim/default.nix b/modules/plugins/dashboard/dashboard-nvim/default.nix similarity index 100% rename from modules/dashboard/dashboard-nvim/default.nix rename to modules/plugins/dashboard/dashboard-nvim/default.nix diff --git a/modules/dashboard/default.nix b/modules/plugins/dashboard/default.nix similarity index 88% rename from modules/dashboard/default.nix rename to modules/plugins/dashboard/default.nix index c63ad3e..365ea8d 100644 --- a/modules/dashboard/default.nix +++ b/modules/plugins/dashboard/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ imports = [ ./alpha ./dashboard-nvim diff --git a/modules/dashboard/startify/config.nix b/modules/plugins/dashboard/startify/config.nix similarity index 100% rename from modules/dashboard/startify/config.nix rename to modules/plugins/dashboard/startify/config.nix diff --git a/modules/dashboard/startify/default.nix b/modules/plugins/dashboard/startify/default.nix similarity index 100% rename from modules/dashboard/startify/default.nix rename to modules/plugins/dashboard/startify/default.nix diff --git a/modules/dashboard/startify/startify.nix b/modules/plugins/dashboard/startify/startify.nix similarity index 100% rename from modules/dashboard/startify/startify.nix rename to modules/plugins/dashboard/startify/startify.nix diff --git a/modules/debugger/default.nix b/modules/plugins/debugger/default.nix similarity index 87% rename from modules/debugger/default.nix rename to modules/plugins/debugger/default.nix index f882196..a34e059 100644 --- a/modules/debugger/default.nix +++ b/modules/plugins/debugger/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-dap ]; diff --git a/modules/debugger/nvim-dap/config.nix b/modules/plugins/debugger/nvim-dap/config.nix similarity index 100% rename from modules/debugger/nvim-dap/config.nix rename to modules/plugins/debugger/nvim-dap/config.nix diff --git a/modules/debugger/nvim-dap/default.nix b/modules/plugins/debugger/nvim-dap/default.nix similarity index 100% rename from modules/debugger/nvim-dap/default.nix rename to modules/plugins/debugger/nvim-dap/default.nix diff --git a/modules/debugger/nvim-dap/nvim-dap.nix b/modules/plugins/debugger/nvim-dap/nvim-dap.nix similarity index 100% rename from modules/debugger/nvim-dap/nvim-dap.nix rename to modules/plugins/debugger/nvim-dap/nvim-dap.nix diff --git a/modules/plugins/default.nix b/modules/plugins/default.nix new file mode 100644 index 0000000..080138c --- /dev/null +++ b/modules/plugins/default.nix @@ -0,0 +1,26 @@ +{ + imports = [ + ./completion + ./statusline + ./tabline + ./filetree + ./visuals + ./lsp + ./treesitter + ./autopairs + ./snippets + ./git + ./minimap + ./dashboard + ./utility + ./rich-presence + ./notes + ./terminal + ./ui + ./assistant + ./session + ./comments + ./projects + ./debugger + ]; +} diff --git a/modules/filetree/default.nix b/modules/plugins/filetree/default.nix similarity index 87% rename from modules/filetree/default.nix rename to modules/plugins/filetree/default.nix index fdceb6a..1441b4f 100644 --- a/modules/filetree/default.nix +++ b/modules/plugins/filetree/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvimtree ]; diff --git a/modules/filetree/nvimtree/config.nix b/modules/plugins/filetree/nvimtree/config.nix similarity index 100% rename from modules/filetree/nvimtree/config.nix rename to modules/plugins/filetree/nvimtree/config.nix diff --git a/modules/filetree/nvimtree/default.nix b/modules/plugins/filetree/nvimtree/default.nix similarity index 91% rename from modules/filetree/nvimtree/default.nix rename to modules/plugins/filetree/nvimtree/default.nix index 730ee5f..5a334e8 100644 --- a/modules/filetree/nvimtree/default.nix +++ b/modules/plugins/filetree/nvimtree/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./nvimtree.nix diff --git a/modules/filetree/nvimtree/nvimtree.nix b/modules/plugins/filetree/nvimtree/nvimtree.nix similarity index 100% rename from modules/filetree/nvimtree/nvimtree.nix rename to modules/plugins/filetree/nvimtree/nvimtree.nix diff --git a/modules/plugins/git/default.nix b/modules/plugins/git/default.nix new file mode 100644 index 0000000..77269f8 --- /dev/null +++ b/modules/plugins/git/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./gitsigns + ]; +} diff --git a/modules/git/config.nix b/modules/plugins/git/gitsigns/config.nix similarity index 98% rename from modules/git/config.nix rename to modules/plugins/git/gitsigns/config.nix index b22b48a..431e1a3 100644 --- a/modules/git/config.nix +++ b/modules/plugins/git/gitsigns/config.nix @@ -8,7 +8,7 @@ cfg = config.vim.git; - self = import ./git.nix {inherit lib;}; + self = import ./gitsigns.nix {inherit lib;}; gsMappingDefinitions = self.options.vim.git.gitsigns.mappings; gsMappings = addDescriptionsToMappings cfg.gitsigns.mappings gsMappingDefinitions; diff --git a/modules/plugins/git/gitsigns/default.nix b/modules/plugins/git/gitsigns/default.nix new file mode 100644 index 0000000..905e4bb --- /dev/null +++ b/modules/plugins/git/gitsigns/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./config.nix + ./gitsigns.nix + ]; +} diff --git a/modules/git/git.nix b/modules/plugins/git/gitsigns/gitsigns.nix similarity index 100% rename from modules/git/git.nix rename to modules/plugins/git/gitsigns/gitsigns.nix diff --git a/modules/lsp/config.nix b/modules/plugins/lsp/config.nix similarity index 100% rename from modules/lsp/config.nix rename to modules/plugins/lsp/config.nix diff --git a/modules/lsp/default.nix b/modules/plugins/lsp/default.nix similarity index 98% rename from modules/lsp/default.nix rename to modules/plugins/lsp/default.nix index 9a70efc..f8408aa 100644 --- a/modules/lsp/default.nix +++ b/modules/plugins/lsp/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ # nvim lsp support ./config.nix diff --git a/modules/lsp/lightbulb/config.nix b/modules/plugins/lsp/lightbulb/config.nix similarity index 100% rename from modules/lsp/lightbulb/config.nix rename to modules/plugins/lsp/lightbulb/config.nix diff --git a/modules/lsp/lightbulb/default.nix b/modules/plugins/lsp/lightbulb/default.nix similarity index 92% rename from modules/lsp/lightbulb/default.nix rename to modules/plugins/lsp/lightbulb/default.nix index 883944a..3e6e8a3 100644 --- a/modules/lsp/lightbulb/default.nix +++ b/modules/plugins/lsp/lightbulb/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./lightbulb.nix ./config.nix diff --git a/modules/lsp/lightbulb/lightbulb.nix b/modules/plugins/lsp/lightbulb/lightbulb.nix similarity index 100% rename from modules/lsp/lightbulb/lightbulb.nix rename to modules/plugins/lsp/lightbulb/lightbulb.nix diff --git a/modules/lsp/lsp-signature/config.nix b/modules/plugins/lsp/lsp-signature/config.nix similarity index 100% rename from modules/lsp/lsp-signature/config.nix rename to modules/plugins/lsp/lsp-signature/config.nix diff --git a/modules/lsp/lsp-signature/default.nix b/modules/plugins/lsp/lsp-signature/default.nix similarity index 92% rename from modules/lsp/lsp-signature/default.nix rename to modules/plugins/lsp/lsp-signature/default.nix index 0449a9e..d88ec99 100644 --- a/modules/lsp/lsp-signature/default.nix +++ b/modules/plugins/lsp/lsp-signature/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./lsp-signature.nix ./config.nix diff --git a/modules/lsp/lsp-signature/lsp-signature.nix b/modules/plugins/lsp/lsp-signature/lsp-signature.nix similarity index 100% rename from modules/lsp/lsp-signature/lsp-signature.nix rename to modules/plugins/lsp/lsp-signature/lsp-signature.nix diff --git a/modules/lsp/lspconfig/config.nix b/modules/plugins/lsp/lspconfig/config.nix similarity index 100% rename from modules/lsp/lspconfig/config.nix rename to modules/plugins/lsp/lspconfig/config.nix diff --git a/modules/lsp/lspconfig/default.nix b/modules/plugins/lsp/lspconfig/default.nix similarity index 92% rename from modules/lsp/lspconfig/default.nix rename to modules/plugins/lsp/lspconfig/default.nix index 117e4d4..e6e6c18 100644 --- a/modules/lsp/lspconfig/default.nix +++ b/modules/plugins/lsp/lspconfig/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./lspconfig.nix diff --git a/modules/lsp/lspconfig/lspconfig.nix b/modules/plugins/lsp/lspconfig/lspconfig.nix similarity index 100% rename from modules/lsp/lspconfig/lspconfig.nix rename to modules/plugins/lsp/lspconfig/lspconfig.nix diff --git a/modules/lsp/lspkind/config.nix b/modules/plugins/lsp/lspkind/config.nix similarity index 100% rename from modules/lsp/lspkind/config.nix rename to modules/plugins/lsp/lspkind/config.nix diff --git a/modules/lsp/lspkind/default.nix b/modules/plugins/lsp/lspkind/default.nix similarity index 91% rename from modules/lsp/lspkind/default.nix rename to modules/plugins/lsp/lspkind/default.nix index 81f7418..fbfa506 100644 --- a/modules/lsp/lspkind/default.nix +++ b/modules/plugins/lsp/lspkind/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./lspkind.nix diff --git a/modules/lsp/lspkind/lspkind.nix b/modules/plugins/lsp/lspkind/lspkind.nix similarity index 100% rename from modules/lsp/lspkind/lspkind.nix rename to modules/plugins/lsp/lspkind/lspkind.nix diff --git a/modules/lsp/lsplines/config.nix b/modules/plugins/lsp/lsplines/config.nix similarity index 100% rename from modules/lsp/lsplines/config.nix rename to modules/plugins/lsp/lsplines/config.nix diff --git a/modules/lsp/lsplines/default.nix b/modules/plugins/lsp/lsplines/default.nix similarity index 91% rename from modules/lsp/lsplines/default.nix rename to modules/plugins/lsp/lsplines/default.nix index fa50897..359cec4 100644 --- a/modules/lsp/lsplines/default.nix +++ b/modules/plugins/lsp/lsplines/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./lsplines.nix diff --git a/modules/lsp/lsplines/lsplines.nix b/modules/plugins/lsp/lsplines/lsplines.nix similarity index 100% rename from modules/lsp/lsplines/lsplines.nix rename to modules/plugins/lsp/lsplines/lsplines.nix diff --git a/modules/lsp/lspsaga/config.nix b/modules/plugins/lsp/lspsaga/config.nix similarity index 100% rename from modules/lsp/lspsaga/config.nix rename to modules/plugins/lsp/lspsaga/config.nix diff --git a/modules/lsp/lspsaga/default.nix b/modules/plugins/lsp/lspsaga/default.nix similarity index 91% rename from modules/lsp/lspsaga/default.nix rename to modules/plugins/lsp/lspsaga/default.nix index 29cf580..82c2ed7 100644 --- a/modules/lsp/lspsaga/default.nix +++ b/modules/plugins/lsp/lspsaga/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./lspsaga.nix ./config.nix diff --git a/modules/lsp/lspsaga/lspsaga.nix b/modules/plugins/lsp/lspsaga/lspsaga.nix similarity index 100% rename from modules/lsp/lspsaga/lspsaga.nix rename to modules/plugins/lsp/lspsaga/lspsaga.nix diff --git a/modules/lsp/module.nix b/modules/plugins/lsp/module.nix similarity index 100% rename from modules/lsp/module.nix rename to modules/plugins/lsp/module.nix diff --git a/modules/lsp/null-ls/config.nix b/modules/plugins/lsp/null-ls/config.nix similarity index 100% rename from modules/lsp/null-ls/config.nix rename to modules/plugins/lsp/null-ls/config.nix diff --git a/modules/lsp/null-ls/default.nix b/modules/plugins/lsp/null-ls/default.nix similarity index 91% rename from modules/lsp/null-ls/default.nix rename to modules/plugins/lsp/null-ls/default.nix index 01e6e59..d104e68 100644 --- a/modules/lsp/null-ls/default.nix +++ b/modules/plugins/lsp/null-ls/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./null-ls.nix diff --git a/modules/lsp/null-ls/null-ls.nix b/modules/plugins/lsp/null-ls/null-ls.nix similarity index 100% rename from modules/lsp/null-ls/null-ls.nix rename to modules/plugins/lsp/null-ls/null-ls.nix diff --git a/modules/lsp/nvim-code-action-menu/config.nix b/modules/plugins/lsp/nvim-code-action-menu/config.nix similarity index 100% rename from modules/lsp/nvim-code-action-menu/config.nix rename to modules/plugins/lsp/nvim-code-action-menu/config.nix diff --git a/modules/lsp/nvim-code-action-menu/default.nix b/modules/plugins/lsp/nvim-code-action-menu/default.nix similarity index 93% rename from modules/lsp/nvim-code-action-menu/default.nix rename to modules/plugins/lsp/nvim-code-action-menu/default.nix index 665cf92..f94dd22 100644 --- a/modules/lsp/nvim-code-action-menu/default.nix +++ b/modules/plugins/lsp/nvim-code-action-menu/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-code-action-menu.nix ./config.nix diff --git a/modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix b/modules/plugins/lsp/nvim-code-action-menu/nvim-code-action-menu.nix similarity index 100% rename from modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix rename to modules/plugins/lsp/nvim-code-action-menu/nvim-code-action-menu.nix diff --git a/modules/lsp/nvim-docs-view/config.nix b/modules/plugins/lsp/nvim-docs-view/config.nix similarity index 100% rename from modules/lsp/nvim-docs-view/config.nix rename to modules/plugins/lsp/nvim-docs-view/config.nix diff --git a/modules/lsp/nvim-docs-view/default.nix b/modules/plugins/lsp/nvim-docs-view/default.nix similarity index 92% rename from modules/lsp/nvim-docs-view/default.nix rename to modules/plugins/lsp/nvim-docs-view/default.nix index 499ec39..48716d0 100644 --- a/modules/lsp/nvim-docs-view/default.nix +++ b/modules/plugins/lsp/nvim-docs-view/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./nvim-docs-view.nix diff --git a/modules/lsp/nvim-docs-view/nvim-docs-view.nix b/modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix similarity index 100% rename from modules/lsp/nvim-docs-view/nvim-docs-view.nix rename to modules/plugins/lsp/nvim-docs-view/nvim-docs-view.nix diff --git a/modules/lsp/trouble/config.nix b/modules/plugins/lsp/trouble/config.nix similarity index 100% rename from modules/lsp/trouble/config.nix rename to modules/plugins/lsp/trouble/config.nix diff --git a/modules/lsp/trouble/default.nix b/modules/plugins/lsp/trouble/default.nix similarity index 91% rename from modules/lsp/trouble/default.nix rename to modules/plugins/lsp/trouble/default.nix index 3a5d2cb..77e9337 100644 --- a/modules/lsp/trouble/default.nix +++ b/modules/plugins/lsp/trouble/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./trouble.nix ./config.nix diff --git a/modules/lsp/trouble/trouble.nix b/modules/plugins/lsp/trouble/trouble.nix similarity index 100% rename from modules/lsp/trouble/trouble.nix rename to modules/plugins/lsp/trouble/trouble.nix diff --git a/modules/minimap/codewindow/codewindow.nix b/modules/plugins/minimap/codewindow/codewindow.nix similarity index 100% rename from modules/minimap/codewindow/codewindow.nix rename to modules/plugins/minimap/codewindow/codewindow.nix diff --git a/modules/minimap/codewindow/config.nix b/modules/plugins/minimap/codewindow/config.nix similarity index 100% rename from modules/minimap/codewindow/config.nix rename to modules/plugins/minimap/codewindow/config.nix diff --git a/modules/minimap/codewindow/default.nix b/modules/plugins/minimap/codewindow/default.nix similarity index 92% rename from modules/minimap/codewindow/default.nix rename to modules/plugins/minimap/codewindow/default.nix index f3f8a9a..0ce3ad2 100644 --- a/modules/minimap/codewindow/default.nix +++ b/modules/plugins/minimap/codewindow/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./codewindow.nix ./config.nix diff --git a/modules/minimap/default.nix b/modules/plugins/minimap/default.nix similarity index 86% rename from modules/minimap/default.nix rename to modules/plugins/minimap/default.nix index 6a03b01..7612ac1 100644 --- a/modules/minimap/default.nix +++ b/modules/plugins/minimap/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ imports = [ ./minimap-vim ./codewindow diff --git a/modules/minimap/minimap-vim/config.nix b/modules/plugins/minimap/minimap-vim/config.nix similarity index 100% rename from modules/minimap/minimap-vim/config.nix rename to modules/plugins/minimap/minimap-vim/config.nix diff --git a/modules/minimap/minimap-vim/default.nix b/modules/plugins/minimap/minimap-vim/default.nix similarity index 92% rename from modules/minimap/minimap-vim/default.nix rename to modules/plugins/minimap/minimap-vim/default.nix index 889184e..bf3aa55 100644 --- a/modules/minimap/minimap-vim/default.nix +++ b/modules/plugins/minimap/minimap-vim/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./minimap-vim.nix ./config.nix diff --git a/modules/minimap/minimap-vim/minimap-vim.nix b/modules/plugins/minimap/minimap-vim/minimap-vim.nix similarity index 100% rename from modules/minimap/minimap-vim/minimap-vim.nix rename to modules/plugins/minimap/minimap-vim/minimap-vim.nix diff --git a/modules/notes/default.nix b/modules/plugins/notes/default.nix similarity index 94% rename from modules/notes/default.nix rename to modules/plugins/notes/default.nix index eaf247f..88a7092 100644 --- a/modules/notes/default.nix +++ b/modules/plugins/notes/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./obsidian ./orgmode diff --git a/modules/notes/mind-nvim/config.nix b/modules/plugins/notes/mind-nvim/config.nix similarity index 100% rename from modules/notes/mind-nvim/config.nix rename to modules/plugins/notes/mind-nvim/config.nix diff --git a/modules/notes/mind-nvim/default.nix b/modules/plugins/notes/mind-nvim/default.nix similarity index 92% rename from modules/notes/mind-nvim/default.nix rename to modules/plugins/notes/mind-nvim/default.nix index e136b9d..be25fff 100644 --- a/modules/notes/mind-nvim/default.nix +++ b/modules/plugins/notes/mind-nvim/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./mind-nvim.nix ./config.nix diff --git a/modules/notes/mind-nvim/mind-nvim.nix b/modules/plugins/notes/mind-nvim/mind-nvim.nix similarity index 100% rename from modules/notes/mind-nvim/mind-nvim.nix rename to modules/plugins/notes/mind-nvim/mind-nvim.nix diff --git a/modules/notes/obsidian/config.nix b/modules/plugins/notes/obsidian/config.nix similarity index 100% rename from modules/notes/obsidian/config.nix rename to modules/plugins/notes/obsidian/config.nix diff --git a/modules/notes/obsidian/default.nix b/modules/plugins/notes/obsidian/default.nix similarity index 91% rename from modules/notes/obsidian/default.nix rename to modules/plugins/notes/obsidian/default.nix index d73bfc2..db8c675 100644 --- a/modules/notes/obsidian/default.nix +++ b/modules/plugins/notes/obsidian/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./obsidian.nix ./config.nix diff --git a/modules/notes/obsidian/obsidian.nix b/modules/plugins/notes/obsidian/obsidian.nix similarity index 100% rename from modules/notes/obsidian/obsidian.nix rename to modules/plugins/notes/obsidian/obsidian.nix diff --git a/modules/notes/orgmode/config.nix b/modules/plugins/notes/orgmode/config.nix similarity index 100% rename from modules/notes/orgmode/config.nix rename to modules/plugins/notes/orgmode/config.nix diff --git a/modules/notes/orgmode/default.nix b/modules/plugins/notes/orgmode/default.nix similarity index 91% rename from modules/notes/orgmode/default.nix rename to modules/plugins/notes/orgmode/default.nix index 299c754..c4f5a1a 100644 --- a/modules/notes/orgmode/default.nix +++ b/modules/plugins/notes/orgmode/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./orgmode.nix ./config.nix diff --git a/modules/notes/orgmode/orgmode.nix b/modules/plugins/notes/orgmode/orgmode.nix similarity index 100% rename from modules/notes/orgmode/orgmode.nix rename to modules/plugins/notes/orgmode/orgmode.nix diff --git a/modules/notes/todo-comments/config.nix b/modules/plugins/notes/todo-comments/config.nix similarity index 100% rename from modules/notes/todo-comments/config.nix rename to modules/plugins/notes/todo-comments/config.nix diff --git a/modules/notes/todo-comments/default.nix b/modules/plugins/notes/todo-comments/default.nix similarity index 92% rename from modules/notes/todo-comments/default.nix rename to modules/plugins/notes/todo-comments/default.nix index ac730fe..6030067 100644 --- a/modules/notes/todo-comments/default.nix +++ b/modules/plugins/notes/todo-comments/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./todo-comments.nix ./config.nix diff --git a/modules/notes/todo-comments/todo-comments.nix b/modules/plugins/notes/todo-comments/todo-comments.nix similarity index 100% rename from modules/notes/todo-comments/todo-comments.nix rename to modules/plugins/notes/todo-comments/todo-comments.nix diff --git a/modules/projects/default.nix b/modules/plugins/projects/default.nix similarity index 88% rename from modules/projects/default.nix rename to modules/plugins/projects/default.nix index aa04d03..6b6c112 100644 --- a/modules/projects/default.nix +++ b/modules/plugins/projects/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./project-nvim ]; diff --git a/modules/projects/project-nvim/config.nix b/modules/plugins/projects/project-nvim/config.nix similarity index 100% rename from modules/projects/project-nvim/config.nix rename to modules/plugins/projects/project-nvim/config.nix diff --git a/modules/projects/project-nvim/default.nix b/modules/plugins/projects/project-nvim/default.nix similarity index 92% rename from modules/projects/project-nvim/default.nix rename to modules/plugins/projects/project-nvim/default.nix index db404ae..1e7b91a 100644 --- a/modules/projects/project-nvim/default.nix +++ b/modules/plugins/projects/project-nvim/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./project-nvim.nix diff --git a/modules/projects/project-nvim/project-nvim.nix b/modules/plugins/projects/project-nvim/project-nvim.nix similarity index 100% rename from modules/projects/project-nvim/project-nvim.nix rename to modules/plugins/projects/project-nvim/project-nvim.nix diff --git a/modules/rich-presence/default.nix b/modules/plugins/rich-presence/default.nix similarity index 100% rename from modules/rich-presence/default.nix rename to modules/plugins/rich-presence/default.nix diff --git a/modules/rich-presence/neocord/config.nix b/modules/plugins/rich-presence/neocord/config.nix similarity index 100% rename from modules/rich-presence/neocord/config.nix rename to modules/plugins/rich-presence/neocord/config.nix diff --git a/modules/rich-presence/neocord/default.nix b/modules/plugins/rich-presence/neocord/default.nix similarity index 100% rename from modules/rich-presence/neocord/default.nix rename to modules/plugins/rich-presence/neocord/default.nix diff --git a/modules/rich-presence/neocord/neocord.nix b/modules/plugins/rich-presence/neocord/neocord.nix similarity index 100% rename from modules/rich-presence/neocord/neocord.nix rename to modules/plugins/rich-presence/neocord/neocord.nix diff --git a/modules/session/default.nix b/modules/plugins/session/default.nix similarity index 90% rename from modules/session/default.nix rename to modules/plugins/session/default.nix index b984f72..54e7ef9 100644 --- a/modules/session/default.nix +++ b/modules/plugins/session/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-session-manager ]; diff --git a/modules/session/nvim-session-manager/config.nix b/modules/plugins/session/nvim-session-manager/config.nix similarity index 100% rename from modules/session/nvim-session-manager/config.nix rename to modules/plugins/session/nvim-session-manager/config.nix diff --git a/modules/session/nvim-session-manager/default.nix b/modules/plugins/session/nvim-session-manager/default.nix similarity index 93% rename from modules/session/nvim-session-manager/default.nix rename to modules/plugins/session/nvim-session-manager/default.nix index 607c453..2a99059 100644 --- a/modules/session/nvim-session-manager/default.nix +++ b/modules/plugins/session/nvim-session-manager/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-session-manager.nix ./config.nix diff --git a/modules/session/nvim-session-manager/nvim-session-manager.nix b/modules/plugins/session/nvim-session-manager/nvim-session-manager.nix similarity index 100% rename from modules/session/nvim-session-manager/nvim-session-manager.nix rename to modules/plugins/session/nvim-session-manager/nvim-session-manager.nix diff --git a/modules/snippets/default.nix b/modules/plugins/snippets/default.nix similarity index 86% rename from modules/snippets/default.nix rename to modules/plugins/snippets/default.nix index cde3f7c..3f9758a 100644 --- a/modules/snippets/default.nix +++ b/modules/plugins/snippets/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./vsnip ]; diff --git a/modules/snippets/vsnip/config.nix b/modules/plugins/snippets/vsnip/config.nix similarity index 100% rename from modules/snippets/vsnip/config.nix rename to modules/plugins/snippets/vsnip/config.nix diff --git a/modules/snippets/vsnip/default.nix b/modules/plugins/snippets/vsnip/default.nix similarity index 88% rename from modules/snippets/vsnip/default.nix rename to modules/plugins/snippets/vsnip/default.nix index fee36eb..87ef29e 100644 --- a/modules/snippets/vsnip/default.nix +++ b/modules/plugins/snippets/vsnip/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./vsnip.nix ]; diff --git a/modules/snippets/vsnip/vsnip.nix b/modules/plugins/snippets/vsnip/vsnip.nix similarity index 100% rename from modules/snippets/vsnip/vsnip.nix rename to modules/plugins/snippets/vsnip/vsnip.nix diff --git a/modules/statusline/default.nix b/modules/plugins/statusline/default.nix similarity index 79% rename from modules/statusline/default.nix rename to modules/plugins/statusline/default.nix index 82e3dd2..4f43398 100644 --- a/modules/statusline/default.nix +++ b/modules/plugins/statusline/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ imports = [ ./lualine ]; diff --git a/modules/statusline/lualine/config.nix b/modules/plugins/statusline/lualine/config.nix similarity index 100% rename from modules/statusline/lualine/config.nix rename to modules/plugins/statusline/lualine/config.nix diff --git a/modules/statusline/lualine/default.nix b/modules/plugins/statusline/lualine/default.nix similarity index 91% rename from modules/statusline/lualine/default.nix rename to modules/plugins/statusline/lualine/default.nix index 879e72f..56d9207 100644 --- a/modules/statusline/lualine/default.nix +++ b/modules/plugins/statusline/lualine/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./lualine.nix ./config.nix diff --git a/modules/statusline/lualine/lualine.nix b/modules/plugins/statusline/lualine/lualine.nix similarity index 100% rename from modules/statusline/lualine/lualine.nix rename to modules/plugins/statusline/lualine/lualine.nix diff --git a/modules/statusline/lualine/supported_themes.nix b/modules/plugins/statusline/lualine/supported_themes.nix similarity index 100% rename from modules/statusline/lualine/supported_themes.nix rename to modules/plugins/statusline/lualine/supported_themes.nix diff --git a/modules/tabline/default.nix b/modules/plugins/tabline/default.nix similarity index 89% rename from modules/tabline/default.nix rename to modules/plugins/tabline/default.nix index 539302e..5730dba 100644 --- a/modules/tabline/default.nix +++ b/modules/plugins/tabline/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-bufferline ]; diff --git a/modules/tabline/nvim-bufferline/config.nix b/modules/plugins/tabline/nvim-bufferline/config.nix similarity index 100% rename from modules/tabline/nvim-bufferline/config.nix rename to modules/plugins/tabline/nvim-bufferline/config.nix diff --git a/modules/tabline/nvim-bufferline/default.nix b/modules/plugins/tabline/nvim-bufferline/default.nix similarity index 92% rename from modules/tabline/nvim-bufferline/default.nix rename to modules/plugins/tabline/nvim-bufferline/default.nix index 8fe4868..9f31874 100644 --- a/modules/tabline/nvim-bufferline/default.nix +++ b/modules/plugins/tabline/nvim-bufferline/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-bufferline.nix ./config.nix diff --git a/modules/tabline/nvim-bufferline/nvim-bufferline.nix b/modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix similarity index 100% rename from modules/tabline/nvim-bufferline/nvim-bufferline.nix rename to modules/plugins/tabline/nvim-bufferline/nvim-bufferline.nix diff --git a/modules/terminal/default.nix b/modules/plugins/terminal/default.nix similarity index 88% rename from modules/terminal/default.nix rename to modules/plugins/terminal/default.nix index c8bbc22..a268e8b 100644 --- a/modules/terminal/default.nix +++ b/modules/plugins/terminal/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./toggleterm ]; diff --git a/modules/terminal/toggleterm/config.nix b/modules/plugins/terminal/toggleterm/config.nix similarity index 100% rename from modules/terminal/toggleterm/config.nix rename to modules/plugins/terminal/toggleterm/config.nix diff --git a/modules/terminal/toggleterm/default.nix b/modules/plugins/terminal/toggleterm/default.nix similarity index 92% rename from modules/terminal/toggleterm/default.nix rename to modules/plugins/terminal/toggleterm/default.nix index a540f3f..093dc0d 100644 --- a/modules/terminal/toggleterm/default.nix +++ b/modules/plugins/terminal/toggleterm/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./toggleterm.nix ./config.nix diff --git a/modules/terminal/toggleterm/toggleterm.nix b/modules/plugins/terminal/toggleterm/toggleterm.nix similarity index 100% rename from modules/terminal/toggleterm/toggleterm.nix rename to modules/plugins/terminal/toggleterm/toggleterm.nix diff --git a/modules/treesitter/config.nix b/modules/plugins/treesitter/config.nix similarity index 100% rename from modules/treesitter/config.nix rename to modules/plugins/treesitter/config.nix diff --git a/modules/treesitter/context.nix b/modules/plugins/treesitter/context.nix similarity index 100% rename from modules/treesitter/context.nix rename to modules/plugins/treesitter/context.nix diff --git a/modules/treesitter/default.nix b/modules/plugins/treesitter/default.nix similarity index 89% rename from modules/treesitter/default.nix rename to modules/plugins/treesitter/default.nix index 30d51d5..5520cfe 100644 --- a/modules/treesitter/default.nix +++ b/modules/plugins/treesitter/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ imports = [ ./treesitter.nix ./context.nix diff --git a/modules/treesitter/treesitter.nix b/modules/plugins/treesitter/treesitter.nix similarity index 100% rename from modules/treesitter/treesitter.nix rename to modules/plugins/treesitter/treesitter.nix diff --git a/modules/ui/borders/borders.nix b/modules/plugins/ui/borders/borders.nix similarity index 100% rename from modules/ui/borders/borders.nix rename to modules/plugins/ui/borders/borders.nix diff --git a/modules/ui/borders/default.nix b/modules/plugins/ui/borders/default.nix similarity index 88% rename from modules/ui/borders/default.nix rename to modules/plugins/ui/borders/default.nix index 526ac4e..38b02b8 100644 --- a/modules/ui/borders/default.nix +++ b/modules/plugins/ui/borders/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./borders.nix ]; diff --git a/modules/ui/breadcrumbs/breadcrumbs.nix b/modules/plugins/ui/breadcrumbs/breadcrumbs.nix similarity index 100% rename from modules/ui/breadcrumbs/breadcrumbs.nix rename to modules/plugins/ui/breadcrumbs/breadcrumbs.nix diff --git a/modules/ui/breadcrumbs/config.nix b/modules/plugins/ui/breadcrumbs/config.nix similarity index 100% rename from modules/ui/breadcrumbs/config.nix rename to modules/plugins/ui/breadcrumbs/config.nix diff --git a/modules/ui/breadcrumbs/default.nix b/modules/plugins/ui/breadcrumbs/default.nix similarity index 92% rename from modules/ui/breadcrumbs/default.nix rename to modules/plugins/ui/breadcrumbs/default.nix index 02c6351..50feefc 100644 --- a/modules/ui/breadcrumbs/default.nix +++ b/modules/plugins/ui/breadcrumbs/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./breadcrumbs.nix diff --git a/modules/ui/colorizer/colorizer.nix b/modules/plugins/ui/colorizer/colorizer.nix similarity index 100% rename from modules/ui/colorizer/colorizer.nix rename to modules/plugins/ui/colorizer/colorizer.nix diff --git a/modules/ui/colorizer/config.nix b/modules/plugins/ui/colorizer/config.nix similarity index 100% rename from modules/ui/colorizer/config.nix rename to modules/plugins/ui/colorizer/config.nix diff --git a/modules/ui/colorizer/default.nix b/modules/plugins/ui/colorizer/default.nix similarity index 92% rename from modules/ui/colorizer/default.nix rename to modules/plugins/ui/colorizer/default.nix index 3b5b491..ef88180 100644 --- a/modules/ui/colorizer/default.nix +++ b/modules/plugins/ui/colorizer/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./colorizer.nix ./config.nix diff --git a/modules/ui/default.nix b/modules/plugins/ui/default.nix similarity index 96% rename from modules/ui/default.nix rename to modules/plugins/ui/default.nix index bbcb9d2..262cdbb 100644 --- a/modules/ui/default.nix +++ b/modules/plugins/ui/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./noice ./modes diff --git a/modules/ui/illuminate/config.nix b/modules/plugins/ui/illuminate/config.nix similarity index 100% rename from modules/ui/illuminate/config.nix rename to modules/plugins/ui/illuminate/config.nix diff --git a/modules/ui/illuminate/default.nix b/modules/plugins/ui/illuminate/default.nix similarity index 92% rename from modules/ui/illuminate/default.nix rename to modules/plugins/ui/illuminate/default.nix index 366bb7b..03efe4c 100644 --- a/modules/ui/illuminate/default.nix +++ b/modules/plugins/ui/illuminate/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./illuminate.nix diff --git a/modules/ui/illuminate/illuminate.nix b/modules/plugins/ui/illuminate/illuminate.nix similarity index 100% rename from modules/ui/illuminate/illuminate.nix rename to modules/plugins/ui/illuminate/illuminate.nix diff --git a/modules/ui/modes/config.nix b/modules/plugins/ui/modes/config.nix similarity index 100% rename from modules/ui/modes/config.nix rename to modules/plugins/ui/modes/config.nix diff --git a/modules/ui/modes/default.nix b/modules/plugins/ui/modes/default.nix similarity index 91% rename from modules/ui/modes/default.nix rename to modules/plugins/ui/modes/default.nix index 8c668de..4fb9652 100644 --- a/modules/ui/modes/default.nix +++ b/modules/plugins/ui/modes/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./modes.nix ./config.nix diff --git a/modules/ui/modes/modes.nix b/modules/plugins/ui/modes/modes.nix similarity index 100% rename from modules/ui/modes/modes.nix rename to modules/plugins/ui/modes/modes.nix diff --git a/modules/ui/noice/config.nix b/modules/plugins/ui/noice/config.nix similarity index 100% rename from modules/ui/noice/config.nix rename to modules/plugins/ui/noice/config.nix diff --git a/modules/ui/noice/default.nix b/modules/plugins/ui/noice/default.nix similarity index 91% rename from modules/ui/noice/default.nix rename to modules/plugins/ui/noice/default.nix index e808738..24f0ab6 100644 --- a/modules/ui/noice/default.nix +++ b/modules/plugins/ui/noice/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./noice.nix ./config.nix diff --git a/modules/ui/noice/noice.nix b/modules/plugins/ui/noice/noice.nix similarity index 100% rename from modules/ui/noice/noice.nix rename to modules/plugins/ui/noice/noice.nix diff --git a/modules/ui/notifications/default.nix b/modules/plugins/ui/notifications/default.nix similarity index 88% rename from modules/ui/notifications/default.nix rename to modules/plugins/ui/notifications/default.nix index aa5a73b..d1bd989 100644 --- a/modules/ui/notifications/default.nix +++ b/modules/plugins/ui/notifications/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./nvim-notify ]; diff --git a/modules/ui/notifications/nvim-notify/config.nix b/modules/plugins/ui/notifications/nvim-notify/config.nix similarity index 100% rename from modules/ui/notifications/nvim-notify/config.nix rename to modules/plugins/ui/notifications/nvim-notify/config.nix diff --git a/modules/ui/notifications/nvim-notify/default.nix b/modules/plugins/ui/notifications/nvim-notify/default.nix similarity index 92% rename from modules/ui/notifications/nvim-notify/default.nix rename to modules/plugins/ui/notifications/nvim-notify/default.nix index 0d4c39d..d14648b 100644 --- a/modules/ui/notifications/nvim-notify/default.nix +++ b/modules/plugins/ui/notifications/nvim-notify/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./nvim-notify.nix diff --git a/modules/ui/notifications/nvim-notify/nvim-notify.nix b/modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix similarity index 100% rename from modules/ui/notifications/nvim-notify/nvim-notify.nix rename to modules/plugins/ui/notifications/nvim-notify/nvim-notify.nix diff --git a/modules/ui/smartcolumn/config.nix b/modules/plugins/ui/smartcolumn/config.nix similarity index 100% rename from modules/ui/smartcolumn/config.nix rename to modules/plugins/ui/smartcolumn/config.nix diff --git a/modules/ui/smartcolumn/default.nix b/modules/plugins/ui/smartcolumn/default.nix similarity index 92% rename from modules/ui/smartcolumn/default.nix rename to modules/plugins/ui/smartcolumn/default.nix index 2169b22..baa85ba 100644 --- a/modules/ui/smartcolumn/default.nix +++ b/modules/plugins/ui/smartcolumn/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./smartcolumn.nix ./config.nix diff --git a/modules/ui/smartcolumn/smartcolumn.nix b/modules/plugins/ui/smartcolumn/smartcolumn.nix similarity index 100% rename from modules/ui/smartcolumn/smartcolumn.nix rename to modules/plugins/ui/smartcolumn/smartcolumn.nix diff --git a/modules/utility/binds/cheatsheet/cheatsheet.nix b/modules/plugins/utility/binds/cheatsheet/cheatsheet.nix similarity index 100% rename from modules/utility/binds/cheatsheet/cheatsheet.nix rename to modules/plugins/utility/binds/cheatsheet/cheatsheet.nix diff --git a/modules/utility/binds/cheatsheet/config.nix b/modules/plugins/utility/binds/cheatsheet/config.nix similarity index 100% rename from modules/utility/binds/cheatsheet/config.nix rename to modules/plugins/utility/binds/cheatsheet/config.nix diff --git a/modules/utility/binds/cheatsheet/default.nix b/modules/plugins/utility/binds/cheatsheet/default.nix similarity index 92% rename from modules/utility/binds/cheatsheet/default.nix rename to modules/plugins/utility/binds/cheatsheet/default.nix index 700af5a..fed227a 100644 --- a/modules/utility/binds/cheatsheet/default.nix +++ b/modules/plugins/utility/binds/cheatsheet/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./cheatsheet.nix ./config.nix diff --git a/modules/utility/binds/default.nix b/modules/plugins/utility/binds/default.nix similarity index 91% rename from modules/utility/binds/default.nix rename to modules/plugins/utility/binds/default.nix index 229423b..ea22c19 100644 --- a/modules/utility/binds/default.nix +++ b/modules/plugins/utility/binds/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./which-key ./cheatsheet diff --git a/modules/utility/binds/which-key/config.nix b/modules/plugins/utility/binds/which-key/config.nix similarity index 100% rename from modules/utility/binds/which-key/config.nix rename to modules/plugins/utility/binds/which-key/config.nix diff --git a/modules/utility/binds/which-key/default.nix b/modules/plugins/utility/binds/which-key/default.nix similarity index 92% rename from modules/utility/binds/which-key/default.nix rename to modules/plugins/utility/binds/which-key/default.nix index 20c9cdf..7ae329b 100644 --- a/modules/utility/binds/which-key/default.nix +++ b/modules/plugins/utility/binds/which-key/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./which-key.nix ./config.nix diff --git a/modules/utility/binds/which-key/which-key.nix b/modules/plugins/utility/binds/which-key/which-key.nix similarity index 100% rename from modules/utility/binds/which-key/which-key.nix rename to modules/plugins/utility/binds/which-key/which-key.nix diff --git a/modules/utility/ccc/ccc.nix b/modules/plugins/utility/ccc/ccc.nix similarity index 100% rename from modules/utility/ccc/ccc.nix rename to modules/plugins/utility/ccc/ccc.nix diff --git a/modules/utility/ccc/config.nix b/modules/plugins/utility/ccc/config.nix similarity index 100% rename from modules/utility/ccc/config.nix rename to modules/plugins/utility/ccc/config.nix diff --git a/modules/utility/ccc/default.nix b/modules/plugins/utility/ccc/default.nix similarity index 91% rename from modules/utility/ccc/default.nix rename to modules/plugins/utility/ccc/default.nix index 65e13e9..4608151 100644 --- a/modules/utility/ccc/default.nix +++ b/modules/plugins/utility/ccc/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./ccc.nix ./config.nix diff --git a/modules/utility/default.nix b/modules/plugins/utility/default.nix similarity index 97% rename from modules/utility/default.nix rename to modules/plugins/utility/default.nix index 50ec048..5c4de80 100644 --- a/modules/utility/default.nix +++ b/modules/plugins/utility/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./binds ./gestures diff --git a/modules/utility/diffview/config.nix b/modules/plugins/utility/diffview/config.nix similarity index 100% rename from modules/utility/diffview/config.nix rename to modules/plugins/utility/diffview/config.nix diff --git a/modules/utility/diffview/default.nix b/modules/plugins/utility/diffview/default.nix similarity index 91% rename from modules/utility/diffview/default.nix rename to modules/plugins/utility/diffview/default.nix index 4cb468b..f08bb2d 100644 --- a/modules/utility/diffview/default.nix +++ b/modules/plugins/utility/diffview/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./diffview.nix diff --git a/modules/utility/diffview/diffview.nix b/modules/plugins/utility/diffview/diffview.nix similarity index 100% rename from modules/utility/diffview/diffview.nix rename to modules/plugins/utility/diffview/diffview.nix diff --git a/modules/utility/gestures/default.nix b/modules/plugins/utility/gestures/default.nix similarity index 88% rename from modules/utility/gestures/default.nix rename to modules/plugins/utility/gestures/default.nix index 1e6eb96..d68f40b 100644 --- a/modules/utility/gestures/default.nix +++ b/modules/plugins/utility/gestures/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./gesture-nvim ]; diff --git a/modules/utility/gestures/gesture-nvim/config.nix b/modules/plugins/utility/gestures/gesture-nvim/config.nix similarity index 100% rename from modules/utility/gestures/gesture-nvim/config.nix rename to modules/plugins/utility/gestures/gesture-nvim/config.nix diff --git a/modules/utility/gestures/gesture-nvim/default.nix b/modules/plugins/utility/gestures/gesture-nvim/default.nix similarity index 92% rename from modules/utility/gestures/gesture-nvim/default.nix rename to modules/plugins/utility/gestures/gesture-nvim/default.nix index 27e7e09..4c7987e 100644 --- a/modules/utility/gestures/gesture-nvim/default.nix +++ b/modules/plugins/utility/gestures/gesture-nvim/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./gesture-nvim.nix ./config.nix diff --git a/modules/utility/gestures/gesture-nvim/gesture-nvim.nix b/modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix similarity index 100% rename from modules/utility/gestures/gesture-nvim/gesture-nvim.nix rename to modules/plugins/utility/gestures/gesture-nvim/gesture-nvim.nix diff --git a/modules/utility/icon-picker/config.nix b/modules/plugins/utility/icon-picker/config.nix similarity index 100% rename from modules/utility/icon-picker/config.nix rename to modules/plugins/utility/icon-picker/config.nix diff --git a/modules/utility/icon-picker/default.nix b/modules/plugins/utility/icon-picker/default.nix similarity index 92% rename from modules/utility/icon-picker/default.nix rename to modules/plugins/utility/icon-picker/default.nix index b998e08..545e367 100644 --- a/modules/utility/icon-picker/default.nix +++ b/modules/plugins/utility/icon-picker/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./icon-picker.nix ./config.nix diff --git a/modules/utility/icon-picker/icon-picker.nix b/modules/plugins/utility/icon-picker/icon-picker.nix similarity index 100% rename from modules/utility/icon-picker/icon-picker.nix rename to modules/plugins/utility/icon-picker/icon-picker.nix diff --git a/modules/utility/motion/default.nix b/modules/plugins/utility/motion/default.nix similarity index 89% rename from modules/utility/motion/default.nix rename to modules/plugins/utility/motion/default.nix index 925a33e..9d19f61 100644 --- a/modules/utility/motion/default.nix +++ b/modules/plugins/utility/motion/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./hop ./leap diff --git a/modules/utility/motion/hop/config.nix b/modules/plugins/utility/motion/hop/config.nix similarity index 100% rename from modules/utility/motion/hop/config.nix rename to modules/plugins/utility/motion/hop/config.nix diff --git a/modules/utility/motion/hop/default.nix b/modules/plugins/utility/motion/hop/default.nix similarity index 91% rename from modules/utility/motion/hop/default.nix rename to modules/plugins/utility/motion/hop/default.nix index f4cfb47..b93369f 100644 --- a/modules/utility/motion/hop/default.nix +++ b/modules/plugins/utility/motion/hop/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./hop.nix ./config.nix diff --git a/modules/utility/motion/hop/hop.nix b/modules/plugins/utility/motion/hop/hop.nix similarity index 100% rename from modules/utility/motion/hop/hop.nix rename to modules/plugins/utility/motion/hop/hop.nix diff --git a/modules/utility/motion/leap/config.nix b/modules/plugins/utility/motion/leap/config.nix similarity index 100% rename from modules/utility/motion/leap/config.nix rename to modules/plugins/utility/motion/leap/config.nix diff --git a/modules/utility/motion/leap/default.nix b/modules/plugins/utility/motion/leap/default.nix similarity index 91% rename from modules/utility/motion/leap/default.nix rename to modules/plugins/utility/motion/leap/default.nix index 39bd193..8a1e757 100644 --- a/modules/utility/motion/leap/default.nix +++ b/modules/plugins/utility/motion/leap/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./leap.nix ./config.nix diff --git a/modules/utility/motion/leap/leap.nix b/modules/plugins/utility/motion/leap/leap.nix similarity index 100% rename from modules/utility/motion/leap/leap.nix rename to modules/plugins/utility/motion/leap/leap.nix diff --git a/modules/utility/surround/config.nix b/modules/plugins/utility/surround/config.nix similarity index 100% rename from modules/utility/surround/config.nix rename to modules/plugins/utility/surround/config.nix diff --git a/modules/utility/surround/default.nix b/modules/plugins/utility/surround/default.nix similarity index 91% rename from modules/utility/surround/default.nix rename to modules/plugins/utility/surround/default.nix index 4f6d265..896ac9c 100644 --- a/modules/utility/surround/default.nix +++ b/modules/plugins/utility/surround/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./surround.nix diff --git a/modules/utility/surround/surround.nix b/modules/plugins/utility/surround/surround.nix similarity index 100% rename from modules/utility/surround/surround.nix rename to modules/plugins/utility/surround/surround.nix diff --git a/modules/utility/telescope/config.nix b/modules/plugins/utility/telescope/config.nix similarity index 100% rename from modules/utility/telescope/config.nix rename to modules/plugins/utility/telescope/config.nix diff --git a/modules/utility/telescope/default.nix b/modules/plugins/utility/telescope/default.nix similarity index 92% rename from modules/utility/telescope/default.nix rename to modules/plugins/utility/telescope/default.nix index c7a3819..71dfce5 100644 --- a/modules/utility/telescope/default.nix +++ b/modules/plugins/utility/telescope/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./telescope.nix ./config.nix diff --git a/modules/utility/telescope/telescope.nix b/modules/plugins/utility/telescope/telescope.nix similarity index 100% rename from modules/utility/telescope/telescope.nix rename to modules/plugins/utility/telescope/telescope.nix diff --git a/modules/utility/wakatime/config.nix b/modules/plugins/utility/wakatime/config.nix similarity index 100% rename from modules/utility/wakatime/config.nix rename to modules/plugins/utility/wakatime/config.nix diff --git a/modules/utility/wakatime/default.nix b/modules/plugins/utility/wakatime/default.nix similarity index 92% rename from modules/utility/wakatime/default.nix rename to modules/plugins/utility/wakatime/default.nix index d6d67d5..c72189d 100644 --- a/modules/utility/wakatime/default.nix +++ b/modules/plugins/utility/wakatime/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./config.nix ./vim-wakatime.nix diff --git a/modules/utility/wakatime/vim-wakatime.nix b/modules/plugins/utility/wakatime/vim-wakatime.nix similarity index 100% rename from modules/utility/wakatime/vim-wakatime.nix rename to modules/plugins/utility/wakatime/vim-wakatime.nix diff --git a/modules/visuals/config.nix b/modules/plugins/visuals/config.nix similarity index 100% rename from modules/visuals/config.nix rename to modules/plugins/visuals/config.nix diff --git a/modules/visuals/default.nix b/modules/plugins/visuals/default.nix similarity index 86% rename from modules/visuals/default.nix rename to modules/plugins/visuals/default.nix index 9efdde7..ccc2c34 100644 --- a/modules/visuals/default.nix +++ b/modules/plugins/visuals/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ imports = [ ./config.nix ./visuals.nix diff --git a/modules/visuals/visuals.nix b/modules/plugins/visuals/visuals.nix similarity index 100% rename from modules/visuals/visuals.nix rename to modules/plugins/visuals/visuals.nix diff --git a/modules/theme/config.nix b/modules/themes/config.nix similarity index 100% rename from modules/theme/config.nix rename to modules/themes/config.nix diff --git a/modules/theme/default.nix b/modules/themes/default.nix similarity index 100% rename from modules/theme/default.nix rename to modules/themes/default.nix diff --git a/modules/theme/supported_themes.nix b/modules/themes/supported_themes.nix similarity index 100% rename from modules/theme/supported_themes.nix rename to modules/themes/supported_themes.nix diff --git a/modules/theme/theme.nix b/modules/themes/theme.nix similarity index 100% rename from modules/theme/theme.nix rename to modules/themes/theme.nix