From 1b9d4cfa94520074fad71e70d533ef27dffad6cb Mon Sep 17 00:00:00 2001 From: Kirill Mokevnin Date: Fri, 31 May 2024 20:44:16 -0400 Subject: [PATCH] update deps Signed-off-by: Kirill Mokevnin --- Makefile | 12 +++---- install.sh | 2 +- nvim/.neoconf.json | 15 ++++++++ nvim/lazy-lock.json | 61 ++++++++++++++++----------------- nvim/lazyvim.json | 2 +- nvim/lua/config/lazy.lua | 6 ++-- nvim/lua/plugins/core.lua | 2 +- nvim/lua/plugins/disabled.lua | 4 +-- nvim/lua/plugins/lspconfig.lua | 11 +++--- nvim/lua/plugins/mason.lua | 19 ++++++---- nvim/lua/plugins/others.lua | 6 ++-- nvim/lua/plugins/telescope.lua | 12 +++---- nvim/lua/plugins/treesitter.lua | 45 +++++++++++++----------- nvim/stylua.toml | 3 ++ 14 files changed, 114 insertions(+), 86 deletions(-) create mode 100644 nvim/.neoconf.json create mode 100644 nvim/stylua.toml diff --git a/Makefile b/Makefile index 9f6d544..0d46724 100644 --- a/Makefile +++ b/Makefile @@ -6,12 +6,12 @@ install: ./install.sh nvim-configure: - # rm -rf nvim/plugin || exit 0 - # rm -rf ~/.local/share/nvim || exit 0 - # rm -rf ~/.config/nvim || exit 0 - # mkdir -p ~/.config + rm -rf ~/.config/nvim + rm -rf ~/.local/share/nvim + rm -rf ~/.local/state/nvim + rm -rf ~/.cache/nvim + # rm -rf ~/.config/nvim/.git ln -snf $(PWD)/nvim ~/.config/nvim - # nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync' deps-install: deps-gem deps-composer deps-npm deps-pip deps-go @@ -22,7 +22,7 @@ deps-pip: # pip3 install --upgrade autopep8 flake8 bandit pytype # black deps-gem: - # gem install --no-document neovim + gem install --no-document neovim # gem install --no-document solargraph solargraph-rails # gem install --no-document rubocop rubocop-rspec rubocop-rails rubocop-performance rubocop-rake # gem install --no-document sorbet sorbet-runtime diff --git a/install.sh b/install.sh index e84d665..692cb47 100755 --- a/install.sh +++ b/install.sh @@ -32,7 +32,7 @@ darwin*) eval "$(/opt/homebrew/bin/brew shellenv)" brew install jesseduffield/lazygit/lazygit - yes | brew install asdf neovim git the_silver_searcher fzf bat htop fd ncdu tldr httpie git-delta ripgrep gnu-sed + yes | brew install asdf neovim git the_silver_searcher fzf bat htop fd ncdu tldr httpie git-delta ripgrep gnu-sed wget yes | brew install pandoc actionlint shellcheck checkmake lazygit yes | brew install lua nodejs golang php composer yes | brew install --cask temurin diff --git a/nvim/.neoconf.json b/nvim/.neoconf.json new file mode 100644 index 0000000..7c48087 --- /dev/null +++ b/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 10ac875..4442c3d 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,6 +1,6 @@ { - "LazyVim": { "branch": "main", "commit": "59204df1cb4a1d0176005dd7dc901ddbae9d23bd" }, - "SchemaStore.nvim": { "branch": "main", "commit": "9a5992a881583d886bfbb46631a09f736f0fae50" }, + "LazyVim": { "branch": "main", "commit": "298a8f5c5d7d854719eaf7c2ba113f463cab411d" }, + "SchemaStore.nvim": { "branch": "main", "commit": "931f9f3b7b60ec976159cb01b4a40da3829ac2fd" }, "auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "catppuccin": { "branch": "main", "commit": "5215ea59df6d0a7e27da9a5cd1165e06d1b04cbe" }, @@ -8,47 +8,47 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" }, - "ctrlsf.vim": { "branch": "master", "commit": "32236a8b376d9311dec9b5fe795ca99d32060b13" }, - "dashboard-nvim": { "branch": "master", "commit": "5182c09ac8085dc73b78ad0ea9f5479c9a866fc4" }, + "dashboard-nvim": { "branch": "master", "commit": "b5a2a4269babbcc23c2d50a859516199841714b9" }, "dressing.nvim": { "branch": "master", "commit": "3c38ac861e1b8d4077ff46a779cde17330b29f3a" }, - "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, - "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" }, + "friendly-snippets": { "branch": "main", "commit": "d0610077b6129cf9f7f78afbe3a1425d60f6e2f1" }, + "gitsigns.nvim": { "branch": "main", "commit": "75dc649106827183547d3bedd4602442340d2f7f" }, "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, + "lazy.nvim": { "branch": "main", "commit": "eab487c2520f0fe9e54eb5e3ea0606e20512492e" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, - "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, + "mason.nvim": { "branch": "main", "commit": "0fb4e56837f13b81a972fcc0554be1327b39061e" }, "mini.ai": { "branch": "main", "commit": "7859b6344f5cee567a94f173859d25e20ba1a77e" }, "mini.surround": { "branch": "main", "commit": "27096c1a27324ee8f2044ea2adc77366d8a782de" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, - "neoconf.nvim": { "branch": "main", "commit": "4e204e0d423e70293b81ba1655ed17e1f3c97986" }, + "neoconf.nvim": { "branch": "main", "commit": "f1fd38d61d11f3b1b3e7dc75dc667f79cf2fa58b" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "none-ls.nvim": { "branch": "main", "commit": "60f5f80686f5a272ed3281a7d4962cb54dc5348e" }, + "none-ls.nvim": { "branch": "main", "commit": "f5b960a73418249aebcdae3455de320360509253" }, "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" }, "nvim-ansible": { "branch": "main", "commit": "cb5d0cc79c1864b72d5ae40a926a1176b18f1b65" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "e354bd84fed978e31501396aea6154bd97087e07" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" }, "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, - "nvim-dap": { "branch": "master", "commit": "c65c163daa47e0623dd85d2303fce0c22e52ad01" }, - "nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" }, + "nvim-dap": { "branch": "master", "commit": "09b54e03d43d967c062a7d5b1da445f04e6f3113" }, + "nvim-dap-go": { "branch": "main", "commit": "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1" }, "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" }, "nvim-dap-ruby": { "branch": "main", "commit": "7b2c026baeedcd5aa0687067ea640767e9d45faf" }, - "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" }, + "nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" }, - "nvim-jdtls": { "branch": "master", "commit": "10691312d51c5485c656a71258b55d3798d3fb3e" }, - "nvim-lint": { "branch": "master", "commit": "e19842a05aae484957ad20710444757bc0a61d63" }, - "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" }, + "nvim-jdtls": { "branch": "master", "commit": "ad5ab1c9246caa9e2c69a7c13d2be9901b5c02aa" }, + "nvim-lint": { "branch": "master", "commit": "2f90fe977ef21db3bf3b7a1ceaf4a1e3aafb2b26" }, + "nvim-lspconfig": { "branch": "master", "commit": "b124ef3bd4435a6db7ff03ea2f5a23e1e0487552" }, "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" }, - "nvim-snippets": { "branch": "main", "commit": "67f44a552f03b5de23af1900d01af3256a3da2bc" }, - "nvim-spectre": { "branch": "master", "commit": "5690ea46baf08bbc1623980012e14b6239ce582e" }, - "nvim-treesitter": { "branch": "master", "commit": "245da4eb2e52d14b034bbbedec9671e997ede764" }, + "nvim-snippets": { "branch": "main", "commit": "3f711035277accc53966fe202104c2d7ca1c5717" }, + "nvim-spectre": { "branch": "master", "commit": "366f46fdd4a1593cc237aea13d5ef113739a472c" }, + "nvim-treesitter": { "branch": "master", "commit": "b7d50e59b1b2990b3ce8761d4cf595f4b71c87e2" }, "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "3557e41418b4a6c5b85d5d64abe94c9c50fa9b14" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "bcf3146864262ef2d3c877beba3e222b5c73780d" }, + "nvim-vtsls": { "branch": "main", "commit": "719fabc328c48fa03b1f3373205fcd1f60d21dc2" }, "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, @@ -57,21 +57,18 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-terraform-doc.nvim": { "branch": "main", "commit": "e09181f76acefaf66d2b55149bebe939828234b4" }, "telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" }, - "telescope.nvim": { "branch": "master", "commit": "349660c0d35da06459ee8589af77de2086b652ce" }, + "telescope.nvim": { "branch": "master", "commit": "dfa230be84a044e7f546a6c2b0a403c739732b86" }, "todo-comments.nvim": { "branch": "main", "commit": "e1549807066947818113a7d7ed48f637e49620d3" }, - "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" }, - "tree-sitter-embedded-template": { "branch": "master", "commit": "38d5004a797298dc42c85e7706c5ceac46a3f29f" }, - "treesj": { "branch": "main", "commit": "e1e82ab4237619d342c7102c9f13d4b9833bfd39" }, - "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" }, - "ts-comments.nvim": { "branch": "main", "commit": "f7ded340b4c6b317593b867838bf7ace354a67d4" }, + "tokyonight.nvim": { "branch": "main", "commit": "7e5ef71a103e7de5fe6c05f5d6ab97d1640f08cf" }, + "treesj": { "branch": "main", "commit": "f98deb33805485b56a8d44d1a27d16874af00d7f" }, + "trouble.nvim": { "branch": "main", "commit": "d7f69ff5638cf1864cabac54ade1b1694adfe085" }, + "ts-comments.nvim": { "branch": "main", "commit": "e339090c076871069c00e488b11def49aaf4e413" }, "venv-selector.nvim": { "branch": "main", "commit": "6a1b15eb35bbb827b6db428055087e2dbf32838f" }, - "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, - "vim-helm": { "branch": "master", "commit": "9425cf68d2a73d2efbfd05ab3e8b80ffb5a08802" }, - "vim-pug": { "branch": "master", "commit": "ea39cd942cf3194230cf72bfb838901a5344d3b3" }, + "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }, "vim-rails": { "branch": "master", "commit": "8972461e64c7c4bf049f2f86ea1bc571e8077b55" }, "vim-slim": { "branch": "master", "commit": "a0a57f75f20a03d5fa798484743e98f4af623926" }, "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, + "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" }, "window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, - "yanky.nvim": { "branch": "main", "commit": "8756d19923ad871eb95f543a8a98c026b4a8494f" } + "yanky.nvim": { "branch": "main", "commit": "79338563e85a868e59cda02c51b54d90a5514a12" } } \ No newline at end of file diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index aa2550d..d5de4bc 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -5,5 +5,5 @@ "news": { "NEWS.md": "4964" }, - "version": 5 + "version": 6 } \ No newline at end of file diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index e29740b..3162513 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -6,7 +6,7 @@ if not vim.loop.fs_stat(lazypath) then end vim.opt.rtp:prepend(vim.env.LAZY or lazypath) -require('lazy').setup({ +require("lazy").setup({ change_detection = { notify = false }, spec = { { "LazyVim/LazyVim", import = "lazyvim.plugins" }, @@ -26,7 +26,7 @@ require('lazy').setup({ { import = "lazyvim.plugins.extras.lang.elixir" }, { import = "lazyvim.plugins.extras.lang.java" }, { import = "lazyvim.plugins.extras.lang.python" }, - { import = "lazyvim.plugins.extras.lang.ruby" }, + -- { import = "lazyvim.plugins.extras.lang.ruby" }, { import = "lazyvim.plugins.extras.lang.terraform" }, { import = "lazyvim.plugins.extras.lang.yaml" }, { import = "lazyvim.plugins.extras.lang.ansible" }, @@ -41,7 +41,7 @@ require('lazy').setup({ version = false, -- always use the latest git commit -- version = "*", -- try installing the latest stable version for plugins that support semver }, - -- install = { colorscheme = { "tokyonight", "habamax" } }, + install = { colorscheme = { "tokyonight" } }, checker = { enabled = true }, -- automatically check for plugin updates performance = { rtp = { diff --git a/nvim/lua/plugins/core.lua b/nvim/lua/plugins/core.lua index 4a1d982..a30adba 100644 --- a/nvim/lua/plugins/core.lua +++ b/nvim/lua/plugins/core.lua @@ -2,7 +2,7 @@ return { { "LazyVim/LazyVim", opts = { - colorscheme = "catppuccin" + -- colorscheme = "catppuccin" }, }, } diff --git a/nvim/lua/plugins/disabled.lua b/nvim/lua/plugins/disabled.lua index b8c1ab3..cfea86a 100644 --- a/nvim/lua/plugins/disabled.lua +++ b/nvim/lua/plugins/disabled.lua @@ -1,9 +1,9 @@ return { - { "echasnovski/mini.indentscope", enabled = false }, + -- { "echasnovski/mini.indentscope", enabled = false }, { "folke/noice.nvim", enabled = false }, { "rcarriga/nvim-notify", enabled = false }, { "folke/flash.nvim", enabled = false }, - { "ggandor/flit.nvim", enabled = false }, + -- { "ggandor/flit.nvim", enabled = false }, { "echasnovski/mini.pairs", enabled = false }, -- { "ggandor/leap.nvim", enabled = false }, } diff --git a/nvim/lua/plugins/lspconfig.lua b/nvim/lua/plugins/lspconfig.lua index 90d53a4..2881ecb 100644 --- a/nvim/lua/plugins/lspconfig.lua +++ b/nvim/lua/plugins/lspconfig.lua @@ -9,14 +9,15 @@ return { -- enabled = false, -- }, diagnostics = { - -- underline = true, + -- -- underline = true, virtual_text = false, - -- float = { - -- border = "rounded", - -- }, + -- -- float = { + -- -- border = "rounded", + -- -- }, }, servers = { - kotlin_language_server = {}, + ruby_lsp = {}, + -- kotlin_language_server = {}, -- https://www.arthurkoziel.com/json-schemas-in-neovim/ -- helm_ls = {}, -- https://github.com/typescript-language-server/typescript-language-server/pull/218 diff --git a/nvim/lua/plugins/mason.lua b/nvim/lua/plugins/mason.lua index b9f442f..b481e7f 100644 --- a/nvim/lua/plugins/mason.lua +++ b/nvim/lua/plugins/mason.lua @@ -1,11 +1,18 @@ return { { "williamboman/mason.nvim", - opts = function(_, opts) - table.insert(opts.ensure_installed, "phpstan") - table.insert(opts.ensure_installed, "phpcs") - table.insert(opts.ensure_installed, "phpcbf") - table.insert(opts.ensure_installed, "php-cs-fixer") - end, + opts = { + ensure_installed = { + "phpstan", + "phpcs", + "phpcbf", + "php-cs-fixer", + "ruby-lsp" + -- table.insert(opts.ensure_installed, "phpstan") + -- table.insert(opts.ensure_installed, "phpcs") + -- table.insert(opts.ensure_installed, "phpcbf") + -- table.insert(opts.ensure_installed, "php-cs-fixer") + }, + }, }, } diff --git a/nvim/lua/plugins/others.lua b/nvim/lua/plugins/others.lua index 0ca7bfe..d69587c 100644 --- a/nvim/lua/plugins/others.lua +++ b/nvim/lua/plugins/others.lua @@ -45,12 +45,12 @@ return { }, { "slim-template/vim-slim" }, { "tpope/vim-rails" }, - -- use 'slim-template/vim-slim' + use 'slim-template/vim-slim' { "dhruvasagar/vim-table-mode" }, - { "tree-sitter/tree-sitter-embedded-template" }, + -- { "tree-sitter/tree-sitter-embedded-template" }, { "RRethy/nvim-treesitter-endwise" }, { "dyng/ctrlsf.vim" }, - { "digitaltoad/vim-pug" }, + -- { "digitaltoad/vim-pug" }, -- { -- "kylechui/nvim-surround", -- version = "*", -- Use for stability; omit to use `main` branch for the latest features diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 4efd6d1..65ae29b 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -13,12 +13,12 @@ return { n = {}, }, }, - pickers = { - buffers = { - ignore_current_buffer = true, - sort_mru = true, - }, - }, + -- pickers = { + -- buffers = { + -- ignore_current_buffer = true, + -- sort_mru = true, + -- }, + -- }, }, }, { diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index cb07c07..d0c3c0a 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -1,26 +1,31 @@ return { { "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - opts.endwise = { + opts = { + endwise = { enable = true, - } - opts.swap = { - enable = true, - } - - opts.autotag = { - enable = true, - } - - opts.select = { - enable = true, - } - opts.textobjects = { - lsp_interop = { - enable = true, - }, - } - end, + }, + }, + -- opts = function(_, opts) + -- opts.endwise = { + -- enable = true, + -- } + -- opts.swap = { + -- enable = true, + -- } + -- + -- opts.autotag = { + -- enable = true, + -- } + -- + -- opts.select = { + -- enable = true, + -- } + -- opts.textobjects = { + -- lsp_interop = { + -- enable = true, + -- }, + -- } + -- end, }, } diff --git a/nvim/stylua.toml b/nvim/stylua.toml new file mode 100644 index 0000000..0f90030 --- /dev/null +++ b/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120