From 0fdb5a88fc5c12489e856f8f465c6aae3fdeb557 Mon Sep 17 00:00:00 2001 From: Tovi Jaeschke-Rogers Date: Tue, 27 Aug 2024 09:50:45 +0930 Subject: [PATCH] feat: restructure neovim dotfiles layout --- .config/nvim/init.lua | 4 ++-- .config/nvim/lua/{tovi => }/core/autocmd.lua | 0 .config/nvim/lua/{tovi => }/core/commands.lua | 0 .config/nvim/lua/core/init.lua | 5 +++++ .config/nvim/lua/{tovi => }/core/options.lua | 0 .config/nvim/lua/{tovi => }/core/remaps.lua | 0 .config/nvim/lua/{tovi/lazy.lua => lazy-plugin-manager.lua} | 2 +- .config/nvim/lua/{tovi => }/plugins/cloak.lua | 0 .config/nvim/lua/{tovi => }/plugins/colorizer.lua | 0 .config/nvim/lua/{tovi => }/plugins/colorscheme.lua | 0 .config/nvim/lua/{tovi => }/plugins/flash.lua | 0 .config/nvim/lua/{tovi => }/plugins/formatting.lua | 0 .config/nvim/lua/{tovi => }/plugins/fugitive.lua | 0 .config/nvim/lua/{tovi => }/plugins/gitsigns.lua | 0 .config/nvim/lua/{tovi => }/plugins/harpoon.lua | 0 .config/nvim/lua/{tovi => }/plugins/init.lua | 0 .config/nvim/lua/{tovi => }/plugins/laravel.lua | 0 .config/nvim/lua/{tovi => }/plugins/linting.lua | 0 .config/nvim/lua/{tovi => }/plugins/lspconfig.lua | 0 .config/nvim/lua/{tovi => }/plugins/lualine.lua | 0 .config/nvim/lua/{tovi => }/plugins/neotest.lua | 4 ++-- .config/nvim/lua/{tovi => }/plugins/nvim-cmp.lua | 0 .config/nvim/lua/{tovi => }/plugins/nvim-go.lua | 0 .config/nvim/lua/{tovi => }/plugins/nvim-treesitter.lua | 0 .../lua/{tovi => }/plugins/nvim-ts-context-commentstring.lua | 0 .config/nvim/lua/{tovi => }/plugins/oil.lua | 0 .config/nvim/lua/{tovi => }/plugins/scissors.lua | 0 .config/nvim/lua/{tovi => }/plugins/telescope.lua | 0 .config/nvim/lua/{tovi => }/plugins/tmux.lua | 0 .config/nvim/lua/{tovi => }/plugins/todo-comments.lua | 0 .config/nvim/lua/{tovi => }/plugins/trouble.lua | 0 .config/nvim/lua/{tovi => }/plugins/undotree.lua | 0 .config/nvim/lua/{tovi => }/plugins/vim-blade.lua | 0 .config/nvim/lua/{tovi => }/plugins/vim-dadbod.lua | 0 .config/nvim/lua/tovi/core/init.lua | 5 ----- 35 files changed, 10 insertions(+), 10 deletions(-) rename .config/nvim/lua/{tovi => }/core/autocmd.lua (100%) rename .config/nvim/lua/{tovi => }/core/commands.lua (100%) create mode 100644 .config/nvim/lua/core/init.lua rename .config/nvim/lua/{tovi => }/core/options.lua (100%) rename .config/nvim/lua/{tovi => }/core/remaps.lua (100%) rename .config/nvim/lua/{tovi/lazy.lua => lazy-plugin-manager.lua} (93%) rename .config/nvim/lua/{tovi => }/plugins/cloak.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/colorizer.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/colorscheme.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/flash.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/formatting.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/fugitive.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/gitsigns.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/harpoon.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/init.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/laravel.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/linting.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/lspconfig.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/lualine.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/neotest.lua (88%) rename .config/nvim/lua/{tovi => }/plugins/nvim-cmp.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/nvim-go.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/nvim-treesitter.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/nvim-ts-context-commentstring.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/oil.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/scissors.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/telescope.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/tmux.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/todo-comments.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/trouble.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/undotree.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/vim-blade.lua (100%) rename .config/nvim/lua/{tovi => }/plugins/vim-dadbod.lua (100%) delete mode 100644 .config/nvim/lua/tovi/core/init.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 5247115..b5847f7 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,2 +1,2 @@ -require('tovi.core') -require('tovi.lazy') +require('core') +require('lazy-plugin-manager') diff --git a/.config/nvim/lua/tovi/core/autocmd.lua b/.config/nvim/lua/core/autocmd.lua similarity index 100% rename from .config/nvim/lua/tovi/core/autocmd.lua rename to .config/nvim/lua/core/autocmd.lua diff --git a/.config/nvim/lua/tovi/core/commands.lua b/.config/nvim/lua/core/commands.lua similarity index 100% rename from .config/nvim/lua/tovi/core/commands.lua rename to .config/nvim/lua/core/commands.lua diff --git a/.config/nvim/lua/core/init.lua b/.config/nvim/lua/core/init.lua new file mode 100644 index 0000000..e82d04d --- /dev/null +++ b/.config/nvim/lua/core/init.lua @@ -0,0 +1,5 @@ +require('core.options') +require('core.remaps') +require('core.autocmd') +require('core.commands') + diff --git a/.config/nvim/lua/tovi/core/options.lua b/.config/nvim/lua/core/options.lua similarity index 100% rename from .config/nvim/lua/tovi/core/options.lua rename to .config/nvim/lua/core/options.lua diff --git a/.config/nvim/lua/tovi/core/remaps.lua b/.config/nvim/lua/core/remaps.lua similarity index 100% rename from .config/nvim/lua/tovi/core/remaps.lua rename to .config/nvim/lua/core/remaps.lua diff --git a/.config/nvim/lua/tovi/lazy.lua b/.config/nvim/lua/lazy-plugin-manager.lua similarity index 93% rename from .config/nvim/lua/tovi/lazy.lua rename to .config/nvim/lua/lazy-plugin-manager.lua index f84c6c0..aa4ebcf 100644 --- a/.config/nvim/lua/tovi/lazy.lua +++ b/.config/nvim/lua/lazy-plugin-manager.lua @@ -13,7 +13,7 @@ vim.opt.rtp:prepend(lazypath) require("lazy").setup( { - { import = "tovi.plugins" }, + { import = "plugins" }, }, { checker = { diff --git a/.config/nvim/lua/tovi/plugins/cloak.lua b/.config/nvim/lua/plugins/cloak.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/cloak.lua rename to .config/nvim/lua/plugins/cloak.lua diff --git a/.config/nvim/lua/tovi/plugins/colorizer.lua b/.config/nvim/lua/plugins/colorizer.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/colorizer.lua rename to .config/nvim/lua/plugins/colorizer.lua diff --git a/.config/nvim/lua/tovi/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/colorscheme.lua rename to .config/nvim/lua/plugins/colorscheme.lua diff --git a/.config/nvim/lua/tovi/plugins/flash.lua b/.config/nvim/lua/plugins/flash.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/flash.lua rename to .config/nvim/lua/plugins/flash.lua diff --git a/.config/nvim/lua/tovi/plugins/formatting.lua b/.config/nvim/lua/plugins/formatting.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/formatting.lua rename to .config/nvim/lua/plugins/formatting.lua diff --git a/.config/nvim/lua/tovi/plugins/fugitive.lua b/.config/nvim/lua/plugins/fugitive.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/fugitive.lua rename to .config/nvim/lua/plugins/fugitive.lua diff --git a/.config/nvim/lua/tovi/plugins/gitsigns.lua b/.config/nvim/lua/plugins/gitsigns.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/gitsigns.lua rename to .config/nvim/lua/plugins/gitsigns.lua diff --git a/.config/nvim/lua/tovi/plugins/harpoon.lua b/.config/nvim/lua/plugins/harpoon.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/harpoon.lua rename to .config/nvim/lua/plugins/harpoon.lua diff --git a/.config/nvim/lua/tovi/plugins/init.lua b/.config/nvim/lua/plugins/init.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/init.lua rename to .config/nvim/lua/plugins/init.lua diff --git a/.config/nvim/lua/tovi/plugins/laravel.lua b/.config/nvim/lua/plugins/laravel.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/laravel.lua rename to .config/nvim/lua/plugins/laravel.lua diff --git a/.config/nvim/lua/tovi/plugins/linting.lua b/.config/nvim/lua/plugins/linting.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/linting.lua rename to .config/nvim/lua/plugins/linting.lua diff --git a/.config/nvim/lua/tovi/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/lspconfig.lua rename to .config/nvim/lua/plugins/lspconfig.lua diff --git a/.config/nvim/lua/tovi/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/lualine.lua rename to .config/nvim/lua/plugins/lualine.lua diff --git a/.config/nvim/lua/tovi/plugins/neotest.lua b/.config/nvim/lua/plugins/neotest.lua similarity index 88% rename from .config/nvim/lua/tovi/plugins/neotest.lua rename to .config/nvim/lua/plugins/neotest.lua index 140a948..cb5dfa2 100644 --- a/.config/nvim/lua/tovi/plugins/neotest.lua +++ b/.config/nvim/lua/plugins/neotest.lua @@ -42,8 +42,8 @@ return { adapters = { require("neotest-phpunit")({ root_files = { "phpunit.xml", "composer.json" }, - phpunit_cmd = { "docker", "compose", "exec", "fpm", "./vendor/bin/phpunit" }, - -- phpunit_cmd = { "docker", "compose", "exec", "app-fpm", "./vendor/bin/phpunit" }, + -- phpunit_cmd = { "docker", "compose", "exec", "fpm", "./vendor/bin/phpunit" }, + phpunit_cmd = { "docker", "compose", "exec", "app-fpm", "./vendor/bin/phpunit" }, filter_dirs = { "vendor" }, mapped_docker_dir = "/var/www", append_to_cwd = "/api", diff --git a/.config/nvim/lua/tovi/plugins/nvim-cmp.lua b/.config/nvim/lua/plugins/nvim-cmp.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/nvim-cmp.lua rename to .config/nvim/lua/plugins/nvim-cmp.lua diff --git a/.config/nvim/lua/tovi/plugins/nvim-go.lua b/.config/nvim/lua/plugins/nvim-go.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/nvim-go.lua rename to .config/nvim/lua/plugins/nvim-go.lua diff --git a/.config/nvim/lua/tovi/plugins/nvim-treesitter.lua b/.config/nvim/lua/plugins/nvim-treesitter.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/nvim-treesitter.lua rename to .config/nvim/lua/plugins/nvim-treesitter.lua diff --git a/.config/nvim/lua/tovi/plugins/nvim-ts-context-commentstring.lua b/.config/nvim/lua/plugins/nvim-ts-context-commentstring.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/nvim-ts-context-commentstring.lua rename to .config/nvim/lua/plugins/nvim-ts-context-commentstring.lua diff --git a/.config/nvim/lua/tovi/plugins/oil.lua b/.config/nvim/lua/plugins/oil.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/oil.lua rename to .config/nvim/lua/plugins/oil.lua diff --git a/.config/nvim/lua/tovi/plugins/scissors.lua b/.config/nvim/lua/plugins/scissors.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/scissors.lua rename to .config/nvim/lua/plugins/scissors.lua diff --git a/.config/nvim/lua/tovi/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/telescope.lua rename to .config/nvim/lua/plugins/telescope.lua diff --git a/.config/nvim/lua/tovi/plugins/tmux.lua b/.config/nvim/lua/plugins/tmux.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/tmux.lua rename to .config/nvim/lua/plugins/tmux.lua diff --git a/.config/nvim/lua/tovi/plugins/todo-comments.lua b/.config/nvim/lua/plugins/todo-comments.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/todo-comments.lua rename to .config/nvim/lua/plugins/todo-comments.lua diff --git a/.config/nvim/lua/tovi/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/trouble.lua rename to .config/nvim/lua/plugins/trouble.lua diff --git a/.config/nvim/lua/tovi/plugins/undotree.lua b/.config/nvim/lua/plugins/undotree.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/undotree.lua rename to .config/nvim/lua/plugins/undotree.lua diff --git a/.config/nvim/lua/tovi/plugins/vim-blade.lua b/.config/nvim/lua/plugins/vim-blade.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/vim-blade.lua rename to .config/nvim/lua/plugins/vim-blade.lua diff --git a/.config/nvim/lua/tovi/plugins/vim-dadbod.lua b/.config/nvim/lua/plugins/vim-dadbod.lua similarity index 100% rename from .config/nvim/lua/tovi/plugins/vim-dadbod.lua rename to .config/nvim/lua/plugins/vim-dadbod.lua diff --git a/.config/nvim/lua/tovi/core/init.lua b/.config/nvim/lua/tovi/core/init.lua deleted file mode 100644 index f0cdd4b..0000000 --- a/.config/nvim/lua/tovi/core/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -require('tovi.core.options') -require('tovi.core.remaps') -require('tovi.core.autocmd') -require('tovi.core.commands') -