fix(base): mutiple config updates

umgbhalla · Feb 5, 2022 · b47aaa2 · b47aaa2
1 parent 7f6c057
commit b47aaa2
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 27 deletions.
diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua
@@ -19,7 +19,12 @@ kanagawa.setup({
 	overrides = {},
 })
 -- setup must be called before loading
-vim.cmd("colorscheme kanagawa")
+-- vim.cmd("colorscheme kanagawa")
+vim.g.tokyodark_transparent_background = false
+vim.g.tokyodark_enable_italic_comment = true
+vim.g.tokyodark_enable_italic = true
+vim.g.tokyodark_color_gamma = "1.0"
+vim.cmd("colorscheme tokyodark")
 
 -- vim.cmd([[
 -- try

diff --git a/lua/user/indentline.lua b/lua/user/indentline.lua
@@ -14,10 +14,10 @@ vim.g.indent_blankline_filetype_exclude = {
 	"Trouble",
 }
 vim.g.indentLine_enabled = 1
--- vim.g.indent_blankline_char = "│"
-vim.g.indent_blankline_char = "▏"
+vim.g.indent_blankline_char = "│"
+-- vim.g.indent_blankline_char = "▏"
 -- vim.g.indent_blankline_char = "▎"
-vim.g.indent_blankline_show_trailing_blankline_indent = false
+vim.g.indent_blankline_show_trailing_blankline_indent = true
 vim.g.indent_blankline_show_first_indent_level = true
 vim.g.indent_blankline_use_treesitter = true
 vim.g.indent_blankline_show_current_context = true
@@ -46,25 +46,30 @@ vim.g.indent_blankline_context_patterns = {
 -- HACK: work-around for https://github.com/lukas-reineke/indent-blankline.nvim/issues/59
 vim.wo.colorcolumn = "99999"
 
--- vim.cmd [[highlight IndentBlanklineIndent1 guifg=#E06C75 gui=nocombine]]
--- vim.cmd [[highlight IndentBlanklineIndent2 guifg=#E5C07B gui=nocombine]]
--- vim.cmd [[highlight IndentBlanklineIndent3 guifg=#98C379 gui=nocombine]]
--- vim.cmd [[highlight IndentBlanklineIndent4 guifg=#56B6C2 gui=nocombine]]
--- vim.cmd [[highlight IndentBlanklineIndent5 guifg=#61AFEF gui=nocombine]]
--- vim.cmd [[highlight IndentBlanklineIndent6 guifg=#C678DD gui=nocombine]]
+vim.cmd([[highlight IndentBlanklineIndent1 guifg=#1A1B2A gui=nocombine]])
+-- vim.cmd([[highlight IndentBlanklineIndent2 guifg=#E5C07B gui=nocombine]])
+-- vim.cmd([[highlight IndentBlanklineIndent3 guifg=#98C379 gui=nocombine]])
+-- vim.cmd([[highlight IndentBlanklineIndent4 guifg=#56B6C2 gui=nocombine]])
+-- vim.cmd([[highlight IndentBlanklineIndent5 guifg=#61AFEF gui=nocombine]])
+-- vim.cmd([[highlight IndentBlanklineIndent6 guifg=#C678DD gui=nocombine]])
+-- vim.opt.list = true
+-- vim.opt.listchars:append("space:⋅")
+-- vim.opt.listchars:append("space:")
+-- vim.opt.listchars:append("eol:↴")
+vim.opt.termguicolors = true
 -- vim.opt.list = true
--- vim.opt.listchars:append "space:⋅"
--- vim.opt.listchars:append "space:"
--- vim.opt.listchars:append "eol:↴"
 
 indent_blankline.setup({
-	-- show_end_of_line = true,
-	-- space_char_blankline = " ",
+	show_end_of_line = true,
+	space_char_blankline = " ",
 	show_current_context = true,
 	-- show_current_context_start = true,
-	-- char_highlight_list = {
-	--   "IndentBlanklineIndent1",
-	--   "IndentBlanklineIndent2",
-	--   "IndentBlanklineIndent3",
-	-- },
+	char_highlight_list = {
+		"IndentBlanklineIndent1",
+		-- 	"IndentBlanklineIndent2",
+		-- 	"IndentBlanklineIndent3",
+		-- 	"IndentBlanklineIndent4",
+		-- 	"IndentBlanklineIndent5",
+		-- 	"IndentBlanklineIndent6",
+	},
 })
diff --git a/lua/user/lsp/null-ls.lua b/lua/user/lsp/null-ls.lua
@@ -15,15 +15,15 @@ null_ls.setup({
 		formatting.black.with({ extra_args = { "--fast" } }),
 		formatting.stylua,
 		-- diagnostics.flake8
+    -- Set a formatter
+    formatting.rufo,
+    -- Set a linter
+    diagnostics.rubocop,
 	},
 	on_attach = function(client)
 		if client.resolved_capabilities.document_formatting then
-			vim.cmd([[
-            augroup LspFormatting
-                autocmd! * <buffer>
-                autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_seq_sync()
-            augroup END
-            ]])
-		end
+	  vim.cmd "autocmd BufWritePre <buffer> lua vim.lsp.buf.formatting_sync()"
+    end
 	end,
 })
+
diff --git a/lua/user/lsp/settings/rust_tools.lua b/lua/user/lsp/settings/rust_tools.lua
@@ -84,6 +84,12 @@ local opts = {
 				diagnostics = {
 					disabled = { "macro-error", "unresolved-proc-macro" },
 				},
+				inlayHints = {
+					enable = true,
+					chainingHints = true,
+					typeHints = true,
+					parameterHints = true,
+				},
 			},
 		},
 	},

diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua
@@ -68,6 +68,7 @@ return packer.startup(function(use)
 	use("lunarvim/darkplus.nvim")
 	-- use("whatyouhide/vim-gotham")
 	use("rebelot/kanagawa.nvim")
+	use("tiagovla/tokyodark.nvim")
 	-- cmp plugins
 	use("hrsh7th/nvim-cmp") -- The completion plugin
 	use("hrsh7th/cmp-buffer") -- buffer completions