update nvim configuration

Signed-off-by: Kirill Mokevnin <[email protected]>

Makefile

@@ -1,4 +1,4 @@
-all: install nvim-configure deps-install
+jall: install nvim-configure deps-install
 
 TAGS := all
 
@@ -10,19 +10,19 @@ nvim-configure:
 	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
 
 deps-install: deps-gem deps-composer deps-npm deps-pip deps-go
 
 deps-pip:
 	# pip2 install --upgrade pynvim
-	pip3 install --break-system-packages pynvim
+	# pipx install pynvim
 	# pip3 install --upgrade vim-vint spellcheck yamllint codespell ansible-lint
 	# pip3 install --upgrade autopep8 flake8 bandit pytype # black
 
 deps-gem:
-	gem install --no-document neovim asciidoctor asciidoctor-diagram
+	gem install --no-document neovim # asciidoctor asciidoctor-diagram
 	# 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
@@ -36,13 +36,16 @@ deps-composer:
 		# phpactor/phpactor
 
 deps-npm:
-	npm install -g neovim
+	npm install -g neovim markdown-toc markdownlint-cli2
 	# npm install -g prettier eslint eslint-plugin-import eslint-plugin-node
 	# npx install-peerdeps -yg eslint-config-airbnb
 	# npm install -g stylelint stylelint-config-recommended stylelint-config-standard
 	# npm install -g yaml-language-server markuplint markdownlint-cli bash-language-server jsonlint
 	# npm install -g dockerfile-language-server-nodejs
 
+deps-brew:
+	brew install biome pipx
+
 deps-go:
 	# go install honnef.co/go/tools/cmd/staticcheck@latest
 	# GO111MODULE=on go install golang.org/x/tools/gopls@latest

install.sh

@@ -20,7 +20,7 @@ linux*)
 	apt install -yy autoconf bison patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev
 
 	# https://github.com/asdf-community/asdf-php/blob/master/.github/workflows/workflow.yml
-	apt install -yy autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev openssl pkg-config re2c zlib1g-dev
+	# apt install -yy autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev openssl pkg-config re2c zlib1g-dev
 
 	update-alternatives --install /usr/bin/editor editor /usr/bin/vim 100
 
@@ -32,67 +32,30 @@ 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 wget
+	yes | brew install mise neovim git the_silver_searcher fzf bat htop fd ncdu tldr httpie git-delta ripgrep gnu-sed wget
 	yes | brew install viu chafa sox ast-grep asciidoctor
 	yes | brew install pandoc actionlint shellcheck checkmake lazygit markdownlint-cli2
-  yes | brew install lua nodejs golang php composer luarocks
+  yes | brew install lua nodejs golang php composer luarocks ruby
   yes | brew install --cask temurin
-  yes | brew install jstkdng/programs/ueberzugpp
 
   # https://gist.github.com/davidteren/898f2dcccd42d9f8680ec69a3a5d350e
-  brew install font-ubuntu-nerd-font
+  yes | brew install font-ubuntu-nerd-font
 	;;
 *)
 	echo 'Everything is ready. Go to the next step'
 	;;
 esac
 
 sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" || true
-sed -i'.bak' 's/^plugins=.*$/plugins=(git asdf vi-mode fzf docker docker-compose you-should-use)/' ~/.zshrc
-# git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.10.2 || true
-# echo ". \$HOME/.asdf/asdf.sh" >~/.oh-my-zsh/custom/asdf.zsh
+sed -i'.bak' 's/^plugins=.*$/plugins=(git mise vi-mode fzf docker docker-compose you-should-use)/' ~/.zshrc
+# https://mise.jdx.dev/getting-started.html
 echo "alias fixssh='eval \$(tmux showenv -s SSH_AUTH_SOCK)'" >~/.oh-my-zsh/custom/useful.zsh
 
 # git clone https://github.com/mokevnin/dotfiles ~/dotfiles || true
 
-# bash -c ". $HOME/.asdf/asdf.sh"
+# mise use --global ruby@latest
+# mise use --global nodejs@latest
 #
-# asdf plugin add nodejs || true
-# asdf plugin add php || true
-asdf plugin add ruby || true
-# asdf plugin add golang || true
-# asdf plugin add java || true
-
-# too slow
-
-# asdf plugin add lua https://github.com/Stratus3D/asdf-lua.git || true
-
-# asdf install lua latest
-# asdf global lua latest
-
-# asdf install nodejs latest
-# asdf global nodejs latest
-#
-asdf install ruby latest
-asdf global ruby latest
-#
-# asdf install php latest
-# asdf global php latest
-#
-# asdf install golang latest
-# asdf global golang latest
-#
-# asdf install java openjdk latest
-# asdf global java openjdk latest
-
-# if already existed
-
-# asdf update
-# asdf plugin update --all
-
-# export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
-# curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
-# echo ". \$HOME/.ghcup/env" > ~/.oh-my-zsh/custom/ghcup.zsh
 
 REPO="$HOME/.oh-my-zsh/custom/plugins/you-should-use"
 git clone https://github.com/MichaelAquilina/zsh-you-should-use.git "$REPO" || true

