Commit 2e937adf authored by Tim van Deurzen's avatar Tim van Deurzen

Updates to deal with broken lsp-saga.

parent ab0effe5
...@@ -68,6 +68,7 @@ local function basic_configuration() ...@@ -68,6 +68,7 @@ local function basic_configuration()
showbreak = "↳ "; showbreak = "↳ ";
pumblend = 15; pumblend = 15;
winblend = 15; winblend = 15;
-- Sets the keymap in normal mode to QWERTY while actually on Colemak.
langmap = "rs,RS,gt,GT,fe,FE,pr,PR,jy,JY,lu,LU,ui,UI,yo,YO,sd,SD,dg,DG,nj,NJ,ek,EK,il,IL,kn,KN,o\\;,O:,\\;p"; langmap = "rs,RS,gt,GT,fe,FE,pr,PR,jy,JY,lu,LU,ui,UI,yo,YO,sd,SD,dg,DG,nj,NJ,ek,EK,il,IL,kn,KN,o\\;,O:,\\;p";
langnoremap = true; langnoremap = true;
} }
......
...@@ -7,8 +7,15 @@ lsp_config.gopls.setup{ ...@@ -7,8 +7,15 @@ lsp_config.gopls.setup{
capabilities = capabilities, capabilities = capabilities,
settings = { settings = {
gopls = { gopls = {
experimentalPostfixCompletions = true,
analyses = { analyses = {
fieldalignment = true,
nilness = true,
unusedwrite = true,
unusedparams = true, unusedparams = true,
shadow = true,
unreachable = true,
bools = true,
}, },
staticcheck = true, staticcheck = true,
}, },
......
...@@ -24,6 +24,7 @@ return require('packer').startup(function() ...@@ -24,6 +24,7 @@ return require('packer').startup(function()
requires = {'junegunn/fzf'} requires = {'junegunn/fzf'}
} }
-- Look at feline for a leaner better maintained alternative.
use { use {
'glepnir/galaxyline.nvim', 'glepnir/galaxyline.nvim',
......
...@@ -42,20 +42,22 @@ gls.left = { ...@@ -42,20 +42,22 @@ gls.left = {
highlight = {colors.black, colors.yellow, 'bold'}, highlight = {colors.black, colors.yellow, 'bold'},
} }
}, },
{ -- The commented code below breaks during any time there is no clear branch name (e.g.
GitIcon = { -- during rebase).
provider = function() return '  ' end, -- {
condition = function() return condition.check_git_workspace() and condition.hide_in_width() end, -- GitIcon = {
highlight = {colors.black, colors.bblack} -- provider = function() return '  ' end,
} -- condition = function() return condition.check_git_workspace() and condition.hide_in_width() end,
}, -- highlight = {colors.black, colors.bblack}
{ -- }
GitBranch = { -- },
provider = function() return string.format('%s ', vcs.get_git_branch()) end, -- {
condition = function() return condition.check_git_workspace() and condition.hide_in_width() end, -- GitBranch = {
highlight = {colors.black, colors.bblack} -- provider = function() return string.format('%s ', vcs.get_git_branch()) end,
} -- condition = function() return condition.check_git_workspace() and condition.hide_in_width() end,
}, -- highlight = {colors.black, colors.bblack}
-- }
-- },
{ {
DiffAdd = { DiffAdd = {
provider = vcs.diff_add, provider = vcs.diff_add,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment