nvim

nvim/lua/config/cmp.lua

@@ -33,7 +33,7 @@ return function()
 			["<Down>"] = selectNext,
 			["<Tab>"] = selectNext,
 			["<C-c>"] = cmp.mapping.abort(),
-			["<CR>"] = utils.confirm({ select = true }),
+			["<CR>"] = utils.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
 		},
 		snippet = {
 			expand = function(args)
@@ -52,7 +52,7 @@ return function()
 		},
 		sources = {
 			{ name = "nvim_lsp" },
-			-- { name = "luasnip" },
+			{ name = "luasnip" },
 			{ name = "buffer" },
 			{ name = "path" },
 			{
@@ -66,10 +66,10 @@ return function()
 				},
 			},
 		},
-		experimental = {
-			ghost_text = {
-				hl_group = "NonText",
-			},
-		},
+		-- experimental = {
+		-- 	ghost_text = {
+		-- 		hl_group = "NonText",
+		-- 	},
+		-- },
 	}
 end

nvim/lua/config/gitsigns.lua

@@ -9,4 +9,14 @@ return {
         topdelete    = { text = icons.delete },
         changedelete = { text = icons.change },
     },
+    signs_staged = {
+        add          = { text = icons.add },
+        delete       = { text = icons.delete },
+        change       = { text = icons.change },
+        topdelete    = { text = icons.delete },
+        changedelete = { text = icons.change },
+    },
+    diff_opts = {
+        internal = true
+    }
 }

nvim/lua/config/lsp.lua

@@ -14,6 +14,8 @@ return {
 	servers = {
 		-- Bash
 		bashls = {},
+        -- C/C++
+        ccls = {},
 		-- PHP
 		-- intelephense = {},
 		phpactor = {

nvim/lua/config/lualine.lua

@@ -1,15 +1,15 @@
-local icons = require('config.icons')
-local separator = { "'" .. icons.separator .. "'", color = 'StatusLineSeparator' }
+local icons = require("config.icons")
+local separator = { "'" .. icons.separator .. "'", color = "StatusLineSeparator" }
 
 return {
 	options = {
 		globalstatus = true,
-		component_separators = '',
-		section_separators = '',
+		component_separators = "",
+		section_separators = "",
 		disabled_filetypes = {
 			statusline = {
-				'dashboard',
-			}
+				"dashboard",
+			},
 		},
 		theme = {
 			normal = {
@@ -32,11 +32,11 @@ return {
 				a = "StatusLineVisual",
 				z = "StatusLine",
 			},
-            replace = {
+			replace = {
 				a = "StatusLineReplace",
 				z = "StatusLine",
-			}
-		}
+			},
+		},
 	},
 	sections = {
 		lualine_a = {
@@ -45,49 +45,70 @@ return {
 		lualine_b = {
 			separator,
 			"branch",
-            separator,
-            '" " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))',
-            {
-                require("lazy.status").updates,
-                cond = require("lazy.status").has_updates,
-                color = { fg = "#ff9e64" },
-            },
+			separator,
+			'" " .. tostring(#vim.tbl_keys(vim.lsp.buf_get_clients()))',
+			{
+				require("lazy.status").updates,
+				cond = require("lazy.status").has_updates,
+				color = { fg = "#ff9e64" },
+			},
 			{
 				"diagnostics",
 				symbols = {
-					error = icons.diagnostics.error .. ' ',
-					warn = icons.diagnostics.warn .. ' ',
-					info = icons.diagnostics.info .. ' ',
-					hint = icons.diagnostics.hint .. ' ',
+					error = icons.diagnostics.error .. " ",
+					warn = icons.diagnostics.warn .. " ",
+					info = icons.diagnostics.info .. " ",
+					hint = icons.diagnostics.hint .. " ",
 				},
 			},
 			{
 				"diff",
 				symbols = {
-					added = icons.diff.added .. ' ',
-					modified = icons.diff.modified .. ' ',
-					removed = icons.diff.removed .. ' '
-				}
+					added = icons.diff.added .. " ",
+					modified = icons.diff.modified .. " ",
+					removed = icons.diff.removed .. " ",
+				},
 			},
-            separator,
+			separator,
 		},
 		lualine_c = {
-			'filename'
+			{
+				"filename",
+				path = 1,
+				symbols = {
+					modified = "+",
+					readonly = "[R]",
+					unnamed = "-",
+					newfile = "[New]",
+				},
+			},
 		},
 		lualine_x = {
-			'filetype',
-			'fileformat',
+			"filetype",
+			"fileformat",
 			'(vim.bo.expandtab and "SPC" or "TAB") .. " " .. vim.bo.shiftwidth',
 		},
 		lualine_y = {
 			separator,
-			'location',
-			'progress'
+			"location",
+			"progress",
+		},
+		lualine_z = {},
+	},
+	winbar = {
+		lualine_c = {
+			{ "filetype", icon_only = true },
+			"filename",
+		},
+	},
+	inactive_winbar = {
+		lualine_c = {
+			{ "filetype", icon_only = true },
+			"filename",
 		},
-		lualine_z = {}
 	},
 	extensions = {
-		'lazy',
-		'neo-tree'
-	}
+		"lazy",
+		"neo-tree",
+	},
 }

nvim/lua/config/telescope.lua

@@ -1,14 +1,17 @@
-local icons = require("config.icons")
-
 return function()
+	local icons = require("config.icons")
 	local actions = require("telescope.actions")
+
+	local dropdown_opts = {
+		previewer = false,
+		prompt_title = false,
+		layout_strategy = "horizontal",
+		layout_config = {
+			prompt_position = "top",
+		},
+	}
 	return {
 		defaults = {
-			border = {
-				prompt = { 1, 1, 1, 1 },
-				results = { 1, 1, 1, 1 },
-				preview = { 1, 1, 1, 1 },
-			},
 			path_display = { truncate = 1 },
 			prompt_prefix = " ",
 			selection_caret = icons.current .. " ",
@@ -27,19 +30,18 @@ return function()
 			find_files = {
 				hidden = true,
 			},
-			buffers = {
-                theme = "dropdown",
-                previewer = false,
+			buffers = vim.tbl_deep_extend("force", dropdown_opts, {
+				theme = "dropdown",
 				mappings = {
 					i = {
 						["<c-d>"] = actions.delete_buffer + actions.move_to_top,
 					},
 				},
-			},
+			}),
 		},
 		extensions = {
 			["ui-select"] = {
-				require("telescope.themes").get_dropdown(),
+				require("telescope.themes").get_dropdown(dropdown_opts),
 			},
 		},
 	}

nvim/lua/config/treesitter.lua

@@ -16,6 +16,7 @@ return {
 		"phpdoc",
 		"blade",
 		"go",
+        "gotmpl",
 		"gomod",
 		"gosum",
 		"javascript",