nvim/lazy-lock.json

@@ -1,66 +1,42 @@
 {
-  "LazyVim": { "branch": "main", "commit": "d1529f650fdd89cb620258bdeca5ed7b558420c7" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "7de878c943c130ff0378bf0e9b67cee8bb53731b" },
+  "LazyVim": { "branch": "main", "commit": "0bbce1775b7d6750d3c4d761f3ad1bcfb77fb805" },
   "auto-save.nvim": { "branch": "main", "commit": "29f793a3a7f98129387590269ffe3ad61ab5e509" },
-  "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" },
-  "bufferline.nvim": { "branch": "main", "commit": "9f0826ae6adfd836a23bf8a4910e3c07450211f4" },
-  "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
-  "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
+  "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" },
+  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
   "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "fzf-lua": { "branch": "main", "commit": "af6ecbd7f421e7894127a9e94b40e13172fbfb13" },
-  "gitsigns.nvim": { "branch": "main", "commit": "68114837e81ca16d06514c3a997c9102d1b25c15" },
-  "grug-far.nvim": { "branch": "main", "commit": "08f32182335754abf461dfb77b2c4e24bfe4d614" },
-  "inc-rename.nvim": { "branch": "main", "commit": "4d00cd5029e99f176128bc37ef245e2dd348191d" },
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
-  "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
-  "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
+  "fzf-lua": { "branch": "main", "commit": "b3e9303f6bccca52523cbe50901c2574a9528338" },
+  "gitsigns.nvim": { "branch": "main", "commit": "4baa13519c2168cc9a7890a3580c50226ed018fb" },
+  "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" },
+  "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" },
+  "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
+  "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
-  "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" },
-  "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" },
-  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
-  "neo-tree.nvim": { "branch": "main", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" },
+  "mini.ai": { "branch": "main", "commit": "6e01c0e5a15554852546fac9853960780ac52ed4" },
+  "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" },
+  "mini.pairs": { "branch": "main", "commit": "1a3e73649c0eaef2f6c48ce1e761c6f0a7c11918" },
   "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
   "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-ansible": { "branch": "main", "commit": "44dabdaa8a9193b7f564a8408ed6d7107705030a" },
-  "nvim-asciidoc-preview": { "branch": "main", "commit": "c6a5d952b8151c49da94328e55305c30ae078acf" },
-  "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
-  "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
-  "nvim-dap-ruby": { "branch": "main", "commit": "4176405d186a93ebec38a6344df124b1689cfcfd" },
-  "nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
-  "nvim-jdtls": { "branch": "master", "commit": "baae618ccc7b6045f7d9453ea0566d1333100740" },
-  "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
-  "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" },
-  "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
-  "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
-  "nvim-treesitter": { "branch": "master", "commit": "6df6e80417b58abe377c90f5e3f7fe94cf7dfc55" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" },
-  "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
+  "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
+  "nvim-lspconfig": { "branch": "master", "commit": "5dca9e1480ebe39f3f96f98a8196f8ee18fad207" },
+  "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
+  "nvim-treesitter": { "branch": "master", "commit": "da89532f036da9855f3105955696df36f583b919" },
+  "nvim-treesitter-endwise": { "branch": "master", "commit": "181d48399dd918bc816c399c3c6cbeac1a9991dc" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
   "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
   "other.nvim": { "branch": "main", "commit": "933aa489ad02f8f973269a565bfea16cc784cbbf" },
   "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
-  "render-markdown.nvim": { "branch": "main", "commit": "cfe57468a4ab44b745eddfbe90b63b9777ba7223" },
-  "snacks.nvim": { "branch": "main", "commit": "14e89401da348f5d14509fca164fb7bcec83e597" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "tokyonight.nvim": { "branch": "main", "commit": "7bb270adaa7692c2c33befc35f5567fc596a2504" },
-  "treesj": { "branch": "main", "commit": "ec234a9a13d61a7b95900abdb02fabaea1afd9f3" },
-  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
+  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
+  "snacks.nvim": { "branch": "main", "commit": "a17788539a5e66784535d0c973bdc08728f16c46" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" },
+  "treesj": { "branch": "main", "commit": "48c1a7539f376fd40ceb9cf12d697040fcf90649" },
+  "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" },
   "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" },
   "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" },
-  "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "95cbcf21ea7a5c8c025f387280c2e261b8cb3a89" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "65454e2011c029922c2c972d63f8bf04282de033" },
   "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
-  "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" },
-  "window-picker": { "branch": "main", "commit": "c959032b63f61c1d3cf747e5f67114a05efddee2" },
-  "yanky.nvim": { "branch": "main", "commit": "f9b905994cccf3c55f41af3a0a1f4c76c844e411" }
+  "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }
 }

