aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mind/data/20221213094715-nvim.md43
-rw-r--r--.mind/state.json1
-rw-r--r--init.lua6
-rw-r--r--lazy-lock.json116
-rw-r--r--lua/alpha/animations.lua50
-rw-r--r--lua/alpha/completition/init.lua9
-rw-r--r--lua/alpha/globals.lua4
-rw-r--r--lua/alpha/lsp/attach.lua4
-rw-r--r--lua/alpha/lsp/init.lua6
-rw-r--r--lua/alpha/lsp/mason.lua7
-rw-r--r--lua/alpha/lsp/null-ls.lua23
-rw-r--r--lua/alpha/lsp/servers.lua32
-rw-r--r--lua/alpha/lsp/tools.lua6
-rw-r--r--lua/alpha/php/servers.lua3
-rw-r--r--lua/alpha/select_to_quickfix.lua53
-rw-r--r--lua/alpha/snips/ft/cucumber.lua7
-rw-r--r--lua/alpha/telescope/init.lua14
-rw-r--r--lua/alpha/telescope/my_actions.lua (renamed from lua/alpha/telescope/actions.lua)0
-rw-r--r--lua/alpha/telescope/setup.lua52
-rw-r--r--lua/config/autocmds.lua2
-rw-r--r--lua/config/keymaps.lua21
-rw-r--r--lua/config/options.lua9
-rw-r--r--lua/plugins/animation.lua11
-rw-r--r--lua/plugins/colorscheme.lua19
-rw-r--r--lua/plugins/completition.lua14
-rw-r--r--lua/plugins/image.lua12
-rw-r--r--lua/plugins/laravel.lua11
-rw-r--r--lua/plugins/lsp.lua2
-rw-r--r--lua/plugins/lualine.lua7
-rw-r--r--lua/plugins/neodev.lua4
-rw-r--r--lua/plugins/neorg.lua21
-rw-r--r--lua/plugins/noice.lua90
-rw-r--r--lua/plugins/orgmode.lua7
-rw-r--r--lua/plugins/phpactor.lua47
-rw-r--r--lua/plugins/smooth-cursor.lua4
-rw-r--r--lua/plugins/test.lua2
-rw-r--r--lua/plugins/transparent.lua5
-rw-r--r--lua/plugins/treesitter.lua21
-rw-r--r--lua/plugins/trouble.lua1
-rw-r--r--lua/plugins/twilight.lua5
-rw-r--r--lua/plugins/vimwiki.lua1
-rw-r--r--spell/es.latin1.splbin0 -> 640324 bytes
-rw-r--r--spell/es.latin1.sugbin0 -> 1912377 bytes
-rw-r--r--spell/es.utf-8.add4
-rw-r--r--spell/es.utf-8.add.splbin0 -> 63 bytes
-rw-r--r--spell/es.utf-8.splbin0 -> 601018 bytes
-rw-r--r--spell/es.utf-8.sugbin0 -> 1912377 bytes
47 files changed, 575 insertions, 181 deletions
diff --git a/.mind/data/20221213094715-nvim.md b/.mind/data/20221213094715-nvim.md
deleted file mode 100644
index 2c6099a..0000000
--- a/.mind/data/20221213094715-nvim.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# nvim
-
-Mi local config.
-
-I would like to have a configuration split into modules more oriented by language and things.
-
-I was tinking of having a languages folder example
-
-- PHP
-- Rust
-- Javascript
-- Go
-
-on each one have the configuration necessary
-
-related to
-
-LSP
-DAP
-TreeSitter
-Plugins
-
-Have a module for Themeing.
-Visual changes
-Theme, status line, UI elements
-
-`init.lua`
-define which modules are desire
-
-- lua
- -
-
-Advantages on using lsp-zero ??
-[lsp-zero](https://github.com/VonHeikemen/lsp-zero.nvim)
-
-
-differente approaches.
-
-Language
- - LSP
-
-LSP
- - Language
diff --git a/.mind/state.json b/.mind/state.json
deleted file mode 100644
index 5e4e06f..0000000
--- a/.mind/state.json
+++ /dev/null
@@ -1 +0,0 @@
-{"data":".mind\/data\/20221213094715-nvim.md","icon":" ","type":1,"uid":"20221213094708","contents":[{"text":"nvim"}]} \ No newline at end of file
diff --git a/init.lua b/init.lua
index f7baee1..7255d55 100644
--- a/init.lua
+++ b/init.lua
@@ -1,8 +1,2 @@
--- TODO: remove once 0.9 is more widly available
-if vim.fn.has "nvim-0.9.0" ~= 1 then
- vim.treesitter.query.get = vim.treesitter.get_query
- vim.treesitter.query.set = vim.treesitter.set_query
-end
-
require "config"
require "alpha.globals"
diff --git a/lazy-lock.json b/lazy-lock.json
index 0ed48e2..e0c4bd6 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,86 +1,86 @@
{
- "Comment.nvim": { "branch": "master", "commit": "a89339ffbee677ab0521a483b6dac7e2e67c907e" },
+ "Comment.nvim": { "branch": "master", "commit": "176e85eeb63f1a5970d6b88f1725039d85ca0055" },
"LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" },
- "NeoColumn.nvim": { "branch": "main", "commit": "8df55a19842027cd524e4eda448c64c21cf49f5a" },
+ "NeoColumn.nvim": { "branch": "main", "commit": "456bd054b65a5a8bb8a8cb4b3afc5bbbedcb0994" },
"SmoothCursor.nvim": { "branch": "main", "commit": "b61173fb107455f18099715b88d86002579f2736" },
- "catppuccin": { "branch": "main", "commit": "dd176757cc745f71bd54c472a9f58d5f8a54661d" },
+ "animation.nvim": { "branch": "main", "commit": "fb77091ab72ec9971aee0562e7081182527aaa6a" },
+ "baleia.nvim": { "branch": "main", "commit": "00bb4af31c8c3865b735d40ebefa6c3f07b2dd16" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
- "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" },
+ "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-dap": { "branch": "master", "commit": "d16f14a210cd28988b97ca8339d504533b7e09a4" },
"cmp-git": { "branch": "main", "commit": "169202582f900b0e189eed5153b291383bfbba47" },
- "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
- "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+ "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
- "color-picker.nvim": { "branch": "master", "commit": "e23de39cff3babdc97c39ae79bb68fedf1a1fe00" },
- "composer.nvim": { "branch": "main", "commit": "ec9537969adc7fc128cfe9c3a9925850455896c8" },
- "dressing.nvim": { "branch": "master", "commit": "f5d7fa1fa5ce6bcebc8f07922f39b1eda4d01e37" },
- "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
- "fzf": { "branch": "master", "commit": "65dd2bb42947d4ede31d160214f3a4c6fdc619e1" },
- "fzf.vim": { "branch": "master", "commit": "dc71692255b62d1f67dc55c8e51ab1aa467b1d46" },
+ "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" },
+ "copilot-cmp": { "branch": "master", "commit": "c2cdb3c0f5078b0619055af192295830a7987790" },
+ "copilot.lua": { "branch": "master", "commit": "e48bd7020a98be217d85c006a298656294fd6210" },
+ "dressing.nvim": { "branch": "master", "commit": "e6eff7a5a950a853c3903d906dbcea03f778db5f" },
+ "fzf": { "branch": "master", "commit": "01302d097c39c3429de65424c6adb75fcac82187" },
+ "fzf.vim": { "branch": "master", "commit": "1dcdb21db618055134cd611f4f5918f6d00a5df0" },
"git-worktree.nvim": { "branch": "master", "commit": "d7f4e2584e81670154f07ca9fa5dd791d9c1b458" },
- "gitsigns.nvim": { "branch": "main", "commit": "7dfe4be94b4f84a9931098f0f0f618d055e50bd5" },
- "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" },
+ "github-nvim-theme": { "branch": "main", "commit": "e28eb579079c6abeb9c21bd85bb9a04379ac64b4" },
+ "gitsigns.nvim": { "branch": "main", "commit": "a36bc3360d584d39b4fb076d855c4180842d4444" },
+ "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
"hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
- "icon-picker.nvim": { "branch": "master", "commit": "e1add1aef33e296fe8c5143df612ab7ce528a094" },
- "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
- "laravel.nvim": { "branch": "main", "commit": "53b7a1a39f695ba122bfa5aebfe6aa841109341b" },
- "lazy.nvim": { "branch": "main", "commit": "903f0fe542fc35b74f3c09494f9c175346dfa76d" },
- "lsp-inlayhints.nvim": { "branch": "main", "commit": "62c7b8dd8ac9933b071912fe3c789ef2cb704672" },
- "lspkind-nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" },
- "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
+ "icon-picker.nvim": { "branch": "master", "commit": "e6dca182518eeb7a51470c13605a5bce08a816e4" },
+ "image.nvim": { "branch": "main", "commit": "dcabdf47b0b974b61d08eeafa2c519927e37cf27" },
+ "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" },
+ "lazy.nvim": { "branch": "main", "commit": "f8611632d0f9c6818e8eb54f9bcd1dad122b5a7f" },
+ "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
+ "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
"markdown-preview.nvim": { "branch": "main", "commit": "cc05a30393e2bf9f12e2d59fc35a1aa928ed1727" },
- "mason-lspconfig.nvim": { "branch": "main", "commit": "22d17951315e22e602912c9629b97d183fb90d16" },
- "mason-tool-installer.nvim": { "branch": "main", "commit": "a6c4d7df448a78b0a05fd2065bef11ed52bee51c" },
- "mason.nvim": { "branch": "main", "commit": "9a68a4bd997b72cee4132459e0fd99eea0cdc627" },
- "neogen": { "branch": "main", "commit": "9c17225aac94bdbf93baf16e1b2d2c6dcffb0901" },
- "null-ls.nvim": { "branch": "main", "commit": "920947793ce6e59616644cb4766d442121508bf3" },
- "nvim-autopairs": { "branch": "master", "commit": "7566a86f44bb72ba2b1a609f528a27d93241502d" },
- "nvim-cmp": { "branch": "main", "commit": "e28fb7a730b1bd425fdddfdbd3d36bb84bd77611" },
+ "mason-lspconfig.nvim": { "branch": "main", "commit": "4f1c72767bec31397d59554f84096909b2887195" },
+ "mason-tool-installer.nvim": { "branch": "main", "commit": "49e3efe743d846d80da5a4757d4f7e563a96cb84" },
+ "mason.nvim": { "branch": "main", "commit": "de5959dfc11688be554a53ac95d14bded9eaca4c" },
+ "middleclass": { "branch": "master", "commit": "9fab4d5bca67262614960960ca35c4740eb2be2c" },
+ "neodev.nvim": { "branch": "main", "commit": "a2b1d8fb9fa4daa35d3fd9123bccccccbd4a3520" },
+ "neogen": { "branch": "main", "commit": "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0" },
+ "neorg": { "branch": "main", "commit": "6fece1546d051a5f2a2d932d5978beec1ef920ab" },
+ "noice.nvim": { "branch": "main", "commit": "6c87c1d11c38180fb72bf8f45518a0a3e081afc1" },
+ "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" },
+ "null-ls.nvim": { "branch": "main", "commit": "608547dcd1381ae791120674e105f5ebae25b37f" },
+ "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" },
+ "nvim-cmp": { "branch": "main", "commit": "2743dd989e9b932e1b4813a4927d7b84272a14e2" },
"nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
- "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" },
- "nvim-dap-go": { "branch": "main", "commit": "b4ded7de579b4e2a85c203388233b54bf1028816" },
- "nvim-dap-ui": { "branch": "master", "commit": "286f682f366fbc652b38dff893569374e9433dd3" },
- "nvim-dap-virtual-text": { "branch": "master", "commit": "9dc45a6eb33871f4c5cb2ba08fa307467657471e" },
+ "nvim-dap": { "branch": "master", "commit": "bb1ddce6cd951ef3c1319e4fd8596131113163c3" },
+ "nvim-dap-go": { "branch": "main", "commit": "cdf604a5703838f65fdee7c198f6cb59b563ef6f" },
+ "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" },
+ "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
"nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" },
- "nvim-lspconfig": { "branch": "master", "commit": "710c45bd13928c1f37ef0a714fd49b75f00d7d5e" },
- "nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" },
+ "nvim-lspconfig": { "branch": "master", "commit": "0011c435282f043a018e23393cae06ed926c3f4a" },
+ "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
"nvim-projectconfig": { "branch": "master", "commit": "05fd34831e170db269d1b84597615bcdcdde930e" },
- "nvim-spectre": { "branch": "master", "commit": "6e5ce371f93625c7dc43f5e2647d3647f2ea15e2" },
- "nvim-transparent": { "branch": "main", "commit": "f09966923f7e329ceda9d90fe0b7e8042b6bdf31" },
- "nvim-treesitter": { "branch": "master", "commit": "87faf372eb517077cc600c4e653e4fb3252d02ac" },
- "nvim-treesitter-refactor": { "branch": "master", "commit": "65ad2eca822dfaec2a3603119ec3cc8826a7859e" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "8673926519ea61069f9c1366d1ad1949316d250e" },
- "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
- "orgmode": { "branch": "master", "commit": "77b4cc8994cf7944e89b6df9e193e5256a454418" },
- "php-code-actions.nvim": { "branch": "main", "commit": "31831cb7c3227ac00ddc7590b31f11148ff4a81c" },
- "phpactor.nvim": { "branch": "main", "commit": "0aa4ad09c2024e24d630c0ec616d65396caa39e0" },
+ "nvim-spectre": { "branch": "master", "commit": "dc3f0bd41e09148924ef04a4746cb708539d08db" },
+ "nvim-transparent": { "branch": "main", "commit": "c35b1182ab8d474a205a4fdd4b6a9ca1b25ef0fa" },
+ "nvim-treesitter": { "branch": "master", "commit": "c42a8f96d37be82cf32934c4351150d7736f93f5" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" },
+ "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" },
"playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" },
- "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
+ "plenary.nvim": { "branch": "master", "commit": "102c02903c74b93c705406bf362049383abc87c8" },
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
- "refactoring.nvim": { "branch": "master", "commit": "e7c40818b2995016ede93c5620055206b1aba44f" },
- "smart-splits.nvim": { "branch": "master", "commit": "e1dbc83510616df73a645f616431cfe1348898f8" },
+ "refactoring.nvim": { "branch": "master", "commit": "859289acc0fda13bf42834dbeef10b8c1148d444" },
+ "smart-splits.nvim": { "branch": "master", "commit": "7aad6019dee974a01333523a5b8e122b7e7da454" },
"telescope-dap.nvim": { "branch": "master", "commit": "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c" },
- "telescope-file-browser.nvim": { "branch": "master", "commit": "e0fcb12702ad0d2873544a31730f9aaef04fd032" },
- "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
+ "telescope-file-browser.nvim": { "branch": "master", "commit": "e03ff55962417b69c85ef41424079bb0580546ba" },
+ "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
"telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
- "telescope.nvim": { "branch": "master", "commit": "f2645c13205abb9ee3dbcee68416645c69b863c8" },
- "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
- "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" },
+ "telescope.nvim": { "branch": "master", "commit": "0e0600908d1ad5ac4992fa0ab578e23e9d9d6f37" },
+ "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
+ "twilight.nvim": { "branch": "main", "commit": "a4843e6e67092a1e6fa9666f02bf0ab59174c1df" },
"vim-blade": { "branch": "master", "commit": "9534101808cc320eef003129a40cab04b026a20c" },
- "vim-dadbod": { "branch": "master", "commit": "3f57c0cd41523423fd781422dfc833820095a3e8" },
- "vim-dadbod-completion": { "branch": "master", "commit": "e71eb6140556c5ced80de6299a1fdfe22bd3c1b1" },
- "vim-dadbod-ui": { "branch": "master", "commit": "4c306bef457ebfdbe71c76b49672d48ef310ddd3" },
+ "vim-dadbod": { "branch": "master", "commit": "7d80bbd11c407a09e0f7b869c38f3dec3902805f" },
+ "vim-dadbod-completion": { "branch": "master", "commit": "fc7321a17f4c55db11fae89a884ddf4724020bae" },
+ "vim-dadbod-ui": { "branch": "master", "commit": "200aebf70e6fc4b0eb1d3ecf0d57028e198d8dc6" },
"vim-dispatch": { "branch": "master", "commit": "6cc2691576f97d43f8751664d1a1a908b99927e5" },
"vim-dotenv": { "branch": "master", "commit": "5c51cfcf8d87280d6414e03cd6b253eb70ecb800" },
"vim-easy-align": { "branch": "master", "commit": "12dd6316974f71ce333e360c0260b4e1f81169c3" },
- "vim-eunuch": { "branch": "master", "commit": "291ef1f8c8996ca7715df1032a35a27b12d7b5cf" },
- "vim-fugitive": { "branch": "master", "commit": "e6651a79facf5cc2b7c554fdc19eb8a9fe89602c" },
+ "vim-eunuch": { "branch": "master", "commit": "67f3dd32b4dcd1c427085f42ff5f29c7adc645c6" },
+ "vim-fugitive": { "branch": "master", "commit": "43f18ab9155c853a84ded560c6104e6300ad41da" },
"vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
"vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
- "vim-test": { "branch": "master", "commit": "5af7aa2a07c70f730b03c893821366961b108cf2" },
- "vimwiki": { "branch": "dev", "commit": "7a48268d24614e74f8187856ade54cf03134e9d9" }
+ "vim-test": { "branch": "master", "commit": "6fbfbfc434debf3d3e8676fad5041450615f2d5d" }
} \ No newline at end of file
diff --git a/lua/alpha/animations.lua b/lua/alpha/animations.lua
new file mode 100644
index 0000000..c0b7a6c
--- /dev/null
+++ b/lua/alpha/animations.lua
@@ -0,0 +1,50 @@
+local redraw_buffer = function()
+ local Animation = require "animation"
+ local fps = 45 -- frames per second
+ local easing = require "animation.easing"
+
+ local buffer = 0
+ local len = 0
+ local place_holder = {}
+
+ local lines = vim.api.nvim_buf_get_lines(buffer, 0, -1, true)
+
+ for _, line in ipairs(lines) do
+ len = len + string.len(line)
+ table.insert(place_holder, "")
+ end
+
+ vim.api.nvim_buf_set_lines(buffer, 0, #lines, true, place_holder)
+
+ local duration = math.ceil(len / fps * 1000)
+
+ local i = 1
+ local line_nr = 1
+ local insertLine = ""
+
+ local function callback()
+ if lines[line_nr] == nil then
+ return true
+ end
+ local char = string.sub(lines[line_nr], i, i)
+ if char == nil then
+ return true
+ end
+ insertLine = insertLine .. char
+ i = i + 1
+ vim.api.nvim_buf_set_lines(buffer, line_nr - 1, line_nr, true, { insertLine })
+
+ if insertLine == lines[line_nr] then
+ i = 1
+ line_nr = line_nr + 1
+ insertLine = ""
+ end
+ end
+
+ local animation = Animation(duration, fps, easing.line, callback)
+ animation:run()
+end
+
+return {
+ redraw_buffer = redraw_buffer,
+}
diff --git a/lua/alpha/completition/init.lua b/lua/alpha/completition/init.lua
index 02c9978..35ba27e 100644
--- a/lua/alpha/completition/init.lua
+++ b/lua/alpha/completition/init.lua
@@ -40,7 +40,7 @@ cmp.setup {
{ name = "nvim_lsp" },
{ name = "path" },
{ name = "luasnip" },
- { name = "nvim_lsp_signature_help" },
+ { name = "copilot", group_index = 2 },
{
name = "buffer",
keyword_length = 4,
@@ -49,7 +49,7 @@ cmp.setup {
local bufs = {}
for _, win in ipairs(vim.api.nvim_list_wins()) do
local bufnr = vim.api.nvim_win_get_buf(win)
- if vim.api.nvim_buf_get_option(bufnr, 'buftype') ~= 'terminal' then
+ if vim.api.nvim_buf_get_option(bufnr, "buftype") ~= "terminal" then
bufs[bufnr] = true
end
end
@@ -70,10 +70,11 @@ cmp.setup {
with_text = true,
menu = {
buffer = "[buf]",
- nvim_lsp = "[LSP]",
+ nvim_lsp = "[ ]",
nvim_lua = "[api]",
path = "[path]",
luasnip = "[snip]",
+ copilot = "[ﮧ ]",
["vim-dadbod-completion"] = "[DB]",
},
},
@@ -94,6 +95,8 @@ cmp.setup {
},
}
+vim.api.nvim_set_hl(0, "CmpItemKindCopilot", {fg ="#6CC644"})
+
-- Set configuration for specific filetype.
cmp.setup.filetype("gitcommit", {
sources = cmp.config.sources({
diff --git a/lua/alpha/globals.lua b/lua/alpha/globals.lua
index b575c0c..e445e72 100644
--- a/lua/alpha/globals.lua
+++ b/lua/alpha/globals.lua
@@ -13,11 +13,11 @@ dump = function(...)
return unpack(args)
end
-RELOAD = function(...)
+Reload = function(...)
return require("plenary.reload").reload_module(...)
end
R = function(name)
- RELOAD(name)
+ Reload(name)
return require(name)
end
diff --git a/lua/alpha/lsp/attach.lua b/lua/alpha/lsp/attach.lua
index 45ce904..bf5b645 100644
--- a/lua/alpha/lsp/attach.lua
+++ b/lua/alpha/lsp/attach.lua
@@ -29,6 +29,10 @@ return function(client, bufnr)
vim.bo.omnifunc = "v:lua.vim.lsp.omnifunc"
+ if client.server_capabilities.inlayHintProvider then
+ vim.lsp.inlay_hint(bufnr, true)
+ end
+
-- Attach any filetype specific options to the client
filetype_attach[filetype](client, bufnr)
end
diff --git a/lua/alpha/lsp/init.lua b/lua/alpha/lsp/init.lua
index d280e53..03bd61d 100644
--- a/lua/alpha/lsp/init.lua
+++ b/lua/alpha/lsp/init.lua
@@ -1,14 +1,12 @@
-- LSP configuration
--- install servers and tools
-require "alpha.lsp.mason"
-
local lspconfig = require "lspconfig"
local servers = require "alpha.lsp.servers"
-
for server, setup in pairs(servers) do
lspconfig[server].setup(setup())
end
+-- install servers and tools
+require "alpha.lsp.mason"
require "alpha.lsp.null-ls"
diff --git a/lua/alpha/lsp/mason.lua b/lua/alpha/lsp/mason.lua
index e164562..161a205 100644
--- a/lua/alpha/lsp/mason.lua
+++ b/lua/alpha/lsp/mason.lua
@@ -7,9 +7,8 @@ mason.setup()
local mason_servers = {}
--- TODO: can be improve checking the setup function to see if sets the cmd
for server, _ in pairs(servers) do
- local cmd = lspconfig[server].document_config.default_config.cmd[1]
+ local cmd = lspconfig[server].cmd[1]
if vim.fn.executable(cmd) == 0 then
table.insert(mason_servers, server)
end
@@ -21,5 +20,7 @@ mason_lspconfig.setup {
-- filter the list for the ones not globally installed
require("mason-tool-installer").setup {
- ensure_installed = require "alpha.lsp.tools",
+ ensure_installed = vim.tbl_filter(function (tool)
+ return vim.fn.executable(tool) == 0
+ end, require "alpha.lsp.tools"),
}
diff --git a/lua/alpha/lsp/null-ls.lua b/lua/alpha/lsp/null-ls.lua
index be3d4e9..3428ec6 100644
--- a/lua/alpha/lsp/null-ls.lua
+++ b/lua/alpha/lsp/null-ls.lua
@@ -11,16 +11,18 @@ null_ls.setup {
null_ls.builtins.diagnostics.luacheck,
null_ls.builtins.formatting.stylua,
+ null_ls.builtins.diagnostics.yamllint,
+
-- php_actions.getter_setter,
-- php_actions.file_creator,
null_ls.builtins.diagnostics.phpstan.with {
to_temp_file = false,
method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
- command = "./bin/phpstan",
- condition = function ()
- return vim.fn.findfile("bin/phpstan") ~= ""
- end
+ -- command = "./bin/phpstan",
+ -- condition = function ()
+ -- return vim.fn.findfile("bin/phpstan") ~= ""
+ -- end
},
null_ls.builtins.diagnostics.phpcs.with {
method = null_ls.methods.DIAGNOSTICS_ON_SAVE,
@@ -36,3 +38,16 @@ vim.keymap.set({ "n", "v" }, "<leader>vca", vim.lsp.buf.code_action, {desc = "LS
vim.keymap.set("n", "<leader>vf", function()
return vim.lsp.buf.format { async = true }
end, {desc = "LSP (null ls) Format file"})
+
+-- function to toogle and possible restart it
+vim.api.nvim_create_user_command("NullLsToggle", function()
+ local sources = vim.tbl_map(function(el)
+ return el.name
+ end, null_ls.get_sources())
+ vim.ui.select(sources, {}, function(selected)
+ if not selected then
+ return
+ end
+ null_ls.toggle(selected)
+ end)
+end, {})
diff --git a/lua/alpha/lsp/servers.lua b/lua/alpha/lsp/servers.lua
index f09f523..d2233a1 100644
--- a/lua/alpha/lsp/servers.lua
+++ b/lua/alpha/lsp/servers.lua
@@ -28,8 +28,28 @@ return {
flags = lsp_flags,
}
end,
- ["html"] = default,
- ["jsonls"] = default,
+ ["html"] = function ()
+ local config = {
+ on_attach = lsp_attach,
+ flags = lsp_flags,
+ }
+ if vim.fn.executable("html-languageserver") == 1 then
+ config.cmd = { "html-languageserver", "--stdio" }
+ end
+
+ return config
+ end,
+ ["jsonls"] = function ()
+ local config = {
+ on_attach = lsp_attach,
+ flags = lsp_flags,
+ }
+ if vim.fn.executable("json-languageserver") == 1 then
+ config.cmd = { "json-languageserver", "--stdio" }
+ end
+
+ return config
+ end,
["lua_ls"] = function()
return {
on_attach = lsp_attach,
@@ -51,7 +71,7 @@ return {
},
hint = {
enable = true,
- }
+ },
},
},
}
@@ -63,8 +83,14 @@ return {
on_attach = lsp_attach,
flags = lsp_flags,
filetypes = { "php", "cucumber" },
+ init_options = {
+ ["language_server_worse_reflection.inlay_hints.enable"] = true,
+ -- ["language_server_worse_reflection.inlay_hints.types"] = true,
+ -- ["language_server_worse_reflection.inlay_hints.params"] = true,
+ },
}
end,
+ ["pyright"] = default,
["rust_analyzer"] = function()
return {
on_attach = lsp_attach,
diff --git a/lua/alpha/lsp/tools.lua b/lua/alpha/lsp/tools.lua
index 4eb40b3..7919521 100644
--- a/lua/alpha/lsp/tools.lua
+++ b/lua/alpha/lsp/tools.lua
@@ -1,6 +1,8 @@
return {
+ "codelldb",
"go-debug-adapter",
- "php-debug-adapter",
"js-debug-adapter",
- "codelldb",
+ "php-debug-adapter",
+ "phpcs",
+ "phpstan",
}
diff --git a/lua/alpha/php/servers.lua b/lua/alpha/php/servers.lua
index ba3680c..9450152 100644
--- a/lua/alpha/php/servers.lua
+++ b/lua/alpha/php/servers.lua
@@ -30,8 +30,7 @@ local config = require("lspconfig").phpactor
config.root_dir = vim.fn.getcwd()
local client_id = vim.lsp.start(config)
-local client = vim.lsp.get_client_by_id(client_id)
-P(client)
+vim.lsp.get_client_by_id(client_id)
-- use client.request or request_sync
-- look for the direct of the symbol
return {
diff --git a/lua/alpha/select_to_quickfix.lua b/lua/alpha/select_to_quickfix.lua
new file mode 100644
index 0000000..ebd1561
--- /dev/null
+++ b/lua/alpha/select_to_quickfix.lua
@@ -0,0 +1,53 @@
+local api = vim.api
+
+local function create_quickfix_entry(selection)
+ local filename, linenumber = selection:match "([^:]+):(%d+)"
+
+ return {
+ filename = vim.fn.getcwd() .. "/" .. filename,
+ lnum = tonumber(linenumber),
+ col = 1,
+ text = filename,
+ }
+end
+
+local function add_selections_to_quickfix(selections)
+ local quickfix_list = {}
+
+ for _, selection in ipairs(selections) do
+ local entry = create_quickfix_entry(selection)
+ table.insert(quickfix_list, entry)
+ end
+
+ vim.fn.setqflist(quickfix_list, "r")
+end
+
+local function get_selections()
+ local _, end_line, _, _ = unpack(vim.fn.getpos "'>")
+ local _, start_line, _, _ = unpack(vim.fn.getpos "'<")
+ local lines = api.nvim_buf_get_lines(0, start_line - 1, end_line, false)
+
+ local selections = {}
+ for _, line in ipairs(lines) do
+ for selection in line:gmatch "%S+" do
+ table.insert(selections, selection)
+