Reupload of all files with new additions

Expanding on the base settings, redone colours, feline and indent blank line and some extra settings

Signed-off-by: Ren B <127970608+Ren-B-7@users.noreply.github.com>

Author: Ren-B-7

nvim/lua/Installation-package/health.lua

@@ -4,81 +4,64 @@
 local dependencies = {}
 
 -- Ripgrep cmd and name
-local ripgrep = { cmd = 'rg', name = 'ripgrep',
-    install_method = string.format('sudo apt install %s', 'ripgrep')}
-table.insert(dependencies, ripgrep)
+table.insert(dependencies, { cmd = "rg", name = "ripgrep", install_method = string.format("sudo apt install %s", "ripgrep") })
 -- Curl cmd
-local curl = {cmd = 'curl', name = 'curl',
-    install_method = string.format('sudo apt install %s', 'curl')}
-table.insert(dependencies, curl)
+table.insert(dependencies, { cmd = "curl", name = "curl", install_method = string.format("sudo apt install %s", "curl") })
 -- lua
-local lua = {cmd = 'lua', name = 'lua',
-    install_method = string.format('sudo apt install %s', 'lua')}
-table.insert(dependencies, lua)
+table.insert(dependencies, { cmd = "lua", name = "lua", install_method = string.format("sudo apt install %s", "lua") })
 -- luarocks
-local luarocks = {cmd = 'luarocks', name = 'luarocks',
-    install_method = string.format('sudo apt install %s', 'luarocks')}
-table.insert(dependencies, luarocks)
+table.insert(dependencies, { cmd = "luarocks", name = "luarocks", install_method = string.format("sudo apt install %s", "luarocks") })
 -- git
-local git = {cmd = 'git', name = 'git',
-    install_method = string.format('sudo apt install %s', 'git')}
-table.insert(dependencies, git)
+table.insert(dependencies, { cmd = "git", name = "git", install_method = string.format("sudo apt install %s", "git") })
 -- python
-local python = {cmd = 'python', name = 'python',
-    install_method = string.format('sudo apt install %s3.12', 'python')}
-table.insert(dependencies, python)
+table.insert(dependencies, { cmd = "python", name = "python", install_method = string.format("sudo apt install %s3.12", "python") })
 -- pip
-local pip = {cmd = 'pip', name = 'pip',
-    install_method = string.format('sudo apt install python3-%s', 'pip')}
-table.insert(dependencies, pip)
+table.insert(dependencies, { cmd = "pip", name = "pip", install_method = string.format("sudo apt install python3-%s", "pip") })
 -- npm
-local npm = {cmd = 'npm', name = 'npm',
-    install_method = string.format('sudo apt install %s', 'npm')}
-table.insert(dependencies, npm)
+table.insert(dependencies, { cmd = "npm", name = "npm", install_method = string.format("sudo apt install %s", "npm") })
 -- fdfind
-local fdfind = {cmd = 'fdfind', name = 'fd-find',
-    install_method = string.format('sudo apt install %s', 'fd-find')}
-table.insert(dependencies, fdfind)
+table.insert(dependencies, { cmd = "fdfind", name = "fd-find", install_method = string.format("sudo apt install %s", "fd-find") })
 
 local attempt_cmd = function(opts)
-    if vim.fn.executable(opts.cmd) == 1 then
-        vim.health.ok(("Installed: %s"):format(opts.name))
-    else
-        vim.health.warn(("Missing: %s"):format(opts.name))
-        vim.health.info(opts.install_method)
-    end
+	if vim.fn.executable(opts.cmd) == 1 then
+		vim.health.ok(("Installed: %s"):format(opts.name))
+	else
+		vim.health.warn(("Missing: %s"):format(opts.name))
+		vim.health.info(opts.install_method)
+	end
 end
 
 local checkversion = function()
-    local versionstring = tostring(vim.version())
+	local versionstring = tostring(vim.version())
 
-    if not vim.version.ge then
-        vim.health.error("Nvim out of date")
-    end
+	if not vim.version.ge then
+		vim.health.error("Nvim out of date")
+	end
 
-    if vim.version.lt(vim.version(), "0.10-dev") then
-        vim.health.error(string.format("Nvim out of date, current: %s,  minimum: 0.10-dev", versionstring))
-    end
+	if vim.version.lt(vim.version(), "0.10-dev") then
+		vim.health.error(string.format("Nvim out of date, current: %s,  minimum: 0.10-dev", versionstring))
+	end
 end
 
 local checkrequire = function()
