Merge branch 'main' into orgmode

This commit is contained in:
qwjyh 2023-11-17 09:03:00 +09:00
commit d4d30aa239
8 changed files with 133 additions and 11 deletions

View file

@ -222,11 +222,12 @@ vim.keymap.set('t', '<C-w>l', '<C-\\><C-N><C-w>l',
-- vim script func returns 1/0, while lua evals false only if gets false or nil
-- so be sure to compare with 1/0
if vim.fn.has('win32') == 1 then
if vim.fn.executable('pwsh') == 1 then
-- this evaluation is so slow that I removed windows powershell support
-- if vim.fn.executable('pwsh') == 1 then
vim.opt.shell = 'pwsh'
else
vim.opt.shell = 'powershell'
end
-- else
-- vim.opt.shell = 'powershell'
-- end
vim.opt.shellcmdflag =
'-NoLogo -NoProfile -ExecutionPolicy RemoteSigned -Command [Console]::InputEncoding=[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;'
vim.opt.shellredir = '-RedirectStandardOutput %s -NoNewWindow -Wait'
@ -555,7 +556,8 @@ lspconfig.bashls.setup {
}
-- pwsh
lspconfig.powershell_es.setup {
bundle_path = '~/scoop/apps/powershell-editorservice/current/PowerShellEditorServices'
bundle_path = '~/scoop/apps/powershell-editorservice/current',
capabilities = capabilities,
}
-- -- jetls
-- lspconfig.jetls.setup {}

View file

@ -1,3 +1,12 @@
-- https://qiita.com/uhooi/items/99aeff822d4870a8e269
local lsp_names = function ()
local clients = {}
for _, client in ipairs(vim.lsp.get_active_clients({ bufnr = 0})) do
table.insert(clients, client.name)
end
return '' .. table.concat(clients, ', ')
end
require('lualine').setup {
options = {
icons_enabled = true,
@ -21,7 +30,7 @@ require('lualine').setup {
lualine_a = {'mode'},
lualine_b = {'branch', 'diff', 'diagnostics'},
lualine_c = {'filename'},
lualine_x = {'filetype'},
lualine_x = {lsp_names, 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
},