Merge remote-tracking branch 'refs/remotes/origin/main'

private_dot_config/kitty/kitty.conf

@@ -928,7 +928,7 @@ tab_bar_margin_height 3.0 0.0
 
 #tab_bar_style powerline
 #tab_powerline_style slanted
-	tab_bar_style custom
+tab_bar_style custom
 
 
 #: The tab bar style, can be one of:

private_dot_config/nvim/init.lua

@@ -36,7 +36,7 @@ require("lazy").setup({
 	{ "ojroques/nvim-osc52" },
 	{ "nvim-tree/nvim-tree.lua" },
 	{ "jeffkreeftmeijer/vim-numbertoggle" },
-	{ "lukas-reineke/indent-blankline.nvim" },
+	{ "lukas-reineke/indent-blankline.nvim", main="ibl", opts={} },
 	{ "phaazon/hop.nvim" },
 	{ "echasnovski/mini.nvim", version = "*" },
 	{ "mg979/vim-visual-multi", branch = "master" },
@@ -182,7 +182,9 @@ vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
 vim.opt.termguicolors = true
 
 require("nvim-tree").setup({
-	sort_by = "case_insensitive",
+	sort = {
+		sorter = "name",
+	},
 	view = {
 		width = 22,
 	},
@@ -251,16 +253,6 @@ vim.opt.listchars:append("multispace:  ⋅ ⋅ ⋅ ⋅ ⋅ ⋅")
 vim.opt.listchars:append("leadmultispace:⋅ ⋅ ")
 vim.opt.listchars:append("trail:␣")
 
-require("indent_blankline").setup({
-	space_char_blankline = " ",
-	char_highlight_list = {
-		"IndentBlanklineIndent1",
-	},
-	space_char_highlight_list = {
-		"IndentBlanklineIndent1",
-	},
-})
-
 function _G.set_terminal_keymaps()
 	local opts = { buffer = 0 }
 	--  vim.keymap.set('t', '<esc>', [[<C-\><C-n>]], opts)