Skip to content

Commit 1b9d4cf

Browse files
mokevninmokevnin
committedJun 1, 2024··
update deps
Signed-off-by: Kirill Mokevnin <mokevnin@gmail.com>
1 parent 379903b commit 1b9d4cf

14 files changed

+114
-86
lines changed
 

‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ install:
66
./install.sh
77

88
nvim-configure:
9-
# rm -rf nvim/plugin || exit 0
10-
# rm -rf ~/.local/share/nvim || exit 0
11-
# rm -rf ~/.config/nvim || exit 0
12-
# mkdir -p ~/.config
9+
rm -rf ~/.config/nvim
10+
rm -rf ~/.local/share/nvim
11+
rm -rf ~/.local/state/nvim
12+
rm -rf ~/.cache/nvim
13+
# rm -rf ~/.config/nvim/.git
1314
ln -snf $(PWD)/nvim ~/.config/nvim
14-
# nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
1515

1616
deps-install: deps-gem deps-composer deps-npm deps-pip deps-go
1717

@@ -22,7 +22,7 @@ deps-pip:
2222
# pip3 install --upgrade autopep8 flake8 bandit pytype # black
2323

2424
deps-gem:
25-
# gem install --no-document neovim
25+
gem install --no-document neovim
2626
# gem install --no-document solargraph solargraph-rails
2727
# gem install --no-document rubocop rubocop-rspec rubocop-rails rubocop-performance rubocop-rake
2828
# gem install --no-document sorbet sorbet-runtime

‎install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ darwin*)
3232
eval "$(/opt/homebrew/bin/brew shellenv)"
3333
brew install jesseduffield/lazygit/lazygit
3434

35-
yes | brew install asdf neovim git the_silver_searcher fzf bat htop fd ncdu tldr httpie git-delta ripgrep gnu-sed
35+
yes | brew install asdf neovim git the_silver_searcher fzf bat htop fd ncdu tldr httpie git-delta ripgrep gnu-sed wget
3636
yes | brew install pandoc actionlint shellcheck checkmake lazygit
3737
yes | brew install lua nodejs golang php composer
3838
yes | brew install --cask temurin

‎nvim/.neoconf.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"neodev": {
3+
"library": {
4+
"enabled": true,
5+
"plugins": true
6+
}
7+
},
8+
"neoconf": {
9+
"plugins": {
10+
"lua_ls": {
11+
"enabled": true
12+
}
13+
}
14+
}
15+
}

‎nvim/lazy-lock.json

