vim/lua/lightline_config.lua

@@ -22,8 +22,6 @@ require("lualine").setup({
 	options = {
 		icons_enabled = false,
 		theme = "nord",
-		component_separators = "",
-		section_separators = { left = "", right = "" },
 	},
 	sections = {
 		lualine_a = {
@@ -39,7 +37,7 @@ require("lualine").setup({
 		lualine_c = {
 			{
 				"branch",
-				padding = 1,
+				padding = { left = 0 },
 			},
 			-- render coloured output from gitsigns, this doesn't seem to work with b:gitsigns_status:
 			{
@@ -47,21 +45,21 @@ require("lualine").setup({
 					return format_diff_element(vim.b.gitsigns_status_dict.added, "+")
 				end,
 				color = { fg = "#a3be8c" },
-				padding = 1,
+				padding = 0,
 			},
 			{
 				function()
 					return format_diff_element(vim.b.gitsigns_status_dict.changed, "~")
 				end,
 				color = { fg = "#ebcb8b" },
-				padding = 1,
+				padding = 0,
 			},
 			{
 				function()
 					return format_diff_element(vim.b.gitsigns_status_dict.removed, "-")
 				end,
 				color = { fg = "#bf616a" },
-				padding = 1,
+				padding = 0,
 			},
 			{
 				"diagnostics",
@@ -96,7 +94,7 @@ require("lualine").setup({
 				padding = { left = 1, right = 0 },
 			},
 		},
-		lualine_y = { { "progress", padding = { left = 1, right = 1 } } },
+		lualine_y = { { "progress", padding = { left = 1, right = 0 } } },
 		lualine_z = { { "location", padding = { left = 1, right = 1 } } },
 	},
 	inactive_sections = {

vim/lua/nvim_cmp_config.lua

@@ -82,7 +82,11 @@ cmp.setup({
 	},
 	-- https://github.com/hrsh7th/nvim-cmp/wiki/Advanced-techniques#disabling-completion-in-certain-contexts-such-as-comments
 	enabled = function()
+		local context = require("cmp.config.context")
+		if vim.api.nvim_get_mode().mode == "c" then
 			return true
+		end
+		return not context.in_treesitter_capture("comment") and not context.in_syntax_group("Comment")
 	end,
 	formatting = {
 		fields = { "kind", "abbr", "menu" },