diff --git a/.gitignore b/.gitignore index 03018729..ce7b6db6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.log -/vim/.vim/pack/local/start +/nvim/.config/nvim/pack/local/start /tmux/.tmux/pack/local/start /zsh/.zsh/pac/local/start /vim/.vim/undodir/ diff --git a/.gitmodules b/.gitmodules index f3dcf0dc..93a716d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,10 +11,10 @@ path = tmux/.tmux/pack/bundle/start/tmux-resurrect url = https://github.com/tmux-plugins/tmux-resurrect [submodule "vim/.vim/bundle/vim-rooter"] - path = vim/.vim/pack/bundle/start/vim-rooter + path = nvim/.config/nvim/pack/bundle/start/vim-rooter url = https://github.com/airblade/vim-rooter [submodule "vim/.vim/bundle/vimwiki"] - path = vim/.vim/pack/bundle/start/vimwiki + path = nvim/.config/nvim/pack/bundle/start/vimwiki url = https://github.com/vimwiki/vimwiki [submodule "zsh/.fzf"] path = zsh/.fzf @@ -55,49 +55,49 @@ path = zsh/.zsh/pack/bundle/start/environment url = https://github.com/zimfw/environment [submodule "vim/.vim/pack/bundle/start/which-key.nvim"] - path = vim/.vim/pack/bundle/start/which-key.nvim + path = nvim/.config/nvim/pack/bundle/start/which-key.nvim url = https://github.com/folke/which-key.nvim [submodule "vim/.vim/pack/bundle/start/nvim-treesitter"] - path = vim/.vim/pack/bundle/start/nvim-treesitter + path = nvim/.config/nvim/pack/bundle/start/nvim-treesitter url = https://github.com/nvim-treesitter/nvim-treesitter [submodule "vim/.vim/pack/bundle/start/vim-commentary"] - path = vim/.vim/pack/bundle/start/vim-commentary + path = nvim/.config/nvim/pack/bundle/start/vim-commentary url = https://github.com/tpope/vim-commentary [submodule "tmux/.tmux/pack/bundle/start/tmux-fzf"] path = tmux/.tmux/pack/bundle/start/tmux-fzf url = https://github.com/sainnhe/tmux-fzf [submodule "vim/.vim/pack/bundle/start/vim-dirvish"] - path = vim/.vim/pack/bundle/start/vim-dirvish + path = nvim/.config/nvim/pack/bundle/start/vim-dirvish url = https://github.com/justinmk/vim-dirvish [submodule "vim/.vim/pack/bundle/start/vim-dirvish-dovish"] - path = vim/.vim/pack/bundle/start/vim-dirvish-dovish + path = nvim/.config/nvim/pack/bundle/start/vim-dirvish-dovish url = https://github.com/roginfarrer/vim-dirvish-dovish [submodule "vim/.vim/pack/bundle/start/nvim-lspconfig"] - path = vim/.vim/pack/bundle/start/nvim-lspconfig + path = nvim/.config/nvim/pack/bundle/start/nvim-lspconfig url = https://github.com/neovim/nvim-lspconfig [submodule "vim/.vim/pack/bundle/start/mason.nvim"] - path = vim/.vim/pack/bundle/start/mason.nvim + path = nvim/.config/nvim/pack/bundle/start/mason.nvim url = https://github.com/williamboman/mason.nvim [submodule "vim/.vim/pack/bundle/start/mason-lspconfig.nvim"] - path = vim/.vim/pack/bundle/start/mason-lspconfig.nvim + path = nvim/.config/nvim/pack/bundle/start/mason-lspconfig.nvim url = https://github.com/williamboman/mason-lspconfig.nvim [submodule "vim/.vim/pack/bundle/start/nvim-cmp"] - path = vim/.vim/pack/bundle/start/nvim-cmp + path = nvim/.config/nvim/pack/bundle/start/nvim-cmp url = https://github.com/hrsh7th/nvim-cmp [submodule "vim/.vim/pack/bundle/start/cmp-nvim-lsp"] - path = vim/.vim/pack/bundle/start/cmp-nvim-lsp + path = nvim/.config/nvim/pack/bundle/start/cmp-nvim-lsp url = https://github.com/hrsh7th/cmp-nvim-lsp [submodule "vim/.vim/pack/bundle/start/cmp-path"] - path = vim/.vim/pack/bundle/start/cmp-path + path = nvim/.config/nvim/pack/bundle/start/cmp-path url = https://github.com/hrsh7th/cmp-path [submodule "vim/.vim/pack/bundle/start/fzf-lua"] - path = vim/.vim/pack/bundle/start/fzf-lua + path = nvim/.config/nvim/pack/bundle/start/fzf-lua url = https://github.com/ibhagwan/fzf-lua [submodule "zsh/.zsh/pack/bundle/start/base16-fzf"] path = zsh/.zsh/pack/bundle/start/base16-fzf url = https://github.com/tinted-theming/base16-fzf [submodule "vim/.vim/pack/bundle/start/nvim-web-devicons"] - path = vim/.vim/pack/bundle/start/nvim-web-devicons + path = nvim/.config/nvim/pack/bundle/start/nvim-web-devicons url = https://github.com/nvim-tree/nvim-web-devicons [submodule "zsh/.zsh/pack/bundle/start/base16-shell"] path = zsh/.zsh/pack/bundle/start/base16-shell @@ -106,13 +106,13 @@ path = bspwm/.config/polybar/base16-polybar url = https://github.com/tinted-theming/base16-polybar [submodule "vim/.vim/pack/bundle/start/cmp-cmdline"] - path = vim/.vim/pack/bundle/start/cmp-cmdline + path = nvim/.config/nvim/pack/bundle/start/cmp-cmdline url = https://github.com/hrsh7th/cmp-cmdline [submodule "vim/.vim/pack/bundle/start/cmp-buffer"] - path = vim/.vim/pack/bundle/start/cmp-buffer + path = nvim/.config/nvim/pack/bundle/start/cmp-buffer url = https://github.com/hrsh7th/cmp-buffer [submodule "vim/.vim/pack/bundle/start/tmux.nvim"] - path = vim/.vim/pack/bundle/start/tmux.nvim + path = nvim/.config/nvim/pack/bundle/start/tmux.nvim url = https://github.com/aserowy/tmux.nvim [submodule "zsh/.zsh/pack/bundle/start/zsh-autocomplete"] path = zsh/.zsh/pack/bundle/start/zsh-autocomplete @@ -124,47 +124,47 @@ path = zsh/.zsh/pack/bundle/start/zsh-expand-all url = https://github.com/simnalamburt/zsh-expand-all [submodule "vim/.vim/pack/bundle/start/nvim-jdtls"] - path = vim/.vim/pack/bundle/start/nvim-jdtls + path = nvim/.config/nvim/pack/bundle/start/nvim-jdtls url = https://github.com/mfussenegger/nvim-jdtls [submodule "vim/.vim/pack/bundle/start/vim-cool"] - path = vim/.vim/pack/bundle/start/vim-cool + path = nvim/.config/nvim/pack/bundle/start/vim-cool url = https://github.com/romainl/vim-cool [submodule "vim/.vim/pack/bundle/start/copilot.lua"] - path = vim/.vim/pack/bundle/start/copilot.lua + path = nvim/.config/nvim/pack/bundle/start/copilot.lua url = https://github.com/zbirenbaum/copilot.lua [submodule "zsh/.zsh/pack/bundle/start/zsh-autoswitch-virtualenv"] path = zsh/.zsh/pack/bundle/start/zsh-autoswitch-virtualenv url = https://github.com/MichaelAquilina/zsh-autoswitch-virtualenv [submodule "vim/.vim/pack/bundle/start/nvim-dap"] - path = vim/.vim/pack/bundle/start/nvim-dap + path = nvim/.config/nvim/pack/bundle/start/nvim-dap url = https://github.com/mfussenegger/nvim-dap [submodule "vim/.vim/pack/bundle/start/nvim-dap-ui"] - path = vim/.vim/pack/bundle/start/nvim-dap-ui + path = nvim/.config/nvim/pack/bundle/start/nvim-dap-ui url = https://github.com/rcarriga/nvim-dap-ui [submodule "vim/.vim/pack/bundle/start/nvim-dap-virtual-text"] - path = vim/.vim/pack/bundle/start/nvim-dap-virtual-text + path = nvim/.config/nvim/pack/bundle/start/nvim-dap-virtual-text url = https://github.com/theHamsta/nvim-dap-virtual-text [submodule "vim/.vim/pack/bundle/start/mason-tool-installer.nvim"] - path = vim/.vim/pack/bundle/start/mason-tool-installer.nvim + path = nvim/.config/nvim/pack/bundle/start/mason-tool-installer.nvim url = https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim [submodule "vim/.vim/pack/bundle/start/nvim-base16"] - path = vim/.vim/pack/bundle/start/nvim-base16 + path = nvim/.config/nvim/pack/bundle/start/nvim-base16 url = https://github.com/RRethy/nvim-base16 [submodule "vim/.vim/pack/bundle/start/nvim-treesitter-textobjects"] - path = vim/.vim/pack/bundle/start/nvim-treesitter-textobjects + path = nvim/.config/nvim/pack/bundle/start/nvim-treesitter-textobjects url = https://github.com/nvim-treesitter/nvim-treesitter-textobjects [submodule "vim/.vim/pack/bundle/start/nvim-dap-python"] - path = vim/.vim/pack/bundle/start/nvim-dap-python + path = nvim/.config/nvim/pack/bundle/start/nvim-dap-python url = https://github.com/mfussenegger/nvim-dap-python [submodule "vim/.vim/pack/bundle/start/nvim-dap-vscode-js"] - path = vim/.vim/pack/bundle/start/nvim-dap-vscode-js + path = nvim/.config/nvim/pack/bundle/start/nvim-dap-vscode-js url = https://github.com/mxsdev/nvim-dap-vscode-js [submodule "vim/.vim/pack/bundle/start/lsp-progress.nvim"] - path = vim/.vim/pack/bundle/start/lsp-progress.nvim + path = nvim/.config/nvim/pack/bundle/start/lsp-progress.nvim url = https://github.com/linrongbin16/lsp-progress.nvim [submodule "vim/.vim/pack/bundle/start/vim-vsnip"] - path = vim/.vim/pack/bundle/start/vim-vsnip + path = nvim/.config/nvim/pack/bundle/start/vim-vsnip url = https://github.com/hrsh7th/vim-vsnip [submodule "vim/.vim/pack/bundle/start/quickfix-reflector.vim"] - path = vim/.vim/pack/bundle/start/quickfix-reflector.vim + path = nvim/.config/nvim/pack/bundle/start/quickfix-reflector.vim url = https://github.com/stefandtw/quickfix-reflector.vim diff --git a/.ignore b/.ignore index 142320d1..08d0774e 100644 --- a/.ignore +++ b/.ignore @@ -1 +1,3 @@ -vim/.vim/pack/bundle/start/ +/nvim/.config/nvim/pack/ +/tmux/.tmux/pack/ +/zsh/.zsh/pack/ diff --git a/README.md b/README.md index 99baba7e..177c812a 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ To add your own Vim, Tmux or Zsh plugin you can just clone it to proper # Add SuperTab vim plugin git clone git://github.com/ervandew/supertab \ - ~/.vim/pack/local/start/supertab + ~/.config/nvim/pack/local/start/supertab # Add Tmux sessionist plugin git clone git://github.com/tmux-plugins/tmux-sessionist \ @@ -69,4 +69,4 @@ To add your own Vim, Tmux or Zsh plugin you can just clone it to proper - [/zsh/.zsh/pack/bundle/start](/zsh/.zsh/pack/bundle/start) ZSH plugins - [/tmux/.tmux/pack/bundle/start](/tmux/.tmux/pack/bundle/start) TMUX plugins -- [/vim/.vim/pack/bundle/start](/vim/.vim/pack/bundle/start) Neovim plugins +- [/nvim/.config/nvim/pack/bundle/start](/nvim/.config/nvim/pack/bundle/start) Neovim plugins diff --git a/vim/.vim/pack/bundle/start/cmp-buffer b/nvim/.config/nvim/pack/bundle/start/cmp-buffer similarity index 100% rename from vim/.vim/pack/bundle/start/cmp-buffer rename to nvim/.config/nvim/pack/bundle/start/cmp-buffer diff --git a/vim/.vim/pack/bundle/start/cmp-cmdline b/nvim/.config/nvim/pack/bundle/start/cmp-cmdline similarity index 100% rename from vim/.vim/pack/bundle/start/cmp-cmdline rename to nvim/.config/nvim/pack/bundle/start/cmp-cmdline diff --git a/vim/.vim/pack/bundle/start/cmp-nvim-lsp b/nvim/.config/nvim/pack/bundle/start/cmp-nvim-lsp similarity index 100% rename from vim/.vim/pack/bundle/start/cmp-nvim-lsp rename to nvim/.config/nvim/pack/bundle/start/cmp-nvim-lsp diff --git a/vim/.vim/pack/bundle/start/cmp-path b/nvim/.config/nvim/pack/bundle/start/cmp-path similarity index 100% rename from vim/.vim/pack/bundle/start/cmp-path rename to nvim/.config/nvim/pack/bundle/start/cmp-path diff --git a/vim/.vim/pack/bundle/start/copilot.lua b/nvim/.config/nvim/pack/bundle/start/copilot.lua similarity index 100% rename from vim/.vim/pack/bundle/start/copilot.lua rename to nvim/.config/nvim/pack/bundle/start/copilot.lua diff --git a/vim/.vim/pack/bundle/start/fzf-lua b/nvim/.config/nvim/pack/bundle/start/fzf-lua similarity index 100% rename from vim/.vim/pack/bundle/start/fzf-lua rename to nvim/.config/nvim/pack/bundle/start/fzf-lua diff --git a/vim/.vim/pack/bundle/start/lsp-progress.nvim b/nvim/.config/nvim/pack/bundle/start/lsp-progress.nvim similarity index 100% rename from vim/.vim/pack/bundle/start/lsp-progress.nvim rename to nvim/.config/nvim/pack/bundle/start/lsp-progress.nvim diff --git a/vim/.vim/pack/bundle/start/mason-lspconfig.nvim b/nvim/.config/nvim/pack/bundle/start/mason-lspconfig.nvim similarity index 100% rename from vim/.vim/pack/bundle/start/mason-lspconfig.nvim rename to nvim/.config/nvim/pack/bundle/start/mason-lspconfig.nvim diff --git a/vim/.vim/pack/bundle/start/mason-tool-installer.nvim b/nvim/.config/nvim/pack/bundle/start/mason-tool-installer.nvim similarity index 100% rename from vim/.vim/pack/bundle/start/mason-tool-installer.nvim rename to nvim/.config/nvim/pack/bundle/start/mason-tool-installer.nvim diff --git a/vim/.vim/pack/bundle/start/mason.nvim b/nvim/.config/nvim/pack/bundle/start/mason.nvim similarity index 100% rename from vim/.vim/pack/bundle/start/mason.nvim rename to nvim/.config/nvim/pack/bundle/start/mason.nvim diff --git a/vim/.vim/pack/bundle/start/nvim-base16 b/nvim/.config/nvim/pack/bundle/start/nvim-base16 similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-base16 rename to nvim/.config/nvim/pack/bundle/start/nvim-base16 diff --git a/vim/.vim/pack/bundle/start/nvim-cmp b/nvim/.config/nvim/pack/bundle/start/nvim-cmp similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-cmp rename to nvim/.config/nvim/pack/bundle/start/nvim-cmp diff --git a/vim/.vim/pack/bundle/start/nvim-dap b/nvim/.config/nvim/pack/bundle/start/nvim-dap similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-dap rename to nvim/.config/nvim/pack/bundle/start/nvim-dap diff --git a/vim/.vim/pack/bundle/start/nvim-dap-python b/nvim/.config/nvim/pack/bundle/start/nvim-dap-python similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-dap-python rename to nvim/.config/nvim/pack/bundle/start/nvim-dap-python diff --git a/vim/.vim/pack/bundle/start/nvim-dap-ui b/nvim/.config/nvim/pack/bundle/start/nvim-dap-ui similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-dap-ui rename to nvim/.config/nvim/pack/bundle/start/nvim-dap-ui diff --git a/vim/.vim/pack/bundle/start/nvim-dap-virtual-text b/nvim/.config/nvim/pack/bundle/start/nvim-dap-virtual-text similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-dap-virtual-text rename to nvim/.config/nvim/pack/bundle/start/nvim-dap-virtual-text diff --git a/vim/.vim/pack/bundle/start/nvim-dap-vscode-js b/nvim/.config/nvim/pack/bundle/start/nvim-dap-vscode-js similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-dap-vscode-js rename to nvim/.config/nvim/pack/bundle/start/nvim-dap-vscode-js diff --git a/vim/.vim/pack/bundle/start/nvim-jdtls b/nvim/.config/nvim/pack/bundle/start/nvim-jdtls similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-jdtls rename to nvim/.config/nvim/pack/bundle/start/nvim-jdtls diff --git a/vim/.vim/pack/bundle/start/nvim-lspconfig b/nvim/.config/nvim/pack/bundle/start/nvim-lspconfig similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-lspconfig rename to nvim/.config/nvim/pack/bundle/start/nvim-lspconfig diff --git a/vim/.vim/pack/bundle/start/nvim-treesitter b/nvim/.config/nvim/pack/bundle/start/nvim-treesitter similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-treesitter rename to nvim/.config/nvim/pack/bundle/start/nvim-treesitter diff --git a/vim/.vim/pack/bundle/start/nvim-treesitter-textobjects b/nvim/.config/nvim/pack/bundle/start/nvim-treesitter-textobjects similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-treesitter-textobjects rename to nvim/.config/nvim/pack/bundle/start/nvim-treesitter-textobjects diff --git a/vim/.vim/pack/bundle/start/nvim-web-devicons b/nvim/.config/nvim/pack/bundle/start/nvim-web-devicons similarity index 100% rename from vim/.vim/pack/bundle/start/nvim-web-devicons rename to nvim/.config/nvim/pack/bundle/start/nvim-web-devicons diff --git a/vim/.vim/pack/bundle/start/quickfix-reflector.vim b/nvim/.config/nvim/pack/bundle/start/quickfix-reflector.vim similarity index 100% rename from vim/.vim/pack/bundle/start/quickfix-reflector.vim rename to nvim/.config/nvim/pack/bundle/start/quickfix-reflector.vim diff --git a/vim/.vim/pack/bundle/start/tmux.nvim b/nvim/.config/nvim/pack/bundle/start/tmux.nvim similarity index 100% rename from vim/.vim/pack/bundle/start/tmux.nvim rename to nvim/.config/nvim/pack/bundle/start/tmux.nvim diff --git a/vim/.vim/pack/bundle/start/vim-commentary b/nvim/.config/nvim/pack/bundle/start/vim-commentary similarity index 100% rename from vim/.vim/pack/bundle/start/vim-commentary rename to nvim/.config/nvim/pack/bundle/start/vim-commentary diff --git a/vim/.vim/pack/bundle/start/vim-cool b/nvim/.config/nvim/pack/bundle/start/vim-cool similarity index 100% rename from vim/.vim/pack/bundle/start/vim-cool rename to nvim/.config/nvim/pack/bundle/start/vim-cool diff --git a/vim/.vim/pack/bundle/start/vim-dirvish b/nvim/.config/nvim/pack/bundle/start/vim-dirvish similarity index 100% rename from vim/.vim/pack/bundle/start/vim-dirvish rename to nvim/.config/nvim/pack/bundle/start/vim-dirvish diff --git a/vim/.vim/pack/bundle/start/vim-dirvish-dovish b/nvim/.config/nvim/pack/bundle/start/vim-dirvish-dovish similarity index 100% rename from vim/.vim/pack/bundle/start/vim-dirvish-dovish rename to nvim/.config/nvim/pack/bundle/start/vim-dirvish-dovish diff --git a/vim/.vim/pack/bundle/start/vim-rooter b/nvim/.config/nvim/pack/bundle/start/vim-rooter similarity index 100% rename from vim/.vim/pack/bundle/start/vim-rooter rename to nvim/.config/nvim/pack/bundle/start/vim-rooter diff --git a/vim/.vim/pack/bundle/start/vim-vsnip b/nvim/.config/nvim/pack/bundle/start/vim-vsnip similarity index 100% rename from vim/.vim/pack/bundle/start/vim-vsnip rename to nvim/.config/nvim/pack/bundle/start/vim-vsnip diff --git a/vim/.vim/pack/bundle/start/vimwiki b/nvim/.config/nvim/pack/bundle/start/vimwiki similarity index 100% rename from vim/.vim/pack/bundle/start/vimwiki rename to nvim/.config/nvim/pack/bundle/start/vimwiki diff --git a/vim/.vim/pack/bundle/start/which-key.nvim b/nvim/.config/nvim/pack/bundle/start/which-key.nvim similarity index 100% rename from vim/.vim/pack/bundle/start/which-key.nvim rename to nvim/.config/nvim/pack/bundle/start/which-key.nvim