Skip to content

Commit

Permalink
update configs
Browse files Browse the repository at this point in the history
Signed-off-by: Kirill Mokevnin <[email protected]>
  • Loading branch information
mokevnin committed Dec 13, 2024
1 parent f64d1a0 commit 4599869
Show file tree
Hide file tree
Showing 13 changed files with 154 additions and 184 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 neovim-ruby-host 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
Expand Down
8 changes: 4 additions & 4 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ darwin*)
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 viu chafa sox ast-grep asciidoctor
yes | brew install pandoc actionlint shellcheck checkmake lazygit
yes | brew install lua nodejs golang php composer
yes | brew install lua nodejs golang php composer luarocks
yes | brew install --cask temurin

# https://www.geekbits.io/how-to-install-nerd-fonts-on-mac/
brew tap homebrew/cask-fonts
brew install --cask font-hack-nerd-font
# https://gist.github.com/davidteren/898f2dcccd42d9f8680ec69a3a5d350e
brew install font-ubuntu-nerd-font
;;
*)
echo 'Everything is ready. Go to the next step'
Expand Down
Binary file removed nvim/files/lombok.jar
Binary file not shown.
118 changes: 56 additions & 62 deletions nvim/lazy-lock.json
Original file line number Diff line number Diff line change
@@ -1,73 +1,67 @@
{
"LazyVim": { "branch": "main", "commit": "dde4a9dcdf49719c67642d09847dbaf7f9c7a156" },
"SchemaStore.nvim": { "branch": "main", "commit": "3c488759f57090e0271282a80c9ec7cb86467310" },
"auto-save.nvim": { "branch": "main", "commit": "5fe9ab0c42f0457f2a973e814a6352b8eeb04730" },
"bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" },
"catppuccin": { "branch": "main", "commit": "67565cd353fa543fa30cb738570c2e4c87da3e9c" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"conform.nvim": { "branch": "master", "commit": "9a06e83527407a7600a2fe4e0d10adf432b6215e" },
"LazyVim": { "branch": "main", "commit": "9a0d14dcf5a6e91a54f1afc1378a85f09dec9ae8" },
"SchemaStore.nvim": { "branch": "main", "commit": "f8c2a0f5d51b800ea4625808e243d9e8f7c5e1df" },
"auto-save.nvim": { "branch": "main", "commit": "b58948445c43e6903987a9bb97c82e66fdcc0786" },
"blink.cmp": { "branch": "main", "commit": "ae5a4ce8f7e519e49de7ae6fcadd74547f820a52" },
"bufferline.nvim": { "branch": "main", "commit": "261a72b90d6db4ed8014f7bda976bcdc9dd7ce76" },
"catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
"conform.nvim": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" },
"ctrlsf.vim": { "branch": "master", "commit": "32236a8b376d9311dec9b5fe795ca99d32060b13" },
"dashboard-nvim": { "branch": "master", "commit": "b88c997f468a1bacb1e9b13ff3b567638caa06e6" },
"dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
"friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" },
"gitsigns.nvim": { "branch": "main", "commit": "0dc886637f9686b7cfd245a4726f93abeab19d4a" },
"headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
"lazy.nvim": { "branch": "main", "commit": "c501b429cf995c645454539b924aaefae45bb9eb" },
"lazydev.nvim": { "branch": "main", "commit": "6184ebbbc8045d70077659b7d30c705a588dc62f" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" },
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"fzf-lua": { "branch": "main", "commit": "2b35807945413b622c72af92eb93bb59d5c405f5" },
"gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
"gp.nvim": { "branch": "main", "commit": "2372d5323c6feaa2e9c19f7ccb537c615d878e18" },
"grug-far.nvim": { "branch": "main", "commit": "eadd3c4d7d3edc9d6b1ddc15e3c661d830dbf2b6" },
"lazy.nvim": { "branch": "main", "commit": "7c493713bc2cb392706866eeba53aaef6c8e9fc6" },
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "f5425eb1d0d794f0305d5eeebddabb74614683ff" },
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
"mini.ai": { "branch": "main", "commit": "9fef1097bca44616133cde6a6769e7aa07d12d7d" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
"nui.nvim": { "branch": "main", "commit": "322978c734866996274467de084a95e4f9b5e0b1" },
"nvim-ansible": { "branch": "main", "commit": "cb5d0cc79c1864b72d5ae40a926a1176b18f1b65" },
"nvim-asciidoc-preview": { "branch": "main", "commit": "7f8847767757478a9fe768a941c77b599fbc6cc9" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
"nvim-dap": { "branch": "master", "commit": "6f79b822997f2e8a789c6034e147d42bc6706770" },
"nvim-dap-go": { "branch": "main", "commit": "a0c5a2b991d7e9304a9a032cf177e22a4b0acda1" },
"nvim-dap-python": { "branch": "master", "commit": "ae0225d0d4a46e18e6057ab3701ef87bbbd6aaad" },
"nvim-dap-ui": { "branch": "master", "commit": "b7267003ba4dd860350be86f75b9d9ea287cedca" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
"nvim-jdtls": { "branch": "master", "commit": "40e8494e04c1bcd5dd6c0d0bc187d2d10965017d" },
"nvim-lint": { "branch": "master", "commit": "941fa1220a61797a51f3af9ec6b7d74c8c7367ce" },
"nvim-lspconfig": { "branch": "master", "commit": "f43135c38a37c588053ad5e209c7460f43f6340c" },
"nvim-nio": { "branch": "master", "commit": "7969e0a8ffabdf210edd7978ec954a47a737bbcc" },
"nvim-snippets": { "branch": "main", "commit": "5c978b3ba0c504dc9f94ca93d17029f26064d229" },
"nvim-spectre": { "branch": "master", "commit": "ec67d4b5370094b923dfcf6b09b39142f2964861" },
"nvim-surround": { "branch": "main", "commit": "687ea2f33955df0042bf228853a82696265e7e2d" },
"nvim-treesitter": { "branch": "master", "commit": "b967bbc27b564001c3d3b8ea93444cf6d0b21d23" },
"nvim-treesitter-context": { "branch": "master", "commit": "5efba33af0f39942e426340da7bc15d7dec16474" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "8e46de9241d3997927af12196bd8faa0ed08c29a" },
"mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
"mini.icons": { "branch": "main", "commit": "44c0160526f7ae17ca8e8eab9ab235d047fcf7a6" },
"neo-tree.nvim": { "branch": "main", "commit": "395ce4675a54828f9fd730d78f7910c114ab0a49" },
"nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
"nvim-ansible": { "branch": "main", "commit": "44dabdaa8a9193b7f564a8408ed6d7107705030a" },
"nvim-asciidoc-preview": { "branch": "main", "commit": "3ae4598a68bc966160a695cec127ee5cc06add02" },
"nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
"nvim-dap": { "branch": "master", "commit": "b08e05d7cff6024a9c29b64287d295db7c191450" },
"nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" },
"nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" },
"nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "76d80c3d171224315b61c006502a1e30c213a9ab" },
"nvim-jdtls": { "branch": "master", "commit": "ece818f909c6414cbad4e1fb240d87e003e10fda" },
"nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" },
"nvim-lspconfig": { "branch": "master", "commit": "ffe543e171792e4e7c42f1e73c4ab5c6fe71b861" },
"nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
"nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
"nvim-treesitter": { "branch": "master", "commit": "33d27173876499a0f037cb9edff90d583711b6ae" },
"nvim-treesitter-context": { "branch": "master", "commit": "8fd989b6b457a448606b4a2e51f9161700f609a7" },
"nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" },
"nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" },
"nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
"persistence.nvim": { "branch": "main", "commit": "95d03ad5450389ad7dc2a0fab14ebb3d46bc2c96" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
"refactoring.nvim": { "branch": "master", "commit": "66fea340c84f43df696fe6d9f2a90796fbe9c9cf" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" },
"nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
"persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
"render-markdown.nvim": { "branch": "main", "commit": "e41b0002fe4196825450ab5a6343300c40791d51" },
"snacks.nvim": { "branch": "main", "commit": "4ef74f09ff62d06f2e9ac88fac9919b6b3210507" },
"telescope-alternate": { "branch": "master", "commit": "2efa87d99122ee1abe8ada1a50304180a1802c34" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
"telescope-terraform-doc.nvim": { "branch": "main", "commit": "7272e5339f88af036887085d784504092a1ff5fd" },
"telescope-terraform-doc.nvim": { "branch": "main", "commit": "28efe1f3cb2ed4c83fa69000ae8afd2f85d62826" },
"telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" },
"telescope.nvim": { "branch": "master", "commit": "f2bfde705ac752c52544d5cfa8b0aee0a766c1ed" },
"todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" },
"tokyonight.nvim": { "branch": "main", "commit": "81c867c5f638597a82c82094dcb90ed42444dabc" },
"treesj": { "branch": "main", "commit": "f98deb33805485b56a8d44d1a27d16874af00d7f" },
"trouble.nvim": { "branch": "main", "commit": "2d8610a07033f2b367e71230ab128f8b89c2639d" },
"ts-comments.nvim": { "branch": "main", "commit": "c075b4ee00f6e111b44bf99a8cfd5a4cfce9258a" },
"venv-selector.nvim": { "branch": "regexp", "commit": "d946b1e86212f38ff9c42e3b622a8178bbc93461" },
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
"todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
"tokyonight.nvim": { "branch": "main", "commit": "b262293ef481b0d1f7a14c708ea7ca649672e200" },
"treesj": { "branch": "main", "commit": "94f6df623f2d15630b1b617abff39962024cb501" },
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
"ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" },
"venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" },
"vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" },
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" },
"vim-rails": { "branch": "master", "commit": "8972461e64c7c4bf049f2f86ea1bc571e8077b55" },
"vim-rails": { "branch": "master", "commit": "d3954dfe3946c9330dc91b4fbf79ccacb2c626c0" },
"vim-slim": { "branch": "master", "commit": "a0a57f75f20a03d5fa798484743e98f4af623926" },
"vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" },
"which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" },
"which-key.nvim": { "branch": "main", "commit": "4ab3bbe976e63b5390d3fca74a52a092a041cd30" },
"window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
"yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" }
}
"yanky.nvim": { "branch": "main", "commit": "f9b905994cccf3c55f41af3a0a1f4c76c844e411" }
}
4 changes: 2 additions & 2 deletions nvim/lazyvim.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

],
"news": {
"NEWS.md": "6077"
"NEWS.md": "10960"
},
"version": 6
"version": 7
}
6 changes: 3 additions & 3 deletions nvim/lua/config/autocmds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
vim.cmd([[
augroup myfiletypes
autocmd!
autocmd FileType ruby,lua,eruby,yaml,javascript,typescript,html,css set ai sw=2 sts=2 et
autocmd FileType java,kotlin,xml,php set ai sw=4 sts=4 et
autocmd FileType asciidoc setlocal wrap
" autocmd FileType ruby,lua,eruby,yaml,javascript,typescript,html,css set ai sw=2 sts=2 et
" autocmd FileType java,kotlin,xml,php set ai sw=4 sts=4 et
" autocmd FileType asciidoc setlocal wrap
augroup END
]])
1 change: 1 addition & 0 deletions nvim/lua/config/options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ vim.o.langmap =
"ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNOPQRSTUVWXYZ,фисвуапршолдьтщзйкыегмцчня;abcdefghijklmnopqrstuvwxyz"