+29-32
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
{
2-
"LazyVim": { "branch": "main", "commit": "59204df1cb4a1d0176005dd7dc901ddbae9d23bd" },
3-
"SchemaStore.nvim": { "branch": "main", "commit": "9a5992a881583d886bfbb46631a09f736f0fae50" },
2+
"LazyVim": { "branch": "main", "commit": "298a8f5c5d7d854719eaf7c2ba113f463cab411d" },
3+
"SchemaStore.nvim": { "branch": "main", "commit": "931f9f3b7b60ec976159cb01b4a40da3829ac2fd" },
44
"auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
55
"bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
66
"catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" },
77
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
88
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
99
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
1010
"conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
11-
"ctrlsf.vim": { "branch": "master", "commit": "32236a8b376d9311dec9b5fe795ca99d32060b13" },
12-
"dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" },
11+
"dashboard-nvim": { "branch": "master", "commit": "b5a2a4269babbcc23c2d50a859516199841714b9" },
1312
"dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" },
14-
"friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
15-
"gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
13+
"friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" },
14+
"gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" },
1615
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
1716
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
18-
"lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
17+
"lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" },
1918
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
2019
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
2120
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
2221
"mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
23-
"mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
22+
"mason.nvim": { "branch": "main", "commit": "0fb4e56837f13b81a972fcc0554be1327b39061e" },
2423
"mini.ai": { "branch": "main", "commit": "7859b6344f5cee567a94f173859d25e20ba1a77e" },
2524
"mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" },
2625
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
27-
"neoconf.nvim": { "branch": "main", "commit": "4e204e0d423e70293b81ba1655ed17e1f3c97986" },
26+
"neoconf.nvim": { "branch": "main", "commit": "f1fd38d61d11f3b1b3e7dc75dc667f79cf2fa58b" },
2827
"neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
29-
"none-ls.nvim": { "branch": "main", "commit": "60f5f80686f5a272ed3281a7d4962cb54dc5348e" },
28+
"none-ls.nvim": { "branch": "main", "commit": "f5b960a73418249aebcdae3455de320360509253" },
3029
"nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
3130
"nvim-ansible": { "branch": "main", "commit": "cb5d0cc79c1864b72d5ae40a926a1176b18f1b65" },
32-
"nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" },
31+
"nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" },
3332
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
3433
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
35-
"nvim-dap": { "branch": "master", "commit": "c65c163daa47e0623dd85d2303fce0c22e52ad01" },
36-
"nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" },
34+
"nvim-dap": { "branch": "master", "commit": "09b54e03d43d967c062a7d5b1da445f04e6f3113" },
35+
"nvim-dap-go": { "branch": "main", "commit": "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1" },
3736
"nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" },
3837
"nvim-dap-ruby": { "branch": "main", "commit": "7b2c026baeedcd5aa0687067ea640767e9d45faf" },
39-
"nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" },
38+
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
4039
"nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
41-
"nvim-jdtls": { "branch": "master", "commit": "10691312d51c5485c656a71258b55d3798d3fb3e" },
42-
"nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" },
43-
"nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
40+
"nvim-jdtls": { "branch": "master", "commit": "ad5ab1c9246caa9e2c69a7c13d2be9901b5c02aa" },
41+
"nvim-lint": { "branch": "master", "commit": "2f90fe977ef21db3bf3b7a1ceaf4a1e3aafb2b26" },
42+
"nvim-lspconfig": { "branch": "master", "commit": "b124ef3bd4435a6db7ff03ea2f5a23e1e0487552" },
4443
"nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
45-
"nvim-snippets": { "branch": "main", "commit": "67f44a552f03b5de23af1900d01af3256a3da2bc" },
46-
"nvim-spectre": { "branch": "master", "commit": "5690ea46baf08bbc1623980012e14b6239ce582e" },
47-
"nvim-treesitter": { "branch": "master", "commit": "245da4eb2e52d14b034bbbedec9671e997ede764" },
44+
"nvim-snippets": { "branch": "main", "commit": "3f711035277accc53966fe202104c2d7ca1c5717" },
45+
"nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" },
46+
"nvim-treesitter": { "branch": "master", "commit": "b7d50e59b1b2990b3ce8761d4cf595f4b71c87e2" },
4847
"nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
4948
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
5049
"nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" },
51-
"nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" },
50+
"nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" },
51+
"nvim-vtsls": { "branch": "main", "commit": "719fabc328c48fa03b1f3373205fcd1f60d21dc2" },
5252
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
5353
"persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
5454
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
@@ -57,21 +57,18 @@
5757
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
5858
"telescope-terraform-doc.nvim": { "branch": "main", "commit": "e09181f76acefaf66d2b55149bebe939828234b4" },
5959
"telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" },
60-
"telescope.nvim": { "branch": "master", "commit": "349660c0d35da06459ee8589af77de2086b652ce" },
60+
"telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" },
6161
"todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" },
62-
"tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" },
63-
"tree-sitter-embedded-template": { "branch": "master", "commit": "38d5004a797298dc42c85e7706c5ceac46a3f29f" },
64-
"treesj": { "branch": "main", "commit": "e1e82ab4237619d342c7102c9f13d4b9833bfd39" },
65-
"trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
66-
"ts-comments.nvim": { "branch": "main", "commit": "f7ded340b4c6b317593b867838bf7ace354a67d4" },
62+
"tokyonight.nvim": { "branch": "main", "commit": "7e5ef71a103e7de5fe6c05f5d6ab97d1640f08cf" },
63+
"treesj": { "branch": "main", "commit": "f98deb33805485b56a8d44d1a27d16874af00d7f" },
64+
"trouble.nvim": { "branch": "main", "commit": "d7f69ff5638cf1864cabac54ade1b1694adfe085" },
65+
"ts-comments.nvim": { "branch": "main", "commit": "e339090c076871069c00e488b11def49aaf4e413" },
6766
"venv-selector.nvim": { "branch": "main", "commit": "6a1b15eb35bbb827b6db428055087e2dbf32838f" },
68-
"vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" },
69-
"vim-helm": { "branch": "master", "commit": "9425cf68d2a73d2efbfd05ab3e8b80ffb5a08802" },
70-
"vim-pug": { "branch": "master", "commit": "ea39cd942cf3194230cf72bfb838901a5344d3b3" },
67+
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" },
7168
"vim-rails": { "branch": "master", "commit": "8972461e64c7c4bf049f2f86ea1bc571e8077b55" },
7269
"vim-slim": { "branch": "master", "commit": "a0a57f75f20a03d5fa798484743e98f4af623926" },
7370
"vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
74-
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
71+
"which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" },
7572
"window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
76-
"yanky.nvim": { "branch": "main", "commit": "8756d19923ad871eb95f543a8a98c026b4a8494f" }
73+
"yanky.nvim": { "branch": "main", "commit": "79338563e85a868e59cda02c51b54d90a5514a12" }
7774
}

