diff --git a/.config/nvim/ftplugin/json.lua b/.config/nvim/ftplugin/json.lua new file mode 100644 index 0000000..317629b --- /dev/null +++ b/.config/nvim/ftplugin/json.lua @@ -0,0 +1,7 @@ +-- packages + +-- variables +vim.opt_local.shiftwidth = 2 +vim.opt_local.tabstop = 2 + +-- keybindings diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 4c6b0e4..6ffbdaf 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -41,9 +41,9 @@ vim.o.mousemodel = extend ----- packages ----- -------------------- +require"pack-impatient" vim.cmd("packadd plenary") -require"pack-black" require"pack-dirdiff" require"pack-easy-align" require"pack-indent-blankline" diff --git a/.config/nvim/lua/pack-black.lua b/.config/nvim/lua/pack-black.lua deleted file mode 100644 index 79c288e..0000000 --- a/.config/nvim/lua/pack-black.lua +++ /dev/null @@ -1 +0,0 @@ -vim.cmd("packadd black") diff --git a/.config/nvim/lua/pack-impatient.lua b/.config/nvim/lua/pack-impatient.lua new file mode 100644 index 0000000..7bc909f --- /dev/null +++ b/.config/nvim/lua/pack-impatient.lua @@ -0,0 +1,2 @@ +vim.cmd("packadd impatient") +require"impatient" diff --git a/.config/nvim/lua/pack-lspconfig.lua b/.config/nvim/lua/pack-lspconfig.lua index 88e59c2..2822a02 100644 --- a/.config/nvim/lua/pack-lspconfig.lua +++ b/.config/nvim/lua/pack-lspconfig.lua @@ -12,9 +12,7 @@ vim.keymap.set("n", "q", vim.diagnostic.setloclist, opts) local servers = { "bashls", - "dockerls", "pyright", - "yamlls", } for _, server in ipairs(servers) do diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black deleted file mode 160000 index d4a8564..0000000 --- a/.config/nvim/pack/plugins/opt/black +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d4a85643a465f5fae2113d07d22d021d4af4795a diff --git a/.config/nvim/pack/plugins/opt/impatient b/.config/nvim/pack/plugins/opt/impatient new file mode 160000 index 0000000..d3dd30f --- /dev/null +++ b/.config/nvim/pack/plugins/opt/impatient @@ -0,0 +1 @@ +Subproject commit d3dd30ff0b811756e735eb9020609fa315bfbbcc diff --git a/.config/nvim/pack/plugins/opt/indent-blankline b/.config/nvim/pack/plugins/opt/indent-blankline index db7cbcb..c4c203c 160000 --- a/.config/nvim/pack/plugins/opt/indent-blankline +++ b/.config/nvim/pack/plugins/opt/indent-blankline @@ -1 +1 @@ -Subproject commit db7cbcb40cc00fc5d6074d7569fb37197705e7f6 +Subproject commit c4c203c3e8a595bc333abaf168fcb10c13ed5fb7 diff --git a/.config/nvim/pack/plugins/opt/lspconfig b/.config/nvim/pack/plugins/opt/lspconfig index a2817c9..c720632 160000 --- a/.config/nvim/pack/plugins/opt/lspconfig +++ b/.config/nvim/pack/plugins/opt/lspconfig @@ -1 +1 @@ -Subproject commit a2817c9d9500079a0340286a88653b41707a92eb +Subproject commit c7206327096bedf2e213788a60624a84b3b7552d diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope index 4d77743..cabf991 160000 --- a/.config/nvim/pack/plugins/opt/telescope +++ b/.config/nvim/pack/plugins/opt/telescope @@ -1 +1 @@ -Subproject commit 4d77743a8ec4d19b3c47e0d04f3e88f1a933698e +Subproject commit cabf991b1d3996fa6f3232327fc649bbdf676496 diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 1821c65..582e568 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 1821c656d8e42fd8ce6648af58e64268606e8bec +Subproject commit 582e5683fbe88ecbc73396a7bc1431d84ca693e8 diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index 1aa58d4..b692ff2 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit 1aa58d42a52b8fa39f16ad169fc405f276c36ae5 +Subproject commit b692ff2e1597816563cbdaeeedf0966ad9babeca diff --git a/.gitmodules b/.gitmodules index a1745e6..a8d816d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ -[submodule ".config/nvim/pack/plugins/opt/black"] - path = .config/nvim/pack/plugins/opt/black - url = https://github.com/psf/black.git [submodule ".config/nvim/pack/plugins/opt/dirdiff"] path = .config/nvim/pack/plugins/opt/dirdiff url = https://github.com/will133/vim-dirdiff.git [submodule ".config/nvim/pack/plugins/opt/easy-align"] path = .config/nvim/pack/plugins/opt/easy-align url = https://github.com/junegunn/vim-easy-align.git +[submodule ".config/nvim/pack/plugins/opt/impatient"] + path = .config/nvim/pack/plugins/opt/impatient + url = https://github.com/lewis6991/impatient.nvim.git [submodule ".config/nvim/pack/plugins/opt/indent-blankline"] path = .config/nvim/pack/plugins/opt/indent-blankline url = https://github.com/lukas-reineke/indent-blankline.nvim.git diff --git a/.pyenv b/.pyenv index 13d8568..73dc554 160000 --- a/.pyenv +++ b/.pyenv @@ -1 +1 @@ -Subproject commit 13d85686205e7a21f2aabd659ee96d34dd7a12b5 +Subproject commit 73dc5547fce4a12b77a54b4661cea7de3489baab