-    for _, deps in ipairs(dependencies) do
-        attempt_cmd(deps)
-    end
+	for _, deps in ipairs(dependencies) do
+		attempt_cmd(deps)
+	end
 end
 
 return {
-    check = function ()
-        -- vim.health.warn(vim.bo.fileformat:upper())
-        -- vim.health.warn(vim.uv.os_environ().DESKTOP_SESSION)
-        vim.health.start ("Nvim installation package")
+	check = function()
+		-- vim.health.warn(vim.bo.fileformat:upper())
+		-- vim.health.warn(vim.uv.os_environ().DESKTOP_SESSION)
+		vim.health.start("Nvim installation package")
 
-        vim.health.info("[Not all warns is a must fix from checkhealth]" .. '\n' ..  
-                        "plugins will complain if packages are missing")
+		vim.health.info(
+			"[Not all warns is a must fix from checkhealth]" .. "\n" .. "plugins will complain if packages are missing"
+		)
 
-        vim.health.info(string.format("System info: ".. vim.inspect(vim.uv.os_environ().DESKTOP_SESSION)))
+		vim.health.info(string.format("System info: " .. vim.inspect(vim.uv.os_environ().DESKTOP_SESSION)))
 
-        checkversion()
-        checkrequire()
-    end,
+		checkversion()
+		checkrequire()
+	end,
 }

nvim/lua/keymaps.lua

@@ -57,6 +57,6 @@ set("n", "<leader>tt", function()
 	require("utils.functions").toggle_list_and_col()
 end, { desc = "Toggles space and tab view, with line length" })
 
-set("n", "<C-L>", function()
+set("n", "<C-F>", function()
 	require("utils.functions").toggle_format_on_save()
 end, { desc = "Toggle format on save" })

nvim/lua/opts.lua

@@ -4,6 +4,7 @@ local opt = vim.opt
 g.loaded_netrw = 1
 g.loaded_netrwPlugin = 1
 g.mapleader = " "
+g.autoformat = 1
 
 opt.number = true
 opt.relativenumber = true
@@ -15,7 +16,7 @@ opt.shiftwidth = 4
 opt.textwidth = 80
 opt.expandtab = true
 
-opt.listchars = {eol = "¬",tab = ">>",trail = "·",space = "␣"}
+opt.listchars = { eol = "¬", tab = ">>", trail = "·", space = "␣" }
 
 vim.smartindent = true
 
@@ -27,7 +28,7 @@ opt.wrap = false
 
 opt.hlsearch = false
 opt.incsearch = true
-opt.inccommand = 'split'
+opt.inccommand = "split"
 
 opt.swapfile = false
 opt.backup = false

nvim/lua/plugins/catppuccin.lua

@@ -1,48 +1,57 @@
+local opts = {
+	flavour = "macchiato",
+	background = {
+		light = "latte",
+		dark = "macchiato",
+	},
+	term_colors = true,
+	dim_inactive = {
+		enabled = true,
+		shade = "dark",
+		percentage = 0.1,
+	},
+	styles = {
+		comments = { "italic" },
+		functions = { "bold" },
+		conditionals = { "underline" },
+	},
+	default_integrations = true,
+	integrations = {
+		cmp = true,
+		gitsigns = true,
+		harpoon = true,
+		indent_blankline = {
+			enabled = true,
+			colored_indent_levels = true,
+		},
+		lsp_trouble = true,
+		mason = true,
+		markdown = false,
+		mini = true,
+		native_lsp = {
+			enabled = true,
+			underlines = {
+				errors = { "undercurl" },
+				hints = { "undercurl" },
+				warnings = { "undercurl" },
+				information = { "undercurl" },
+			},
+		},
+		nvimtree = true,
+		nvim_surround = true,
+		telescope = true,
+		treesitter = true,
+		treesitter_context = true,
+		which_key = true,
+	},
+}
 return {
 	"catppuccin/nvim",
 	lazy = false,
 	priority = 1000,
 	name = "catppuccin",
 	config = function()
-		require("catppuccin").setup({})
-		vim.cmd.colorscheme("catppuccin-mocha")
+		require("catppuccin").setup(opts)
+		vim.cmd.colorscheme("catppuccin")
 	end,
-	opts = {
-		integrations = {
-			aerial = true,
-			alpha = true,
-			cmp = true,
-			dashboard = true,
-			flash = true,
-			grug_far = true,
-			gitsigns = true,
-			headlines = false,
-			illuminate = false,
-			indent_blankline = { enabled = true },
-			leap = false,
-			lsp_trouble = true,
-			mason = true,
-			markdown = false,
-			mini = true,
-			native_lsp = {
-				enabled = true,
-				underlines = {
-					errors = { "undercurl" },
-					hints = { "undercurl" },
-					warnings = { "undercurl" },
-					information = { "undercurl" },
-				},
-			},
-			navic = { enabled = true, custom_bg = "feline" },
-			neotest = false,
-			nvimtree = true,
-			noice = false,
-			notify = false,
-			semantic_tokens = true,
-			telescope = true,
-			treesitter = true,
-			treesitter_context = true,
-			which_key = true,
-		},
-	},
 }