‎nvim/lazyvim.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
"news": {
66
"NEWS.md": "4964"
77
},
8-
"version": 5
8+
"version": 6
99
}

‎nvim/lua/config/lazy.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if not vim.loop.fs_stat(lazypath) then
66
end
77
vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
88

9-
require('lazy').setup({
9+
require("lazy").setup({
1010
change_detection = { notify = false },
1111
spec = {
1212
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
@@ -26,7 +26,7 @@ require('lazy').setup({
2626
{ import = "lazyvim.plugins.extras.lang.elixir" },
2727
{ import = "lazyvim.plugins.extras.lang.java" },
2828
{ import = "lazyvim.plugins.extras.lang.python" },
29-
{ import = "lazyvim.plugins.extras.lang.ruby" },
29+
-- { import = "lazyvim.plugins.extras.lang.ruby" },
3030
{ import = "lazyvim.plugins.extras.lang.terraform" },
3131
{ import = "lazyvim.plugins.extras.lang.yaml" },
3232
{ import = "lazyvim.plugins.extras.lang.ansible" },
@@ -41,7 +41,7 @@ require('lazy').setup({
4141
version = false, -- always use the latest git commit
4242
-- version = "*", -- try installing the latest stable version for plugins that support semver
4343
},
44-
-- install = { colorscheme = { "tokyonight", "habamax" } },
44+
install = { colorscheme = { "tokyonight" } },
4545
checker = { enabled = true }, -- automatically check for plugin updates
4646
performance = {
4747
rtp = {

‎nvim/lua/plugins/core.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ return {
22
{
33
"LazyVim/LazyVim",
44
opts = {
5-
colorscheme = "catppuccin"
5+
-- colorscheme = "catppuccin"
66
},
77
},
88
}

‎nvim/lua/plugins/disabled.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
return {
2-
{ "echasnovski/mini.indentscope", enabled = false },
2+
-- { "echasnovski/mini.indentscope", enabled = false },
33
{ "folke/noice.nvim", enabled = false },
44
{ "rcarriga/nvim-notify", enabled = false },
55
{ "folke/flash.nvim", enabled = false },
6-
{ "ggandor/flit.nvim", enabled = false },
6+
-- { "ggandor/flit.nvim", enabled = false },
77
{ "echasnovski/mini.pairs", enabled = false },
88
-- { "ggandor/leap.nvim", enabled = false },
99
}

‎nvim/lua/plugins/lspconfig.lua

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ return {
99
-- enabled = false,
1010
-- },
1111
diagnostics = {
12-
-- underline = true,
12+
-- -- underline = true,
1313
virtual_text = false,
14-
-- float = {
15-
-- border = "rounded",
16-
-- },
14+
-- -- float = {
15+
-- -- border = "rounded",
16+
-- -- },
1717
},
1818
servers = {
19-
kotlin_language_server = {},
19+
ruby_lsp = {},
20+
-- kotlin_language_server = {},
2021
-- https://www.arthurkoziel.com/json-schemas-in-neovim/
2122
-- helm_ls = {},
2223
-- https://github.com/typescript-language-server/typescript-language-server/pull/218

‎nvim/lua/plugins/mason.lua

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
return {
22
{
33
"williamboman/mason.nvim",
4-
opts = function(_, opts)
5-
table.insert(opts.ensure_installed, "phpstan")
6-
table.insert(opts.ensure_installed, "phpcs")
7-
table.insert(opts.ensure_installed, "phpcbf")
8-
table.insert(opts.ensure_installed, "php-cs-fixer")
9-
end,
4+
opts = {
5+
ensure_installed = {
6+
"phpstan",
7+
"phpcs",
8+
"phpcbf",
9+
"php-cs-fixer",
10+
"ruby-lsp"
11+
-- table.insert(opts.ensure_installed, "phpstan")
12+
-- table.insert(opts.ensure_installed, "phpcs")
13+
-- table.insert(opts.ensure_installed, "phpcbf")
14+
-- table.insert(opts.ensure_installed, "php-cs-fixer")
15+
},
16+
},
1017
},
1118
}

‎nvim/lua/plugins/others.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ return {
4545
},
4646
{ "slim-template/vim-slim" },
4747
{ "tpope/vim-rails" },
48-
-- use 'slim-template/vim-slim'
48+
use 'slim-template/vim-slim'
4949
{ "dhruvasagar/vim-table-mode" },
50-
{ "tree-sitter/tree-sitter-embedded-template" },
50+
-- { "tree-sitter/tree-sitter-embedded-template" },
5151
{ "RRethy/nvim-treesitter-endwise" },
5252
{ "dyng/ctrlsf.vim" },
53-
{ "digitaltoad/vim-pug" },
53+
-- { "digitaltoad/vim-pug" },
5454
-- {
5555
-- "kylechui/nvim-surround",
5656
-- version = "*", -- Use for stability; omit to use `main` branch for the latest features

‎nvim/lua/plugins/telescope.lua

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ return {
1313
n = {},
1414
},
1515
},
16-
pickers = {
17-
buffers = {
18-
ignore_current_buffer = true,
19-
sort_mru = true,
20-
},
21-
},
16+
-- pickers = {
17+
-- buffers = {
18+
-- ignore_current_buffer = true,
19+
-- sort_mru = true,
20+
-- },
21+
-- },
2222
},
2323
},
2424
{

‎nvim/lua/plugins/treesitter.lua

+25-20
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
return {
22
{
33
"nvim-treesitter/nvim-treesitter",
4-
opts = function(_, opts)
5-
opts.endwise = {
4+
opts = {
5+
endwise = {
66
enable = true,
7-
}
8-
opts.swap = {
9-
enable = true,
10-
}
11-
12-
opts.autotag = {
13-
enable = true,
14-
}
15-
16-
opts.select = {
17-
enable = true,
18-
}
19-
opts.textobjects = {
20-
lsp_interop = {
21-
enable = true,
22-
},
23-
}
24-
end,
7+
},
8+
},
9+
-- opts = function(_, opts)
10+
-- opts.endwise = {
11+
-- enable = true,
12+
-- }
13+
-- opts.swap = {
14+
-- enable = true,
15+
-- }
16+
--
17+
-- opts.autotag = {
18+
-- enable = true,
19+
-- }
20+
--
21+
-- opts.select = {
22+
-- enable = true,
23+
-- }
24+
-- opts.textobjects = {
25+
-- lsp_interop = {
26+
-- enable = true,
27+
-- },
28+
-- }
29+
-- end,
2530
},
2631
}

‎nvim/stylua.toml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
indent_type = "Spaces"
2+
indent_width = 2
3+
column_width = 120

0 commit comments

Comments
 (0)
Please sign in to comment.