diff --git a/.bashrc b/.bashrc index ed75c86..084b749 100644 --- a/.bashrc +++ b/.bashrc @@ -20,3 +20,4 @@ export PATH="$PATH:$HOME/.cargo/bin" eval "$(starship init bash)" alias export_esp=". /home/jaroslaw/bin/export-esp.sh" alias get_idf='. $HOME/src/esp/esp-idf/export.sh' +export WGPU_BACKEND=opengl diff --git a/init.lua b/init.lua index a36679a..8dc4f82 100644 --- a/init.lua +++ b/init.lua @@ -303,7 +303,29 @@ cmp.setup({ }) require('lspconfig').basedpyright.setup {} -require('lspconfig').lua_ls.setup({}) +require 'lspconfig'.lua_ls.setup { + on_init = function(client) + local path = client.workspace_folders[1].name + if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then + return + end + + client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, { + runtime = { + version = 'LuaJIT' + }, + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME + } + } + }) + end, + settings = { + Lua = {} + } +} -- require("lspconfig").pyright.setup({}) vim.api.nvim_create_autocmd('BufWritePre', { callback = function() @@ -385,7 +407,8 @@ vim.api.nvim_set_hl(0, 'DapLogPoint', { ctermbg = 0, fg = '#61afef', bg = '#3135 vim.api.nvim_set_hl(0, 'DapStopped', { ctermbg = 0, fg = '#98c379', bg = '#31353f' }) local builtin = require('telescope.builtin') -vim.keymap.set('n', 'ff', builtin.find_files, {}) +vim.keymap.set('n', '', builtin.find_files, {}) +vim.keymap.set('n', '', builtin.commands, {}) vim.keymap.set('n', 'fb', builtin.buffers, {}) vim.keymap.set('n', 'fh', builtin.help_tags, {})