nvim/lazyvim.json

@@ -1,31 +1,10 @@
 {
   "extras": [
-    "lazyvim.plugins.extras.coding.yanky",
-    "lazyvim.plugins.extras.dap.core",
-    "lazyvim.plugins.extras.editor.inc-rename",
-    "lazyvim.plugins.extras.editor.refactoring",
-    "lazyvim.plugins.extras.formatting.biome",
-    "lazyvim.plugins.extras.lang.ansible",
-    "lazyvim.plugins.extras.lang.docker",
-    "lazyvim.plugins.extras.lang.git",
-    "lazyvim.plugins.extras.lang.java",
-    "lazyvim.plugins.extras.lang.json",
-    "lazyvim.plugins.extras.lang.markdown",
-    "lazyvim.plugins.extras.lang.php",
-    "lazyvim.plugins.extras.lang.python",
-    "lazyvim.plugins.extras.lang.ruby",
-    "lazyvim.plugins.extras.lang.sql",
-    "lazyvim.plugins.extras.lang.terraform",
-    "lazyvim.plugins.extras.lang.toml",
-    "lazyvim.plugins.extras.lang.typescript",
-    "lazyvim.plugins.extras.lang.yaml",
-    "lazyvim.plugins.extras.ui.treesitter-context",
-    "lazyvim.plugins.extras.util.dot",
-    "lazyvim.plugins.extras.util.mini-hipatterns",
-    "lazyvim.plugins.extras.util.project"
+    "lazyvim.plugins.extras.linting.eslint"
   ],
+  "install_version": 8,
   "news": {
     "NEWS.md": "10960"
   },
-  "version": 7
+  "version": 8
 }

nvim/lua/config/keymaps.lua

@@ -2,15 +2,15 @@
 -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
 -- Add any additional keymaps here
 
--- local bind = vim.keymap.set
--- local opts = { silent = true, noremap = true }
+local bind = vim.keymap.set
+local opts = { silent = true, noremap = true }
 --
 -- -- for russian layout
--- bind("i", "<c-х>", "<C-[>", opts)
--- bind("n", "л", "gk", opts)
--- bind("n", "о", "gj", opts)
--- bind("i", "<C-г>", "<C-G>u<C-U>", opts)
--- bind("i", "<C-ц>", "<C-G>u<C-W>", opts)
+bind("i", "<c-х>", "<C-[>", opts)
+bind("n", "л", "gk", opts)
+bind("n", "о", "gj", opts)
+bind("i", "<C-г>", "<C-G>u<C-U>", opts)
+bind("i", "<C-ц>", "<C-G>u<C-W>", opts)
 --
 -- bind("n", "[c", function()
 --   require("treesitter-context").go_to_context()
@@ -21,3 +21,5 @@ vim.keymap.set("n", "<leader>]", "<Cmd>call append(line('.'),     repeat([''], v
 --
 vim.keymap.set("n", "<leader>fj", ":Neotree reveal<CR>", {})
 -- vim.keymap.set('n', '<leader>fa', ':Telescope telescope-alternate alternate_file<CR>', {})
+--
+bind("n", "<leader>o", "<cmd>:Other<CR>", opts)

nvim/lua/config/options.lua

@@ -8,7 +8,7 @@ vim.o.langmap =
 vim.o.relativenumber = false
 vim.g.autoformat = false
 -- vim.o.spell = false
--- vim.o.spelllang = "ru_ru,en_us"
+vim.o.spelllang = "ru_ru,en_us"
 -- vim.o.linebreak = true
 
 -- vim.g.root_spec = { "cwd" }

nvim/lua/plugins/fzf-lua.lua

@@ -2,8 +2,8 @@ return {
   {
     "ibhagwan/fzf-lua",
     opts = function(_, opts)
-      local config = require("fzf-lua.config")
-      config.defaults.keymap.fzf["ctrl-u"] = "unix-line-discard"
+      -- local config = require("fzf-lua.config")
+      -- config.defaults.keymap.fzf["ctrl-u"] = "unix-line-discard"
     end,
   },
 }

nvim/lua/plugins/lspconfig.lua

@@ -16,7 +16,12 @@ return {
         --   -- },
       },
       servers = {
-        cssls = {},
+        -- cssls = {},
+        -- https://github.com/Shopify/ruby-lsp/issues/2347
+        -- ruby_lsp = {
+        --   mason = false,
+        --   cmd = { vim.fn.expand("~/.asdf/shims/ruby-lsp") },
+        -- },
         -- kotlin_language_server = {},
         -- https://www.arthurkoziel.com/json-schemas-in-neovim/
         -- helm_ls = {},