diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 011a347..5aadcc1 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -99,11 +99,11 @@ g.glow_style = 'dark' vim.cmd [[ autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=2 noexpandtab ]] -vim.cmd [[ autocmd FileType python set textwidth=110 ]] +vim.cmd [[ autocmd FileType python set textwidth=250 ]] vim.cmd [[ autocmd FileType lua set textwidth=80 ]] vim.cmd [[ autocmd FileType markdown,text set shiftwidth=2 foldlevel=99 ]] -- vim.cmd [[ autocmd FileType markdown setlocal foldlevel=99 ]] -vim.cmd[[ colorscheme eldritch ]] +vim.cmd[[ colorscheme dustfox ]] local disabled_built_ins = { "netrw", diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index ce2558d..b448a81 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,17 +1,12 @@ { "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "adjacent.nvim": { "branch": "main", "commit": "a555ab92d61aa6fbbfa1bfaef4633b663563f04e" }, - "alpha-nvim": { "branch": "main", "commit": "b6f4129302db197a7249e67a90de3f2b676de13e" }, + "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, "async.vim": { "branch": "master", "commit": "2082d13bb195f3203d41a308b89417426a7deca1" }, "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" }, - "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "blink.cmp": { "branch": "main", "commit": "506ea74e53a825cc6efd40a46c4129576409e440" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "deadcolumn.nvim": { "branch": "master", "commit": "af13928aa281f36273e8f220b19e78d497c7fb87" }, @@ -20,13 +15,12 @@ "eldritch.nvim": { "branch": "master", "commit": "48788ef2f7be7e86b0a57ef87f1a96bc18e24b8b" }, "f-string-toggle.nvim": { "branch": "main", "commit": "4e2ad79dfc5122dd65515ebbdd671e8ee01d157e" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, - "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" }, - "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" }, "hover.nvim": { "branch": "main", "commit": "4339cbbcb572b1934c53dcb66ad4bf6a0abb7918" }, - "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, "kanagawa.nvim": { "branch": "master", "commit": "f491b0fe68fffbece7030181073dfe51f45cda81" }, - "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" }, "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, @@ -44,33 +38,34 @@ "mini.trailspace": { "branch": "main", "commit": "3a328e62559c33014e422fb9ae97afc4208208b1" }, "mkdnflow.nvim": { "branch": "main", "commit": "d459bd7ce68910272038ed037c028180161fd14d" }, "neoscroll.nvim": { "branch": "master", "commit": "4e0428a41c6ec191df543fc95349f6e1c598e53f" }, - "neovim": { "branch": "main", "commit": "8b1fd252255a7f2c41b4192a787ab62660b29f72" }, + "neovim": { "branch": "main", "commit": "d396005db5bbd1d4ec7772a7c96c96f4c4802328" }, "night-owl.nvim": { "branch": "main", "commit": "86ed124c2f7e118670649701288e024444bf91e5" }, - "nightfly": { "branch": "master", "commit": "190c219835357d46dcb7670a57e401e6595ba4c2" }, + "nightfly": { "branch": "master", "commit": "f4f932d3129fee10a0e944445fe6be5abf76465c" }, "nightfox.nvim": { "branch": "main", "commit": "7557f26defd093c4e9bc17f28b08403f706f5a44" }, "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "nvim": { "branch": "main", "commit": "63685e1562ef53873c9764b483d7ac5c7a608922" }, + "nvim": { "branch": "main", "commit": "7be452ee067978cdc8b2c5f3411f0c71ffa612b9" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-dap": { "branch": "master", "commit": "90616ae6ae40053103dc66872886fc26b94c70c8" }, - "nvim-dap-ui": { "branch": "master", "commit": "1c351e4e417d4691da12948b6ecf966936a56d28" }, + "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, + "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, "nvim-http": { "branch": "main", "commit": "9a0e97b639d34af17d06b3421fe633b416dd64ee" }, - "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" }, + "nvim-lspconfig": { "branch": "master", "commit": "d3f169f436e1b44538bfe7e13b4721eec48dbc59" }, "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-prose": { "branch": "main", "commit": "38aac8c9c94a5725d152bdfea374d60e07fb93d6" }, - "nvim-tree.lua": { "branch": "master", "commit": "e7cdecc6363acef8232f2f099fe21096ffdc071f" }, - "nvim-treesitter": { "branch": "master", "commit": "f027762845fa35ff27fe0487c86537a74a480a0c" }, + "nvim-tree.lua": { "branch": "master", "commit": "4a9e82d10a3715d0c3845e1d2f66ddfb8b711253" }, + "nvim-treesitter": { "branch": "master", "commit": "9d2acd49976e2a9da72949008df03436f781fd23" }, "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, - "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" }, - "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" }, + "nvim-web-devicons": { "branch": "master", "commit": "56f17def81478e406e3a8ec4aa727558e79786f3" }, + "oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "pulse.nvim": { "branch": "main", "commit": "4026460b12da9abcfe34322db0bdc80e4b0dce3d" }, "rainbow-delimiters.nvim": { "branch": "master", "commit": "d227e6c9879bb50af35cd733461198666981d482" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, "solarized-osaka.nvim": { "branch": "main", "commit": "126d394c0c979a99206214a2b6b8c86e456c9c0f" }, - "sonokai": { "branch": "master", "commit": "96bc67d0de80110fc5b3854005468fd31395bb54" }, + "sonokai": { "branch": "master", "commit": "3dcd97c0c5e4118bc171df6ba33800dfd9524a00" }, + "spacecamp": { "branch": "master", "commit": "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, "telescope-cmdline.nvim": { "branch": "main", "commit": "1c6a169d84a5e8f0c796f8275bdbb8019bd3ca14" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "3b8a1e17187cfeedb31decbd625da62398a8ff34" }, @@ -81,8 +76,8 @@ "tmux.nvim": { "branch": "main", "commit": "65ee9d6e6308afcd7d602e1320f727c5be63a947" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, - "tokyonight.nvim": { "branch": "main", "commit": "817bb6ffff1b9ce72cdd45d9fcfa8c9cd1ad3839" }, - "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, + "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, + "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, "venn.nvim": { "branch": "main", "commit": "b09c2f36ddf70b498281845109bedcf08a7e0de0" }, "vim-arduino": { "branch": "master", "commit": "2ded67cdf09bb07c4805d9e93d478095ed3d8606" }, "vim-arsync": { "branch": "master", "commit": "dd5fd93182aafb67ede2ef465f379610980b52d3" }, @@ -90,6 +85,6 @@ "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" }, "vim-dadbod-ui": { "branch": "master", "commit": "f29c85ab42861c6ef683289b0c6a51e0d436dcf6" }, "vim-wakatime": { "branch": "master", "commit": "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1" }, - "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" }, + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }, "wtf.nvim": { "branch": "main", "commit": "16eec1f32c3608bd8519e9e520041fe34201abb0" } } diff --git a/nvim/.config/nvim/lua/plugins/blink.lua b/nvim/.config/nvim/lua/plugins/blink.lua new file mode 100644 index 0000000..28ee7ed --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/blink.lua @@ -0,0 +1,35 @@ +return { + 'saghen/blink.cmp', + lazy = false, -- lazy loading handled internally + -- optional: provides snippets for the snippet source + dependencies = { + 'rafamadriz/friendly-snippets', + 'L3MON4D3/LuaSnip', + }, + version = 'v0.*', + + opts = { + highlight = { + use_nvim_cmp_as_default = true, + nerd_font_variant = 'normal', + } + }, + + trigger = { + completion = { + keyword_regex = '[%w_\\-]', + blocked_trigger_characters = { ' ', '\n', '\t' }, + show_on_insert_on_trigger_character = true, + } + }, + sources = { + providers = { + { + { 'blink.cmp.sources.lsp' }, + { 'blink.cmp.sources.path' }, + { 'blink.cmp.sources.snippets', score_offset = -3 }, + }, + { { 'blink.cmp.sources.buffer' } }, + } + }, +} diff --git a/nvim/.config/nvim/lua/plugins/headlines.lua b/nvim/.config/nvim/lua/plugins/headlines.lua deleted file mode 100644 index 41ae07a..0000000 --- a/nvim/.config/nvim/lua/plugins/headlines.lua +++ /dev/null @@ -1,51 +0,0 @@ -return { - 'lukas-reineke/headlines.nvim', - dependencies = "nvim-treesitter/nvim-treesitter", - config = function() - require("headlines").setup { - markdown = { - query = vim.treesitter.query.parse( - "markdown", - [[ - (atx_heading [ - (atx_h1_marker) - (atx_h2_marker) - (atx_h3_marker) - (atx_h4_marker) - (atx_h5_marker) - (atx_h6_marker) - ] @headline) - - (thematic_break) @dash - - (fenced_code_block) @codeblock - - (block_quote_marker) @quote - (block_quote (paragraph (inline (block_continuation) @quote))) - ]] - ), - headline_highlights = { - 'Headline1', - 'Headline2', - 'Headline3', - 'Headline4', - 'Headline5', - 'Headline6', - }, - codeblock_highlight = "CodeBlock", - dash_highlight = "Dash", - dash_string = "-", - quote_highlight = "Quote", - quote_string = "┃", - fat_headlines = false, - }, - } - vim.api.nvim_set_hl(0, 'Headline1', { fg = '#ffffff', bg = '#6272A4', italic = false }) - vim.api.nvim_set_hl(0, 'Headline2', { fg = '#000000', bg = '#8BE9FD', italic = false }) - vim.api.nvim_set_hl(0, 'Headline3', { fg = '#000000', bg = '#BD93F9', italic = false }) - vim.api.nvim_set_hl(0, 'Headline4', { fg = '#000000', bg = '#FFB86C', italic = false }) - vim.api.nvim_set_hl(0, 'Headline5', { fg = '#000000', bg = '#FF79C6', italic = false }) - vim.api.nvim_set_hl(0, 'Headline6', { fg = '#000000', bg = '#FF5555', italic = false }) - vim.api.nvim_set_hl(0, 'CodeBlock', { bg = '#222221' }) - end -} diff --git a/nvim/.config/nvim/lua/plugins/headlines.lua.backup b/nvim/.config/nvim/lua/plugins/headlines.lua.backup new file mode 100644 index 0000000..7eded28 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/headlines.lua.backup @@ -0,0 +1,51 @@ +-- return { +-- 'lukas-reineke/headlines.nvim', +-- dependencies = "nvim-treesitter/nvim-treesitter", +-- config = function() +-- require("headlines").setup { +-- markdown = { +-- query = vim.treesitter.query.parse( +-- "markdown", +-- [[ +-- (atx_heading [ +-- (atx_h1_marker) +-- (atx_h2_marker) +-- (atx_h3_marker) +-- (atx_h4_marker) +-- (atx_h5_marker) +-- (atx_h6_marker) +-- ] @headline) +-- +-- (thematic_break) @dash +-- +-- (fenced_code_block) @codeblock +-- +-- (block_quote_marker) @quote +-- (block_quote (paragraph (inline (block_continuation) @quote))) +-- ]] +-- ), +-- headline_highlights = { +-- 'Headline1', +-- 'Headline2', +-- 'Headline3', +-- 'Headline4', +-- 'Headline5', +-- 'Headline6', +-- }, +-- codeblock_highlight = "CodeBlock", +-- dash_highlight = "Dash", +-- dash_string = "-", +-- quote_highlight = "Quote", +-- quote_string = "┃", +-- fat_headlines = false, +-- }, +-- } +-- vim.api.nvim_set_hl(0, 'Headline1', { fg = '#ffffff', bg = '#6272A4', italic = false }) +-- vim.api.nvim_set_hl(0, 'Headline2', { fg = '#000000', bg = '#8BE9FD', italic = false }) +-- vim.api.nvim_set_hl(0, 'Headline3', { fg = '#000000', bg = '#BD93F9', italic = false }) +-- vim.api.nvim_set_hl(0, 'Headline4', { fg = '#000000', bg = '#FFB86C', italic = false }) +-- vim.api.nvim_set_hl(0, 'Headline5', { fg = '#000000', bg = '#FF79C6', italic = false }) +-- vim.api.nvim_set_hl(0, 'Headline6', { fg = '#000000', bg = '#FF5555', italic = false }) +-- vim.api.nvim_set_hl(0, 'CodeBlock', { bg = '#222221' }) +-- end +-- } diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 573e187..ff30647 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -387,6 +387,7 @@ return { ----------------------------------------------------------- + {'jaredgorski/spacecamp'}, { "eldritch-theme/eldritch.nvim", lazy = false, diff --git a/nvim/.config/nvim/lua/plugins/nvim-cmp.lua b/nvim/.config/nvim/lua/plugins/nvim-cmp.lua.backup similarity index 100% rename from nvim/.config/nvim/lua/plugins/nvim-cmp.lua rename to nvim/.config/nvim/lua/plugins/nvim-cmp.lua.backup diff --git a/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua index e29eb6d..8161930 100644 --- a/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua +++ b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua @@ -1,22 +1,32 @@ return { 'neovim/nvim-lspconfig', config = function() - -- Setup language servers. - local lspconfig = require('lspconfig') - local configs = require('lspconfig.configs') - lspconfig.pylsp.setup{ - -- Server-specific settings. See `:help lspconfig-setup` - settings = { - settings = { - pylsp = { - configurationSources = {"pylint"}, - plugins = { - pylint = { enabled = true }, - } - } + -- Setup language servers. + local lspconfig = require('lspconfig') + local configs = require('lspconfig.configs') + local capabilities = vim.lsp.protocol.make_client_capabilities() + capabilities.textDocument.completion.completionItem.snippetSupport = true + lspconfig.emmet_ls.setup{ + on_attach = on_attach, + capabilities = capabilities, + filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "svelte", "pug", "typescriptreact", "vue", "liquid" }, + init_options = { + html = { + options = { + ["bem.enabled"] = true, + }, + }, + } } - } - } + lspconfig.ruff_lsp.setup{ + on_attach = on_attach, + init_options = { + settings = { + args = {}, + } + } + } + -- Global mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions vim.keymap.set('n', 'e', vim.diagnostic.open_float) @@ -54,39 +64,5 @@ return { end, opts) end, }) - - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities.textDocument.completion.completionItem.snippetSupport = true - - if not configs.ls_emmet then - configs.ls_emmet = { - default_config = { - cmd = { 'ls_emmet', '--stdio' }; - filetypes = { - 'html', - 'liquid', - 'css', - 'scss', - 'javascriptreact', - 'typescriptreact', - 'haml', - 'xml', - 'xsl', - 'pug', - 'slim', - 'sass', - 'stylus', - 'less', - 'sss', - 'handlebars', - }; - root_dir = function(fname) - return vim.loop.cwd() - end; - settings = {}; - }; - } - end - lspconfig.ls_emmet.setup { capabilities = capabilities } - end -} + end, + } diff --git a/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua.backup b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua.backup new file mode 100644 index 0000000..9e290fc --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/nvim-lspconfig.lua.backup @@ -0,0 +1,107 @@ +-- return { +-- 'neovim/nvim-lspconfig', +-- config = function() +-- -- Setup language servers. +-- local lspconfig = require('lspconfig') +-- local configs = require('lspconfig/configs') +-- local capabilities = vim.lsp.protocol.make_client_capabilities() +-- capabilities.textDocument.completion.completionItem.snippetSupport = true +-- +-- lspconfig.emmet_ls.setup{ +-- -- on_attach = on_attach, +-- capabilities = capabilities, +-- filetypes = { "css", "eruby", "html", "javascript", "javascriptreact", "less", "sass", "scss", "svelte", "pug", "typescriptreact", "vue","liquid" }, +-- init_options = { +-- html = { +-- options = { +-- ["bem.enabled"] = true, +-- }, +-- }, +-- } +-- } +-- -- lspconfig.pylsp.setup{ +-- -- -- Server-specific settings. See `:help lspconfig-setup` +-- -- settings = { +-- -- settings = { +-- -- pylsp = { +-- -- configurationSources = {"pylint"}, +-- -- plugins = { +-- -- pylint = { enabled = true }, +-- -- } +-- -- } +-- -- } +-- -- } +-- -- } +-- -- Global mappings. +-- -- See `:help vim.diagnostic.*` for documentation on any of the below functions +-- vim.keymap.set('n', 'e', vim.diagnostic.open_float) +-- vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) +-- vim.keymap.set('n', ']d', vim.diagnostic.goto_next) +-- vim.keymap.set('n', 'q', vim.diagnostic.setloclist) +-- +-- -- Use LspAttach autocommand to only map the following keys +-- -- after the language server attaches to the current buffer +-- vim.api.nvim_create_autocmd('LspAttach', { +-- group = vim.api.nvim_create_augroup('UserLspConfig', {}), +-- callback = function(ev) +-- -- Enable completion triggered by +-- vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc' +-- +-- -- Buffer local mappings. +-- -- See `:help vim.lsp.*` for documentation on any of the below functions +-- local opts = { buffer = ev.buf } +-- vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts) +-- vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts) +-- vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts) +-- vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts) +-- vim.keymap.set('n', '', vim.lsp.buf.signature_help, opts) +-- vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, opts) +-- vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, opts) +-- vim.keymap.set('n', 'wl', function() +-- print(vim.inspect(vim.lsp.buf.list_workspace_folders())) +-- end, opts) +-- vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, opts) +-- vim.keymap.set('n', 'rn', vim.lsp.buf.rename, opts) +-- vim.keymap.set({ 'n', 'v' }, 'ca', vim.lsp.buf.code_action, opts) +-- vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts) +-- vim.keymap.set('n', 'f', function() +-- vim.lsp.buf.format { async = true } +-- end, opts) +-- end, +-- }) +-- +-- -- local capabilities = vim.lsp.protocol.make_client_capabilities() +-- -- capabilities.textDocument.completion.completionItem.snippetSupport = true +-- -- +-- -- if not configs.ls_emmet then +-- -- configs.ls_emmet = { +-- -- default_config = { +-- -- cmd = { 'ls_emmet', '--stdio' }; +-- -- filetypes = { +-- -- 'html', +-- -- 'liquid', +-- -- 'css', +-- -- 'scss', +-- -- 'javascriptreact', +-- -- 'typescriptreact', +-- -- 'haml', +-- -- 'xml', +-- -- 'xsl', +-- -- 'pug', +-- -- 'slim', +-- -- 'sass', +-- -- 'stylus', +-- -- 'less', +-- -- 'sss', +-- -- 'handlebars', +-- -- }; +-- -- root_dir = function(fname) +-- -- return vim.loop.cwd() +-- -- end; +-- -- settings = {}; +-- -- }; +-- -- } +-- -- end +-- -- lspconfig.ls_emmet.setup { capabilities = capabilities } +-- -- end +--} diff --git a/zsh/.zshrc b/zsh/.zshrc index 8c255e7..f008f9c 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -68,7 +68,55 @@ source ~/.dotfiles/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh source ~/.dotfiles/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh . "$HOME/.cargo/env" export PATH="/usr/local/opt/openssl/bin:$PATH" +echo 'eval "$(uv generate-shell-completion zsh)"' >> ~/.zshrc export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)" +eval "$(uv generate-shell-completion zsh)"