merge: work

This commit is contained in:
AngeD 2022-09-23 11:40:28 +02:00
commit 054ecc1104
15 changed files with 23 additions and 27 deletions

View File

@ -36,11 +36,12 @@ vim.wo.cc = "80"
-------------------- --------------------
require"pack-black" require"pack-black"
require"pack-dirdiff"
require"pack-easy-align"
require"pack-indent-blankline" require"pack-indent-blankline"
require"pack-lspconfig" require"pack-lspconfig"
require"pack-nvim-treesitter" require"pack-treesitter"
require"pack-vim-dirdiff" require"pack-which-key"
require"pack-vim-easy-align"
----------------------- -----------------------
----- keybindings ----- ----- keybindings -----

View File

@ -1,4 +1,4 @@
vim.cmd("packadd nvim-lspconfig") vim.cmd("packadd lspconfig")
lspconfig = require"lspconfig" lspconfig = require"lspconfig"

View File

@ -1,5 +0,0 @@
vim.cmd("packadd nvim-treesitter")
require"nvim-treesitter.configs".setup {
auto_install = true,
highlight = {enable = true},
}

View File

@ -1 +0,0 @@
vim.cmd("packadd vim-dirdiff")

View File

@ -1,3 +0,0 @@
vim.cmd("packadd vim-easy-align")
vim.keymap.set("n", "ga", "<Plug>(EasyAlign)")
vim.keymap.set("x", "ga", "<Plug>(EasyAlign)")

@ -1 +1 @@
Subproject commit 6ae8457a8628345c59fed22c58728ffa258a3e76 Subproject commit bfc013ab93d0993a6e24235291dddd4c4ecd64ee

@ -0,0 +1 @@
Subproject commit d4eb971db353ccf78cefb3be1b05483b69ec1e69

@ -1 +0,0 @@
Subproject commit 51775b12cfbf1b6462c7b13cd020cc09e6767aea

@ -1 +0,0 @@
Subproject commit 8ec59aee8097c64fcf27d1dbd77ea181c50846c5

@ -0,0 +1 @@
Subproject commit ebea89483d6c4a6e2d563c8b884a66d546676350

@ -0,0 +1 @@
Subproject commit 6885b669523ff4238de99a7c653d47b081b5506d

23
.gitmodules vendored
View File

@ -1,21 +1,24 @@
[submodule ".config/nvim/pack/plugins/opt/black"] [submodule ".config/nvim/pack/plugins/opt/black"]
path = .config/nvim/pack/plugins/opt/black path = .config/nvim/pack/plugins/opt/black
url = https://github.com/psf/black.git 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/indent-blankline"] [submodule ".config/nvim/pack/plugins/opt/indent-blankline"]
path = .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 url = https://github.com/lukas-reineke/indent-blankline.nvim.git
[submodule ".config/nvim/pack/plugins/opt/nvim-lspconfig"] [submodule ".config/nvim/pack/plugins/opt/lspconfig"]
path = .config/nvim/pack/plugins/opt/nvim-lspconfig path = .config/nvim/pack/plugins/opt/lspconfig
url = https://github.com/neovim/nvim-lspconfig.git url = https://github.com/neovim/nvim-lspconfig.git
[submodule ".config/nvim/pack/plugins/opt/nvim-treesitter"] [submodule ".config/nvim/pack/plugins/opt/treesitter"]
path = .config/nvim/pack/plugins/opt/nvim-treesitter path = .config/nvim/pack/plugins/opt/treesitter
url = https://github.com/nvim-treesitter/nvim-treesitter.git url = https://github.com/nvim-treesitter/nvim-treesitter.git
[submodule ".config/nvim/pack/plugins/opt/vim-dirdiff"] [submodule ".config/nvim/pack/plugins/opt/which-key"]
path = .config/nvim/pack/plugins/opt/vim-dirdiff path = .config/nvim/pack/plugins/opt/which-key
url = https://github.com/will133/vim-dirdiff.git url = https://github.com/folke/which-key.nvim.git
[submodule ".config/nvim/pack/plugins/opt/vim-easy-align"]
path = .config/nvim/pack/plugins/opt/vim-easy-align
url = https://github.com/junegunn/vim-easy-align.git
[submodule ".config/zsh/ohmyzsh"] [submodule ".config/zsh/ohmyzsh"]
path = .config/zsh/ohmyzsh path = .config/zsh/ohmyzsh
url = https://github.com/ohmyzsh/ohmyzsh.git url = https://github.com/ohmyzsh/ohmyzsh.git

2
.pyenv

@ -1 +1 @@
Subproject commit 093d0b3a49446005f8c87e702815744915721a6f Subproject commit 5b08a6492b22a22b291be483321009fd85be63fa