feat: add gitsigns, todo-comments, incline and more

- add related operations to whichkey
- add shfmt to formatter.nvim
- use system clipboard

nvim/init.lua

@@ -75,4 +75,6 @@ vim.cmd("filetype plugin on")
 
 vim.g.mapleader = " "
 
+vim.api.nvim_set_option("clipboard", "unnamedplus")
+
 require("plugins")

nvim/lua/formatter-config.lua

@@ -9,8 +9,6 @@ local function prettier()
 		args = {
 			"--stdin-filepath",
 			util.escape_path(util.get_current_buffer_file_path()),
-			"--tab-width",
-			"4",
 		},
 		stdin = true,
 		try_node_modules = true,
@@ -58,6 +56,9 @@ local function build()
 			javascript = {
 				prettier,
 			},
+			yaml = {
+				prettier,
+			},
 			fish = {
 				require("formatter.filetypes.fish").fishindent,
 			},
@@ -67,6 +68,9 @@ local function build()
 			toml = {
 				require("formatter.filetypes.toml").taplo,
 			},
+			sh = {
+				require("formatter.filetypes.sh").shfmt,
+			},
 			["*"] = {
 				require("formatter.filetypes.any").remove_trailing_whitespace,
 			},

nvim/lua/incline-config.lua

@@ -0,0 +1,51 @@
+local devicons = require("nvim-web-devicons")
+require("incline").setup({
+	render = function(props)
+		local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t")
+		if filename == "" then
+			filename = "[No Name]"
+		end
+		local ft_icon, ft_color = devicons.get_icon_color(filename)
+
+		local function get_git_diff()
+			local icons = { removed = "", changed = "", added = "" }
+			local signs = vim.b[props.buf].gitsigns_status_dict
+			local labels = {}
+			if signs == nil then
+				return labels
+			end
+			for name, icon in pairs(icons) do
+				if tonumber(signs[name]) and signs[name] > 0 then
+					table.insert(labels, { icon .. signs[name] .. " ", group = "Diff" .. name })
+				end
+			end
+			if #labels > 0 then
+				table.insert(labels, { "┊ " })
+			end
+			return labels
+		end
+
+		local function get_diagnostic_label()
+			local icons = { error = "", warn = " ", info = " ", hint = "" }
+			local label = {}
+
+			for severity, icon in pairs(icons) do
+				local n = #vim.diagnostic.get(props.buf, { severity = vim.diagnostic.severity[string.upper(severity)] })
+				if n > 0 then
+					table.insert(label, { icon .. n .. " ", group = "DiagnosticSign" .. severity })
+				end
+			end
+			if #label > 0 then
+				table.insert(label, { "┊ " })
+			end
+			return label
+		end
+
+		return {
+			--{ get_diagnostic_label() },
+			--{ get_git_diff() },
+			{ (ft_icon or "") .. " ", guifg = ft_color, guibg = "none" },
+			{ filename .. " ", gui = vim.bo[props.buf].modified and "bold,italic" or "bold" },
+		}
+	end,
+})

nvim/lua/plugins.lua

@@ -44,7 +44,7 @@ require("lazy").setup({
 	{
 		"nvim-treesitter/nvim-treesitter",
 		build = ":TSUpdate",
-		enabled = false,
+		enabled = true,
 	},
 	{
 		"neovim/nvim-lspconfig", -- Configurations for Nvim LSP
@@ -141,6 +141,39 @@ require("lazy").setup({
 			require("toggleterm").setup(opts)
 		end,
 	},
+	{
+		"lewis6991/gitsigns.nvim",
+		opts = {},
+	},
+	{
+		"folke/todo-comments.nvim",
+		dependencies = { "nvim-lua/plenary.nvim" },
+		opts = {},
+	},
+	{
+		"nvim-lualine/lualine.nvim",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
+		opts = { options = { globalstatus = true } },
+	},
+	{
+		"folke/trouble.nvim",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
+		opts = {
+			position = "right",
+			-- your configuration comes here
+			-- or leave it empty to use the default settings
+			-- refer to the configuration section below
+		},
+	},
+	{
+		"b0o/incline.nvim",
+		config = function()
+			require("incline").setup()
+			require("incline-config")
+		end,
+		-- Optional: Lazy load Incline
+		event = "VeryLazy",
+	},
 	{
 		"folke/which-key.nvim",
 		event = "VeryLazy",

nvim/lua/which-key-config.lua

@@ -4,6 +4,7 @@ wk.register({
 	t = {
 		["1"] = {
 			"<Cmd>BufferGoto 1<CR>",
+			"Go to Buffer 1",
 		},
 		d = {
 			"<Cmd>BufferClose<CR>",
@@ -28,6 +29,14 @@ wk.register({
 			"<cmd>Telescope help_tags<CR>",
 			"Find Help",
 		},
+		i = {
+			"<cmd>Telescope builtin<cr>",
+			"Search all Telescope builtins",
+		},
+		t = {
+			"<cmd>TodoTelescope <cr>",
+			"Open Todo in Telescope",
+		},
 	},
 	n = {
 		"Terminal",
@@ -47,4 +56,37 @@ wk.register({
 		"<cmd>lua vim.lsp.buf.rename()<CR>",
 		"Rename a token",
 	},
+	x = {
+		x = {
+			"<cmd>TroubleToggle<cr>",
+			"Open Trouble",
+		},
+		w = {
+			"<cmd>TroubleToggle workspace_diagnostics<cr>",
+			"",
+		},
+		d = {
+			"<cmd>TroubleToggle document_diagnostics<cr>",
+			"",
+		},
+		q = {
+			"<cmd>TroubleToggle quickfix<cr>",
+			"",
+		},
+		l = {
+			"<cmd>TroubleToggle loclist<cr>",
+			"",
+		},
+		r = {
+			"<cmd>TroubleToggle lsp_references<cr>",
+			"",
+		},
+	},
 }, { prefix = "<leader>" })
+
+wk.register({
+	["/"] = {
+		"<cmd>Telescope current_buffer_fuzzy_find<cr>",
+		"Search for a string in the current buffer",
+	},
+})