vim.o.relativenumber = false
vim.o.spell = false
vim.o.spelllang = "ru_ru,en_us"
vim.o.linebreak = true
vim.g.autoformat = false
Expand Down
11 changes: 0 additions & 11 deletions nvim/lua/plugins/java.lua

This file was deleted.

1 change: 1 addition & 0 deletions nvim/lua/plugins/lspconfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ return {
},
servers = {
ruby_lsp = {},
tsp_server = {},
-- kotlin_language_server = {},
-- https://www.arthurkoziel.com/json-schemas-in-neovim/
-- helm_ls = {},
Expand Down
27 changes: 0 additions & 27 deletions nvim/lua/plugins/none-ls.lua

This file was deleted.

12 changes: 12 additions & 0 deletions nvim/lua/plugins/others.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,16 @@ return {
})
end,
},
-- lazy.nvim
{
"robitx/gp.nvim",
config = function()
local conf = {
-- For customization, refer to Install > Configuration in the Documentation/Readme
}
require("gp").setup(conf)

-- Setup shortcuts here (see Usage > Shortcuts in the Documentation/Readme)
end,
},
}
142 changes: 71 additions & 71 deletions nvim/lua/plugins/telescope.lua
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
return {
{
"nvim-telescope/telescope.nvim",
opts = {
defaults = {
-- sorting_strategy = "ascending",
mappings = {
-- restore default behavior
i = {
["<C-u>"] = false,
["<C-d>"] = false,
},
n = {},
},
},
-- pickers = {
-- buffers = {
-- ignore_current_buffer = true,
-- sort_mru = true,
-- },
-- },
},
},
{
"otavioschwanck/telescope-alternate",
dependencies = { "nvim-telescope/telescope.nvim" },
lazy = true,
opts = {
mappings = {
{
"app/Http/Controllers/(.*)Controller.php",
{
{ "tests/Feature/[1]Test.php", "Test" },
{ "resources/js/Pages/[1]/*.tsx", "View" },
},
},
{
"app/Models/(.*).php",
{
{ "tests/Unit/[1]Test.php", "Test" },
{ "database/factories/[1]Factory.php", "Factory" },
},
},
{
"database/factories/(.*)Factory.php",
{
-- { "tests/Models/[1]Test.php", "Test" },
{ "app/Models/[1].php", "Model" },
},
},
{
"tests/Feature/(.*)Test.php",
{
{ "app/Http/Controllers/[1]Controller.php", "Controller" },
},
},
{
"tests/Unit/(.*)Test.php",
{
{ "app/Models/[1].php", "Model" },
},
},
{
"resources/js/Pages/(.*)/.*.tsx",
{
{ "app/Http/Controllers/[1]Controller.php", "Controller" },
},
},
},
},
},

-- {
-- "nvim-telescope/telescope.nvim",
-- opts = {
-- defaults = {
-- -- sorting_strategy = "ascending",
-- mappings = {
-- -- restore default behavior
-- i = {
-- ["<C-u>"] = false,
-- ["<C-d>"] = false,
-- },
-- n = {},
-- },
-- },
-- -- pickers = {
-- -- buffers = {
-- -- ignore_current_buffer = true,
-- -- sort_mru = true,
-- -- },
-- -- },
-- },
-- },
-- {
-- "otavioschwanck/telescope-alternate",
-- dependencies = { "nvim-telescope/telescope.nvim" },
-- lazy = true,
-- opts = {
-- mappings = {
-- {
-- "app/Http/Controllers/(.*)Controller.php",
-- {
-- { "tests/Feature/[1]Test.php", "Test" },
-- { "resources/js/Pages/[1]/*.tsx", "View" },
-- },
-- },
-- {
-- "app/Models/(.*).php",
-- {
-- { "tests/Unit/[1]Test.php", "Test" },
-- { "database/factories/[1]Factory.php", "Factory" },
-- },
-- },
-- {
-- "database/factories/(.*)Factory.php",
-- {
-- -- { "tests/Models/[1]Test.php", "Test" },
-- { "app/Models/[1].php", "Model" },
-- },
-- },
-- {
-- "tests/Feature/(.*)Test.php",
-- {
-- { "app/Http/Controllers/[1]Controller.php", "Controller" },
-- },
-- },
-- {
-- "tests/Unit/(.*)Test.php",
-- {
-- { "app/Models/[1].php", "Model" },
-- },
-- },
-- {
-- "resources/js/Pages/(.*)/.*.tsx",
-- {
-- { "app/Http/Controllers/[1]Controller.php", "Controller" },
-- },
-- },
-- },
-- },
-- },
--
}
Loading

0 comments on commit 4599869

Please sign in to comment.