Skip to content

Commit 9ada0fe

Browse files
AmedeoAlfAmedeoAlf
committed
old changes, just syncing them
1 parent e7a1875 commit 9ada0fe

2 files changed

Lines changed: 63 additions & 40 deletions

File tree

‎init.lua‎

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -679,17 +679,27 @@ require('lazy').setup({
679679
-- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
680680
local servers = {
681681
clangd = {},
682-
-- gopls = {},
682+
gopls = {},
683683
pyright = {},
684684
rust_analyzer = {},
685685
ols = {},
686+
intelephense = {},
686687
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
687688
--
688689
-- Some languages (like typescript) have entire language plugins that can be useful:
689690
-- https://github.com/pmizio/typescript-tools.nvim
690691
--
691692
-- But for many setups, the LSP (`ts_ls`) will work just fine
692-
ts_ls = {},
693+
ts_ls = {
694+
workspace_required = true,
695+
root_markers = { 'tsconfig.json' },
696+
},
697+
eslint = {},
698+
denols = {
699+
workspace_required = true,
700+
root_markers = { 'deno.json', 'deno.jsonc' },
701+
},
702+
html = {},
693703
--
694704

695705
lua_ls = {
@@ -737,7 +747,7 @@ require('lazy').setup({
737747
-- by the server configuration above. Useful when disabling
738748
-- certain features of an LSP (for example, turning off formatting for ts_ls)
739749
server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
740-
require('lspconfig')[server_name].setup(server)
750+
vim.lsp.config[server_name] = server
741751
end,
742752
},
743753
}
@@ -777,11 +787,12 @@ require('lazy').setup({
777787
formatters_by_ft = {
778788
lua = { 'stylua' },
779789
odin = { 'odinfmt' },
790+
python = { 'autopep8' },
780791
-- Conform can also run multiple formatters sequentially
781792
-- python = { "isort", "black" },
782793
--
783794
-- You can use 'stop_after_first' to run the first available formatter from the list
784-
-- javascript = { "prettierd", "prettier", stop_after_first = true },
795+
javascript = { 'prettierd', 'prettier', stop_after_first = true },
785796
},
786797
},
787798
},
@@ -808,12 +819,12 @@ require('lazy').setup({
808819
-- `friendly-snippets` contains a variety of premade snippets.
809820
-- See the README about individual language/framework/plugin snippets:
810821
-- https://github.com/rafamadriz/friendly-snippets
811-
-- {
812-
-- 'rafamadriz/friendly-snippets',
813-
-- config = function()
814-
-- require('luasnip.loaders.from_vscode').lazy_load()
815-
-- end,
816-
-- },
822+
{
823+
'rafamadriz/friendly-snippets',
824+
config = function()
825+
require('luasnip.loaders.from_vscode').lazy_load()
826+
end,
827+
},
817828
},
818829
opts = {},
819830
},
@@ -860,12 +871,23 @@ require('lazy').setup({
860871
-- By default, you may press `<c-space>` to show the documentation.
861872
-- Optionally, set `auto_show = true` to show the documentation after a delay.
862873
documentation = { auto_show = false, auto_show_delay_ms = 500 },
874+
ghost_text = { enabled = true },
863875
},
864876

865877
sources = {
866-
default = { 'lsp', 'path', 'snippets', 'lazydev' },
878+
default = { 'lsp', 'snippets', 'path', 'lazydev' },
867879
providers = {
868880
lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
881+
lsp = {
882+
fallbacks = { 'buffer' },
883+
score_offset = 2,
884+
},
885+
snippets = {
886+
name = 'Snippets',
887+
module = 'blink.cmp.sources.snippets',
888+
timeout_ms = 2000,
889+
score_offset = 1,
890+
},
869891
},
870892
},
871893

‎lazy-lock.json‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
{
22
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
3-
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
4-
"conform.nvim": { "branch": "master", "commit": "0e93e0d12d2f7ebdea9e3e444dfaff0050cefbe6" },
5-
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
6-
"gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
3+
"blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
4+
"conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
5+
"fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" },
6+
"friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
7+
"gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
78
"guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" },
8-
"hererocks": { "branch": "master", "commit": "344c46ed54df9a4dbc2d2bf510dcd9a9d90497bf" },
9-
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
10-
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
11-
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
12-
"luarocks": { "branch": "main", "commit": "ebe1327df3e84f3d6fe5f546b442ececfb9ea86b" },
13-
"mason-lspconfig.nvim": { "branch": "main", "commit": "bef29b653ba71d442816bf56286c2a686210be04" },
14-
"mason-nvim-dap.nvim": { "branch": "main", "commit": "4c2cdc69d69fe00c15ae8648f7e954d99e5de3ea" },
15-
"mason-tool-installer.nvim": { "branch": "main", "commit": "93a9ff9b34c91c0cb0f7de8d5f7e4abce51d8903" },
16-
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
17-
"mini.nvim": { "branch": "main", "commit": "29586b1271403f927814affdc5441d335a0e8ea9" },
18-
"neo-tree.nvim": { "branch": "main", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
19-
"nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" },
20-
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
21-
"nvim-dap": { "branch": "master", "commit": "ea82027c3447dc1a022be9a9884de276c05cd33a" },
22-
"nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
23-
"nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
24-
"nvim-lint": { "branch": "master", "commit": "cc26ae6a620298bb3f33b0e0681f99a10ae57781" },
25-
"nvim-lspconfig": { "branch": "master", "commit": "036885e8e5456d3907626b634693234f628afef6" },
9+
"hererocks": { "branch": "master", "commit": "f4cc0b16619b9d9d59c92636c5b5e7c06dc7c082" },
10+
"indent-blankline.nvim": { "branch": "master", "commit": "d28a3f70721c79e3c5f6693057ae929f3d9c0a03" },
11+
"lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
12+
"lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
13+
"luarocks": { "branch": "main", "commit": "6b0a7f7f8770f5d21730a5f2fa8fcbc695687c43" },
14+
"mason-lspconfig.nvim": { "branch": "main", "commit": "a979821a975897b88493843301950c456a725982" },
15+
"mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" },
16+
"mason-tool-installer.nvim": { "branch": "main", "commit": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc" },
17+
"mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
18+
"mini.nvim": { "branch": "main", "commit": "59f09943573c5348ca6c88393fa09ce3b66a7818" },
19+
"neo-tree.nvim": { "branch": "main", "commit": "ba6871d15528e36657d19a3112cc1697c59da19a" },
20+
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
21+
"nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" },
22+
"nvim-dap": { "branch": "master", "commit": "a9d8cb68ee7184111dc66156c4a2ebabfbe01bc5" },
23+
"nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
24+
"nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
25+
"nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
26+
"nvim-lspconfig": { "branch": "master", "commit": "841c6d4139aedb8a3f2baf30cef5327371385b93" },
2627
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
2728
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
28-
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
29-
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
30-
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
29+
"nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" },
30+
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
31+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
3132
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
32-
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
33-
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
33+
"telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" },
34+
"todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
3435
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
35-
"tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
36-
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
36+
"tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
37+
"which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
3738
}

0 commit comments

Comments
 (0)