Powershell_es is so perfect rn

autoload/neoformat/formatters/powershell.vim

@@ -0,0 +1,29 @@
+function! neoformat#formatters#powershell#enabled() abort
+    return ['pwshfmt']
+endfunction
+
+function! neoformat#formatters#powershell#pwshfmt() abort
+    "if has('win32') || has('win64')
+    "    let l:args = [
+    "        \ '-NoProfile',
+    "        \ '-Command',
+    "        \ 'Import-Module PSScriptAnalyzer; Invoke-Formatter -ScriptDefinition (\$input | Out-String)',
+    "        \ ]
+    "else
+    "    let l:args = [
+    "        \ '-NoProfile',
+    "        \ '-Command',
+    "        \ '"Import-Module (Resolve-Path \"/opt/powershell-editor-services/PSScriptAnalyzer/*/PSScriptAnalyzer.psd1\" | Select-Object -ExpandProperty Path); Invoke-Formatter -ScriptDefinition (\$input | Out-String)"'
+    "        \ ]
+    "endif
+    "
+return {
+        \ 'exe': 'pwsh',
+        \ 'args': [
+        \   '-NoProfile',
+        \   '-Command',
+        \   'Import-Module PSScriptAnalyzer; Invoke-Formatter -ScriptDefinition ($input | Out-String)'
+        \ ],
+        \ 'stdin': 1,
+        \ }
+endfunction

autoload/neoformat/formatters/ps1.vim

@@ -0,0 +1,12 @@
+function! neoformat#formatters#ps1#enabled() abort
+    return ['pwshfmt']
+endfunction
+
+function! neoformat#formatters#ps1#pwshfmt() abort
+    return {
+        \ 'exe': 'pwsh',
+        \ 'args': ['-NoProfile', '-Command',
+        \           '"Import-Module (Resolve-Path \"/opt/powershell-editor-services/PSScriptAnalyzer/*/PSScriptAnalyzer.psd1\" | Select-Object -ExpandProperty Path); Invoke-Formatter -ScriptDefinition (\$input | Out-String)"'],
+        \ 'stdin': 1
+        \ }
+endfunction

colors/zshell.lua

@@ -27,82 +27,82 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#171216",
+  bg = "#121318",
-  bg_alt = "#201A1F",
+  bg_alt = "#1A1B20",
-  bg_float = "#241E23",
+  bg_float = "#1E1F25",
-  bg_popup = "#2E282D",
+  bg_popup = "#292A2F",
-  bg_cursorline = pick("#2E282D", "#3A3338"),
+  bg_cursorline = pick("#292A2F", "#33343A"),
-  bg_fold = "#201A1F",
+  bg_fold = "#1A1B20",
-  bg_visual = "#5D3F5C",
+  bg_visual = "#3E4867",
-  bg_search = pick("#8CAB44", "#5D3F5C"),
+  bg_search = pick("#C177BE", "#3E4867"),
-  bg_incsearch = "#D285D3",
+  bg_incsearch = "#718EDF",
-  bg_selection = "#D285D3",
+  bg_selection = "#718EDF",
-  bg_statusline = pick("#2E282D", "#241E23"),
+  bg_statusline = pick("#292A2F", "#1E1F25"),
-  bg_statusline_nc = "#201A1F",
+  bg_statusline_nc = "#1A1B20",
-  bg_tabline = "#201A1F",
+  bg_tabline = "#1A1B20",
-  bg_tabsel = "#2E282D",
+  bg_tabsel = "#292A2F",
 
-  fg = "#EBDFE6",
+  fg = "#E3E2E9",
-  fg_muted = "#D2C2CE",
+  fg_muted = "#C4C6D3",
-  fg_subtle = "#9B8C98",
+  fg_subtle = "#8E909C",
-  fg_comment = pick("#9B8C98", "#4F434D"),
+  fg_comment = pick("#8E909C", "#444651"),
   fg_strong = pick("#1A1B1F", "#F2F2F7"),
   fg_on_soft = pick("#17181C", "#F4F4F8"),
 
-  border = "#4F434D",
+  border = "#444651",
-  accent = "#FCABFC",
+  accent = "#B3C5FF",
-  accent_container = "#D285D3",
+  accent_container = "#718EDF",
-  accent_fg = "#5B1961",
+  accent_fg = "#001748",
-  accent_solid_fg = "#53115A",
+  accent_solid_fg = "#002B75",
 
-  secondary = "#E2BADE",
+  secondary = "#BBC5EA",
-  secondary_container = "#5D3F5C",
+  secondary_container = "#3E4867",
-  secondary_fg = "#D3ADCF",
+  secondary_fg = "#ADB7DB",
-  secondary_solid_fg = "#422742",
+  secondary_solid_fg = "#252F4D",
 
-  tertiary = "#B2D266",
+  tertiary = "#FCACF7",
-  tertiary_container = "#8CAB44",
+  tertiary_container = "#C177BE",
-  tertiary_fg = "#2C3C00",
+  tertiary_fg = "#360039",
-  tertiary_solid_fg = "#263500",
+  tertiary_solid_fg = "#531356",
 
   error = "#FFB4AB",
   error_container = "#93000A",
   error_fg = "#FFDAD6",
   error_solid_fg = "#690005",
 
-  ok = "#FFBAC2",
+  ok = "#44DEF5",
-  warn = "#FFDDEA",
+  warn = "#FFDCF2",
-  info = "#B3A2D5",
+  info = "#90ACD5",
-  hint = "#FFBA93",
+  hint = "#9BCEFE",
-  add = "#FFBAC2",
+  add = "#44DEF5",
-  change = "#B3A2D5",
+  change = "#90ACD5",
-  delete = "#F248D2",
+  delete = "#947DFF",
 
-  cursor_fg = "#53115A",
+  cursor_fg = "#002B75",
-  cursor_bg = "#FCABFC",
+  cursor_bg = "#B3C5FF",
-  match_bg = "#8CAB44",
+  match_bg = "#C177BE",
-  match_fg = "#2C3C00",
+  match_fg = "#360039",
-  todo_bg = "#8CAB44",
+  todo_bg = "#C177BE",
-  todo_fg = "#2C3C00",
+  todo_fg = "#360039",
 
   -- Syntax accents must stay dynamic. These come from your generated palette
   -- instead of fixed hex values, so foregrounds change with the wallpaper too.
-  code_keyword = "#D994CF",
+  code_keyword = "#A6A3EE",
-  code_func = "#FFBA93",
+  code_func = "#9BCEFE",
-  code_string = "#FFBAC2",
+  code_string = "#44DEF5",
-  code_number = "#FFDDEA",
+  code_number = "#FFDCF2",
-  code_const = "#F248D2",
+  code_const = "#947DFF",
-  code_type = "#FCABFC",
+  code_type = "#B3C5FF",
-  code_special = "#B2D266",
+  code_special = "#FCACF7",
-  code_preproc = "#E2BADE",
+  code_preproc = "#BBC5EA",
-  code_builtin = "#FCABFC",
+  code_builtin = "#B3C5FF",
-  code_param = "#FFDDEA",
+  code_param = "#FFDCF2",
-  code_field = "#E2BADE",
+  code_field = "#BBC5EA",
-  code_namespace = "#B2D266",
+  code_namespace = "#FCACF7",
-  code_operator = pick("#FCABFC", "#E2BADE"),
+  code_operator = pick("#B3C5FF", "#BBC5EA"),
 
   line_current = pick("#232428", "#E7E7EC"),
-  ref_bg = pick("#3A3338", "#2E282D"),
+  ref_bg = pick("#33343A", "#292A2F"),
 }
 
 -- Core UI -------------------------------------------------------------------

ftplugin/qml.lua

@@ -1,12 +0,0 @@
-local gen_hook = MiniSplitjoin.gen_hook
-
-local curly = { brackets = { "%b{}" }, separator = ";" }
-local curly_semi = { brackets = { "%b{}" }, separator = ";" }
-local add_semicolon_curly = gen_hook.add_trailing_separator(curly)
-local remove_semicolon_curly = gen_hook.del_trailing_separator(curly)
-local pad_curly = gen_hook.pad_brackets(curly_semi)
-
-vim.b.minisplitjoin_config = {
-  split = { hooks_post = { remove_semicolon_curly } },
-  join = { hooks_pre = { add_semicolon_curly }, hooks_post = { pad_curly } },
-}

ftplugin/rust.lua

@@ -0,0 +1,18 @@
+local bufnr = vim.api.nvim_get_current_buf()
+vim.keymap.set(
+  "n",
+  "<leader>a",
+  function()
+    vim.cmd.RustLsp('codeAction') -- supports rust-analyzer's grouping
+    -- or vim.lsp.buf.codeAction() if you don't want grouping.
+  end,
+  { silent = true, buffer = bufnr }
+)
+vim.keymap.set(
+  "n",
+  "K",  -- Override Neovim's built-in hover keymap with rustaceanvim's hover actions
+  function()
+    vim.cmd.RustLsp({'hover', 'actions'})
+  end,
+  { silent = true, buffer = bufnr }
+)

lua/autocmd.lua

@@ -1,42 +1,40 @@
 local autocmd = vim.api.nvim_create_autocmd
 
 autocmd("LspAttach", {
-	callback = function(args)
+    callback = function(args)
-		local client = vim.lsp.get_client_by_id(args.data.client_id)
+        local client = vim.lsp.get_client_by_id(args.data.client_id)
-		if client then
+        if client then
-			vim.lsp.document_color.enable(false, { bufnr = args.buf })
+            vim.lsp.document_color.enable(false, { bufnr = args.buf })
-		end
+        end
-	end,
+    end,
 })
 
 autocmd("VimLeave", {
-  command = "set guicursor=a:ver25-Cursor",
+    command = "set guicursor=a:ver25-Cursor",
 })
 
 autocmd("BufWritePre", {
-  callback = function()
+    pattern = "*",
-    local ok = pcall(function()
+    callback = function(args)
-      vim.cmd "undojoin"
+        require("conform").format({ bufnr = args.buf })
-    end)
+    end,
-    vim.cmd "Neoformat"
-  end,
 })
 
 -- fWindows
 autocmd("VimLeavePre", {
-  group = vim.api.nvim_create_augroup("fuck_shada_temp", { clear = true }),
+    group = vim.api.nvim_create_augroup("fuck_shada_temp", { clear = true }),
-  pattern = { "*" },
+    pattern = { "*" },
-  callback = function()
+    callback = function()
-    local status = 0
+        local status = 0
-    for _, f in ipairs(vim.fn.globpath(vim.fn.stdpath "data" .. "/shada", "*tmp*", false, true)) do
+        for _, f in ipairs(vim.fn.globpath(vim.fn.stdpath "data" .. "/shada", "*tmp*", false, true)) do
-      if vim.tbl_isempty(vim.fn.readfile(f)) then
+            if vim.tbl_isempty(vim.fn.readfile(f)) then
-        status = status + vim.fn.delete(f)
+                status = status + vim.fn.delete(f)
-      end
+            end
-    end
+        end
-    if status ~= 0 then
+        if status ~= 0 then
-      vim.notify("Could not delete empty temporary ShaDa files.", vim.log.levels.ERROR)
+            vim.notify("Could not delete empty temporary ShaDa files.", vim.log.levels.ERROR)
-      vim.fn.getchar()
+            vim.fn.getchar()
-    end
+        end
-  end,
+    end,
-  desc = "Delete empty temp ShaDa files",
+    desc = "Delete empty temp ShaDa files",
 })

lua/config/format/conform.lua

@@ -0,0 +1,18 @@
+require("conform").setup {
+  formatters_by_ft = {
+    lua = { "stylua" },
+    python = { "ruff" },
+    rust = { "rustfmt" },
+    javascript = { "prettier" },
+    typescript = { "prettier" },
+    qml = { "qmlformat" },
+    go = { "gofmt" },
+    sh = { "shfmt" },
+    bash = { "shfmt" },
+    zsh = { "shfmt" },
+    ps1 = {},
+  },
+  format_on_save = {
+    lsp_fallback = true,
+  },
+}

lua/config/format/lspconfig.lua

@@ -3,296 +3,313 @@ local cmp_lsp = require "cmp_nvim_lsp"
 local cmp_kinds = require("assets.icons").icons.kinds
 
 local function flatten_to_array(t)
-	local res = {}
+    local res = {}
-	local function _flatten(tbl)
+    local function _flatten(tbl)
-		for _, v in ipairs(tbl) do
+        for _, v in ipairs(tbl) do
-			if type(v) == "table" then
+            if type(v) == "table" then
-				_flatten(v)
+                _flatten(v)
-			else
+            else
-				table.insert(res, v)
+                table.insert(res, v)
-			end
+            end
-		end
+        end
-	end
+    end
-	_flatten(t)
+    _flatten(t)
-	return res
+    return res
 end
 
-local capabilities = vim.tbl_deep_extend(
+local capabilities =
-	"force",
+    vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities())
-	{},
-	vim.lsp.protocol.make_client_capabilities(),
-    cmp_lsp.default_capabilities()
-)
 
 require("fidget").setup {}
-require("mason").setup()
 require("mason-lspconfig").setup {
-	automatic_enable = true,
+    automatic_enable = false,
-	ensure_installed = {
+    ensure_installed = {
-		"lua_ls",
+        "lua_ls",
         "qmlls",
-		"rust_analyzer",
+        "rust_analyzer",
-		"gopls",
+    },
-	},
+    handlers = {
-	handlers = {
+        function(server_name) -- default handler (optional)
-		function(server_name) -- default handler (optional)
+            require("lspconfig")[server_name].setup {
-			require("lspconfig")[server_name].setup {
+                capabilities = capabilities,
-				capabilities = capabilities,
+            }
-			}
+        end,
-		end,
 
-		["tailwindcss"] = function()
+        ["tailwindcss"] = function()
-			local lspconfig = require "lspconfig"
+            local lspconfig = require "lspconfig"
-			lspconfig.tailwindcss.setup {
+            lspconfig.tailwindcss.setup {
-				capabilities = capabilities,
+                capabilities = capabilities,
-			}
+            }
-		end,
+        end,
 
-		["css-lsp"] = function()
+        ["css-lsp"] = function()
-			local lspconfig = require "lspconfig"
+            local lspconfig = require "lspconfig"
-			lspconfig.cssls.setup {
+            lspconfig.cssls.setup {
-				capabilities = capabilities,
+                capabilities = capabilities,
-			}
+            }
-		end,
+        end,
 
-		zls = function()
+        ["rust_analyzer"] = function()
-			local lspconfig = require "lspconfig"
+            local lspconfig = require "lspconfig"
-			lspconfig.zls.setup {
+            lspconfig.rust_analyzer.setup {
-				capabilities = capabilities,
+                capabilities = capabilities,
-				root_dir = lspconfig.util.root_pattern(
+                settings = {
-					".git",
+                    ["rust-analyzer"] = {
-					"build.zig",
+                        cargo = { allFeatures = true },
-					"zls.json"
+                        checkOnSave = { command = "clippy" },
-				),
+                    },
-				settings = {
+                },
-					zls = {
+            }
-						enable_inlay_hints = true,
+        end,
-						enable_snippets = true,
+
-						warn_style = true,
+        zls = function()
-					},
+            local lspconfig = require "lspconfig"
-				},
+            lspconfig.zls.setup {
-			}
+                capabilities = capabilities,
-			vim.g.zig_fmt_parse_errors = 0
+                root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"),
-			vim.g.zig_fmt_autosave = 0
+                settings = {
-		end,
+                    zls = {
-		["lua_ls"] = function()
+                        enable_inlay_hints = true,
-			local lspconfig = require "lspconfig"
+                        enable_snippets = true,
-			lspconfig.lua_ls.setup {
+                        warn_style = true,
-				capabilities = capabilities,
+                    },
-				settings = {
+                },
-					Lua = {
+            }
-						runtime = { version = "Lua 5.1" },
+            vim.g.zig_fmt_parse_errors = 0
-						diagnostics = {
+            vim.g.zig_fmt_autosave = 0
-							globals = {
+        end,
-								"bit",
+
-								"vim",
+        ["lua_ls"] = function()
-								"it",
+            local lspconfig = require "lspconfig"
-								"describe",
+            lspconfig.lua_ls.setup {
-								"before_each",
+                capabilities = capabilities,
-								"after_each",
+                settings = {
-							},
+                    Lua = {
-						},
+                        runtime = { version = "Lua 5.1" },
-					},
+                        diagnostics = {
-				},
+                            globals = {
-			}
+                                "bit",
-		end,
+                                "vim",
-	},
+                                "it",
+                                "describe",
+                                "before_each",
+                                "after_each",
+                            },
+                        },
+                    },
+                },
+            }
+        end,
+    },
 }
 
 cmp.setup {
-	preselect = "None",
+    preselect = "None",
-	formatting = {
+    formatting = {
-		fields = { "kind", "abbr" },
+        fields = { "kind", "abbr" },
-		format = function(entry, vim_item)
+        format = function(entry, vim_item)
-			vim_item.kind = cmp_kinds[vim_item.kind] or ""
+            vim_item.kind = cmp_kinds[vim_item.kind] or ""
-			if entry.completion_item.detail then
+            if entry.completion_item.detail then
-				vim_item.menu = entry.completion_item.detail
+                vim_item.menu = entry.completion_item.detail
-			end
+            end
-			return vim_item
+            return vim_item
-		end,
+        end,
-	},
+    },
-	completion = { completeopt = "menu,menuone" },
+    completion = { completeopt = "menu,menuone" },
-	snippet = {
+    snippet = {
-		expand = function(args)
+        expand = function(args)
-			require("luasnip").lsp_expand(args.body)
+            require("luasnip").lsp_expand(args.body)
-		end,
+        end,
-	},
+    },
 
-	window = {
+    window = {
-		completion = cmp.config.window.bordered(),
+        completion = cmp.config.window.bordered(),
-		documentation = cmp.config.window.bordered(),
+        documentation = cmp.config.window.bordered(),
-	},
+    },
 
-	view = {
+    view = {
-		entries = "custom",
+        entries = "custom",
-	},
+    },
 
-	mapping = {
+    mapping = {
-		["<C-p>"] = cmp.mapping.select_prev_item(),
+        ["<C-p>"] = cmp.mapping.select_prev_item(),
-		["<C-n>"] = cmp.mapping.select_next_item(),
+        ["<C-n>"] = cmp.mapping.select_next_item(),
-		["<C-d>"] = cmp.mapping.scroll_docs(-4),
+        ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-		["<C-f>"] = cmp.mapping.scroll_docs(4),
+        ["<C-f>"] = cmp.mapping.scroll_docs(4),
-		["<C-Space>"] = cmp.mapping.complete(),
+        ["<C-Space>"] = cmp.mapping.complete(),
-		["<C-e>"] = cmp.mapping.close(),
+        ["<C-e>"] = cmp.mapping.close(),
-		["<CR>"] = cmp.mapping.confirm {
+        ["<CR>"] = cmp.mapping.confirm {
-			behavior = cmp.ConfirmBehavior.Insert,
+            behavior = cmp.ConfirmBehavior.Insert,
-			select = true,
+            select = true,
-		},
+        },
-		["<Tab>"] = cmp.mapping(function(fallback)
+        ["<Tab>"] = cmp.mapping(function(fallback)
-			if cmp.visible() then
+            if cmp.visible() then
-				cmp.select_next_item()
+                cmp.select_next_item()
-			elseif require("luasnip").expand_or_jumpable() then
+            elseif require("luasnip").expand_or_jumpable() then
-				require("luasnip").expand_or_jump()
+                require("luasnip").expand_or_jump()
-			else
+            else
-				fallback()
+                fallback()
-			end
+            end
-		end, { "i", "s" }),
+        end, { "i", "s" }),
-		["<S-Tab>"] = cmp.mapping(function(fallback)
+        ["<S-Tab>"] = cmp.mapping(function(fallback)
-			if cmp.visible() then
+            if cmp.visible() then
-				cmp.select_prev_item()
+                cmp.select_prev_item()
-			elseif require("luasnip").jumpable(-1) then
+            elseif require("luasnip").jumpable(-1) then
-				require("luasnip").jump(-1)
+                require("luasnip").jump(-1)
-			else
+            else
-				fallback()
+                fallback()
-			end
+            end
-		end, { "i", "s" }),
+        end, { "i", "s" }),
-	},
+    },
 
-	sources = cmp.config.sources {
+    sources = cmp.config.sources {
-		{ name = "path" },
+        { name = "path" },
-		{ name = "nvim_lsp" },
+        { name = "nvim_lsp" },
-		{ name = "luasnip" },
+        { name = "luasnip" },
-		{ name = "buffer" },
+        { name = "buffer" },
-		{ name = "nvim_lua" },
+        { name = "nvim_lua" },
         { name = "copilot" },
-	},
+    },
 }
 
 vim.diagnostic.config {
-	virtual_text = false,
+    virtual_text = false,
-	virtual_lines = false,
+    virtual_lines = false,
-	signs = true,
+    signs = true,
-	underline = true,
+    underline = true,
-	float = {
+    float = {
-		focusable = false,
+        focusable = false,
-		style = "minimal",
+        style = "minimal",
-		border = "rounded",
+        border = "rounded",
-		source = true,
+        source = true,
-		header = "",
+        header = "",
-		prefix = "",
+        prefix = "",
-	},
+    },
 }
 
 local lspconfig = vim.lsp.config
 
 lspconfig("texlab", {
-	cmd = { "texlab" },
+    cmd = { "texlab" },
-	filetypes = { "tex", "bib", "plaintex" },
+    filetypes = { "tex", "bib", "plaintex" },
-	root_markers = {
+    root_markers = {
-		".git",
+        ".git",
-		".latexmkrc",
+        ".latexmkrc",
-		"latexmkrc",
+        "latexmkrc",
-		".texlabroot",
+        ".texlabroot",
-		"texlabroot",
+        "texlabroot",
-		"Tectonic.toml",
+        "Tectonic.toml",
-	},
+    },
-	settings = {
+    settings = {
-		texlab = {
+        texlab = {
-			rootDirectory = nil,
+            rootDirectory = nil,
-			build = {
+            build = {
-				executable = "latexmk",
+                executable = "latexmk",
-				args = {
+                args = {
-					"-pdf",
+                    "-pdf",
-					"-interaction=nonstopmode",
+                    "-interaction=nonstopmode",
-					"-synctex=1",
+                    "-synctex=1",
-					"%f",
+                    "%f",
-				},
+                },
-				onSave = true,
+                onSave = true,
-				forwardSearchAfter = true,
+                forwardSearchAfter = true,
-			},
+            },
-			forwardSearch = {
+            forwardSearch = {
-				executable = "zathura",
+                executable = "zathura",
-				args = {
+                args = {
-					"--synctex-editor-command",
+                    "--synctex-editor-command",
-					[[ nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]]
+                    [[ nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
-						.. vim.v.servername,
+                    "--synctex-forward",
-					"--synctex-forward",
+                    "%l:1:%f",
-					"%l:1:%f",
+                    "%p",
-					"%p",
+                },
-				},
+            },
-			},
+            chktex = {
-			chktex = {
+                onEdit = false,
-				onEdit = false,
+                onOpenAndSave = true,
-				onOpenAndSave = true,
+            },
-			},
+            diagnosticsDelay = 300,
-			diagnosticsDelay = 300,
+            latexFormatter = "latexindent",
-			latexFormatter = "latexindent",
+            latexindent = {
-			latexindent = {
+                ["local"] = nil,
-				["local"] = nil,
+                modifyLineBreaks = false,
-				modifyLineBreaks = false,
+            },
-			},
+            bibtexFormatter = "texlab",
-			bibtexFormatter = "texlab",
+            formatterLineLength = 80,
-			formatterLineLength = 80,
+        },
-		},
+    },
-	},
 })
 
 lspconfig("qmlls", {
-	cmd = { "qmlls6", "qmlls" },
+    cmd = { "qmlls6", "qmlls" },
-	filetypes = { "qml", "qmljs" },
+    filetypes = { "qml", "qmljs" },
-	root_markers = { ".git" },
+    root_markers = { ".git" },
 })
 
 lspconfig("jsonls", {
-	settings = {
+    settings = {
-		json = {
+        json = {
-			schemas = require("schemastore").json.schemas(),
+            schemas = require("schemastore").json.schemas(),
-			validate = { enable = true },
+            validate = { enable = true },
-		},
+        },
-	},
+    },
+})
+
+lspconfig("powershell_es", {
+    settings = {
+        powershell = {
+            codeFormatting = {
+                preset = "Custom",
+                openBraceOnSameLine = true,
+                newLineAfterOpenBrace = false,
+                newLineAfterCloseBrace = true,
+                whitespaceBeforeOpenBrace = true,
+                whitespaceBeforeOpenParen = true,
+                whitespaceAroundOperator = true,
+                whitespaceAfterSeparator = true,
+                ignoreOneLineBlock = true,
+                pipelineIndentationStyle = "NoIndentation",
+            },
+        },
+    },
 })
 
 lspconfig("yamlls", {
-	settings = {
+    settings = {
-		yaml = {
+        yaml = {
-			schemaStore = {
+            schemaStore = {
-				enable = false,
+                enable = false,
-				url = "",
+                url = "",
-			},
+            },
-			schemas = require("schemastore").yaml.schemas(),
+            schemas = require("schemastore").yaml.schemas(),
-		},
+        },
-	},
+    },
 })
 
 local lspenable = vim.lsp.enable
 local servers = {
-	"html",
+    "html",
-	"bashls",
+    "bashls",
-	"pyright",
+    "pyright",
-	"ts_ls",
+    "ts_ls",
-	"texlab",
+    "texlab",
-	"sourcekit",
+    "sourcekit",
-	"qmlls",
+    "qmlls",
-	"tailwindcss",
+    "tailwindcss",
-	"systemd-lsp",
+    "systemd-lsp",
-	require("mason-lspconfig").get_installed_servers(),
+    require("mason-lspconfig").get_installed_servers(),
 }
 
 local flat_servers = flatten_to_array(servers)
 
 for _, server in ipairs(flat_servers) do
-	lspconfig(server, {
+    lspconfig(server, {
-		on_attach = function(client, bufnr)
+        on_attach = function(client)
-			if client.name == "typos_lsp" or client.name == "copilot" then
+            if client.name == "typos_lsp" or client.name == "copilot" then
-				return
+                return
-			end
+            end
-
+        end,
-			require("workspace-diagnostics").populate_workspace_diagnostics(
+        capabilities = capabilities,
-				client,
+    })
-				bufnr
+    lspenable(server)
-			)
-		end,
-		capabilities = capabilities,
-	})
-	lspenable(server)
 end

lua/config/format/neoformat.lua

@@ -1,19 +0,0 @@
-local M = {}
-
-M.plugin = {
-  "sbdchd/neoformat",
-  config = function()
-    vim.g.neoformat_enabled_lua = { "luaformatter" }
-    vim.g.neoformat_enabled_python = { "black" }
-    vim.g.neoformat_enabled_javascript = { "prettier" }
-    vim.g.neoformat_enabled_typescript = { "prettier" }
-    vim.g.neoformat_enabled_qml = { "qmlformat" }
-    vim.g.neoformat_enabled_go = { "gofmt" }
-    vim.g.neoformat_enabled_sh = { "shfmt" }
-    vim.g.neoformat_enabled_bash = { "shfmt" }
-    vim.g.neoformat_enabled_zsh = { "shfmt" }
-    vim.g.neoformat_enabled_powershell = { "pwshfmt" } -- experimental
-  end,
-}
-
-return M

lua/config/format/prettier.lua

@@ -11,6 +11,7 @@ prettier.setup({
 		"json",
 		"less",
 		"markdown",
+        "rust",
 		"scss",
 		"typescript",
 		"typescriptreact",

lua/config/gui/colorizer.lua

@@ -1,7 +1,7 @@
 require("colorizer").setup {
   user_default_options = {
     mode = "virtualtext",
-    virtualtext = "■",
+    virtualtext = "●",
     css = true,
     tailwind = true,
     sass = { enable = true, parsers = { "css" } },

lua/config/modules/undotree.lua

@@ -0,0 +1,20 @@
+require("undotree").setup {
+  float_diff = true,
+  layout = "left_bottom",
+  position = "left",
+  ignore_filetype = { "undotree", "undotreeDiff", "qf", "TelescopePrompt", "spectre_panel", "tsplayground" },
+  window = {
+    winblend = 30,
+  },
+  keymaps = {
+    ["move_next"] = "j",
+    ["move_prev"] = "k",
+    ["move2parent"] = "gj",
+    ["move_change_next"] = "J",
+    ["move_change_prev"] = "K",
+    ["action_enter"] = "<cr>",
+    ["enter_diffbuf"] = "p", -- is defined for both undotree and preview buffers, so it works as a toggle
+    ["quit"] = "q", -- is defined for both undotree and preview buffers
+    ["update_undotree_view"] = "S",
+  },
+}

lua/config/neovide.lua

@@ -0,0 +1,11 @@
+vim.g.neovide_cursor_trail_size = 0
+vim.g.neovide_floating_corner_radius = 0.4
+vim.o.guifont = "0xProto Nerd Font Mono:h12"
+vim.g.neovide_refresh_rate = 144
+vim.g.neovide_refresh_rate_idle = 144
+vim.g.neovide_no_idle = true
+vim.g.neovide_floating_blur_amount_x = 0
+vim.g.neovide_floating_blur_amount_y = 0
+vim.g.neovide_cursor_animation_length = 0.08
+vim.g.neovide_cursor_short_animation_length = 0.04
+vim.g.neovide_scroll_animation_length = 0.15

lua/config/other/notify.lua

@@ -1,20 +1,23 @@
 vim.notify = require('notify')
+local icons = require("assets.icons").icons
 local dap = require('dap')
 
 require('notify').setup({
+    -- background_colour = "#000000",
 	render = "wrapped-default",
+    animation = "slide",
 	timeout = 6000,
 	max_width = 50,
 	minimum_width = 50,
 	level = "info",
 	fps = 60,
 	icons = {
-		ERROR = "",
+		ERROR = icons.diagnostics.Error,
-		WARN = "",
+		WARN = icons.diagnostics.Warn,
-		INFO = "",
+		INFO = icons.diagnostics.Info,
 		DEBUG = "",
 		TRACE = "✎",
-	},
+	}, 
 	on_open = function(win)
 		-- vim.api.nvim_win_set_option(win, 'wrap', true)
 		vim.api.nvim_win_set_option(win, 'breakat', ' ')

lua/config/testfold.lua

@@ -1,15 +0,0 @@
-local i = {}
-
-function M.foldexpr()
-	local lnum = vim.v.lnum
-	local line = vim.fn.getline( lnum )
-	if line:find( "<think>", 1, true ) then
-		return "a1"
-	elseif line:find( "</think>", 1, true ) then
-		return "s1"
-	else
-		return "="
-	end
-end
-
-return M

lua/config/undotree.lua

@@ -1,19 +0,0 @@
-require('undotree').setup({
-	float_diff = true,  
-	layout = "left_bottom",
-	position = "left",
-	ignore_filetype = { 'undotree', 'undotreeDiff', 'qf', 'TelescopePrompt', 'spectre_panel', 'tsplayground' },
-	window = {
-		winblend = 30,
-	},
-	keymaps = {
-		['j'] = "move_next",
-		['k'] = "move_prev",
-		['gj'] = "move2parent",
-		['J'] = "move_change_next",
-		['K'] = "move_change_prev",
-		['<cr>'] = "action_enter",
-		['p'] = "enter_diffbuf",
-		['q'] = "quit",
-	},
-})

lua/lualine/themes/zshell.lua

@@ -6,19 +6,19 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#171216",
+  bg = "#121318",
-  bg_alt = "#201A1F",
+  bg_alt = "#1A1B20",
-  bg_mid = pick("#2E282D", "#241E23"),
+  bg_mid = pick("#292A2F", "#1E1F25"),
-  fg = "#EBDFE6",
+  fg = "#E3E2E9",
-  fg_muted = "#D2C2CE",
+  fg_muted = "#C4C6D3",
   fg_strong = pick("#15161A", "#F4F4F8"),
 
-  normal = "#D285D3",
+  normal = "#718EDF",
-  insert = "#5D3F5C",
+  insert = "#3E4867",
-  visual = "#8CAB44",
+  visual = "#C177BE",
   replace = "#93000A",
-  command = pick("#FFDDEA", "#B3A2D5"),
+  command = pick("#FFDCF2", "#90ACD5"),
-  inactive = "#201A1F",
+  inactive = "#1A1B20",
 
   normal_fg = pick("#15161A", "#F4F4F8"),
   insert_fg = pick("#15161A", "#F4F4F8"),

lua/mappings.lua

@@ -3,7 +3,7 @@ local map = vim.keymap.set
 -- Base nvim mappings, you need this.
 map("n", "<Tab>", "<Cmd>BufferLineCycleNext<CR>")
 map("n", "<S-Tab>", "<Cmd>BufferLineCyclePrev<CR>")
-map({"n", "v"}, "<leader>ap", require("actions-preview").code_actions)
+map({ "n", "v" }, "<leader>ap", require("actions-preview").code_actions)
 map("n", ";", ":", { desc = "CMD enter command mode" })
 map("v", "<C-Up>", ":m '<-2<CR>gv=gv", { desc = "Move selected text up" })
 map("v", "<C-Down>", ":m '>+1<CR>gv=gv", { desc = "Move selected text down" })
@@ -11,11 +11,24 @@ map("n", "<C-a>", "ggVG", { noremap = true, silent = true })
 map("n", "<C-j>", "<C-d>zz")
 map("n", "<C-k>", "<C-u>zz")
 map("n", "<A-->", ":bdelete<CR>")
+map("", "=", function()
+  require("conform").format({ async = true, lsp_fallback = true }, function(err)
+    if not err then
+      local mode = vim.api.nvim_get_mode().mode
+      if vim.startswith(string.lower(mode), "v") then
+        vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true)
+      end
+    end
+  end)
+end, { desc = "Format code" })
+
 -- map("n", "<SA-->", ":BufferRestore<CR>")
-map('n', '<leader>e', function() Snacks.explorer() end)
+map("n", "<leader>e", function()
-map('n', '<leader>u', require('undotree').toggle, { noremap = true, silent = true })
+  Snacks.explorer()
-map("n", "<leader>g", require("telescope.builtin").live_grep, {desc = "Telescope grep" })
+end)
-map("n", "<leader>f", require("telescope.builtin").find_files, {desc = "Telescope find files" })
+map("n", "<leader>g", require("telescope.builtin").live_grep, { desc = "Telescope grep" })
+map("n", "<leader>f", require("telescope.builtin").find_files, { desc = "Telescope find files" })
+map("n", "<leader>u", require("undotree").toggle, { noremap = true, silent = true })
 
 -- Copilot Chat buffer
 map("n", "<A-c>", vim.cmd.CopilotChatToggle)
@@ -27,17 +40,21 @@ map("n", "<leader>zig", "<cmd>LspRestart<cr>")
 
 -- Why?
 map("x", "<leader>p", [["_dP]])
-map({"n", "v"}, "<leader>y", [["+y]])
+map({ "n", "v" }, "<leader>y", [["+y]])
-map({"n", "v"}, "<leader>d", "\"_d")
+map({ "n", "v" }, "<leader>d", '"_d')
-map("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>");
+map("n", "<leader>mr", "<cmd>CellularAutomaton make_it_rain<CR>")
 map("n", "<leader><leader>", function()
-	vim.cmd("so")
+  vim.cmd "so"
 end)
 
 -- Greatest remap
 map("n", "<leader>Y", [["+Y]])
-map("n", "<A-q>", function() Snacks.terminal.toggle() end, { desc = "Toggle Terminal" })
+map("n", "<A-q>", function()
-map("n", "<leader>gb", function() Snacks.gitbrowse.open() end )
+  Snacks.terminal.toggle()
+end, { desc = "Toggle Terminal" })
+map("n", "<leader>gb", function()
+  Snacks.gitbrowse.open()
+end)
 map("n", "K", require("pretty_hover").hover)
 
 -- Might delete later
@@ -46,7 +63,7 @@ map("n", "<A-v>", "<cmd>ChatGPT<CR>")
 
 -- Notif history
 map("n", "<leader>n", function()
-	Snacks.notifier.show_history()
+  Snacks.notifier.show_history()
 end)
 
 -- Actions Previewer

lua/options.lua

@@ -13,14 +13,14 @@ vim.opt.wrap = true
 vim.opt.linebreak = true
 vim.opt.swapfile = false
 vim.opt.backup = false
-vim.opt.undodir = vim.fn.stdpath('data') .. '/undodir'
+vim.opt.undodir = vim.fn.stdpath "data" .. "/undodir"
 vim.opt.undofile = true
 vim.opt.hlsearch = false
 vim.opt.incsearch = true
 vim.opt.termguicolors = true
 vim.opt.scrolloff = 8
 vim.opt.signcolumn = "yes:1"
-vim.opt.isfname:append("@-@")
+vim.opt.isfname:append "@-@"
 vim.opt.updatetime = 50
 vim.opt.colorcolumn = "80"
 vim.opt.textwidth = 80
@@ -29,12 +29,11 @@ vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,
 vim.o.clipboard = "unnamedplus"
 vim.o.cursorline = true
 vim.o.cursorlineopt = "number"
+vim.o.number = true
 vim.opt.fillchars = { eob = " " }
 vim.o.ignorecase = true
 vim.o.smartcase = true
 vim.o.mouse = "a"
-vim.o.number = true
-vim.o.termguicolors = true
 vim.o.numberwidth = 3
 vim.o.ruler = false
 vim.o.showmode = false
@@ -52,6 +51,6 @@ local sep = is_windows and "\\" or "/"
 local delim = is_windows and ";" or ":"
 vim.env.PATH = table.concat({ vim.fn.stdpath "data", "mason", "bin" }, sep) .. delim .. vim.env.PATH
 
-vim.api.nvim_set_hl( 0, "Cursor", { reverse = true })
+vim.api.nvim_set_hl(0, "Cursor", { reverse = true })
 
 vim.g.tpipeline_restore = 1

lua/plugins/formatter.lua

@@ -1,12 +1,23 @@
 return {
-    {
+  {
-		"MeanderingProgrammer/render-markdown.nvim",
+    "MeanderingProgrammer/render-markdown.nvim",
-		dependencies = {
+    dependencies = {
-			"nvim-treesitter/nvim-treesitter",
+      "nvim-treesitter/nvim-treesitter",
-			"nvim-mini/mini.nvim",
+      "nvim-mini/mini.nvim",
-		},
-		---@module 'render-markdown'
-		---@type render.md.UserConfig
-		opts = require "config.format.markdown",
     },
+    ---@module 'render-markdown'
+    ---@type render.md.UserConfig
+    opts = require "config.format.markdown",
+  },
+  {
+    "mrcjkb/rustaceanvim",
+    version = "^9",
+    -- lazy = false,
+  },
+  {
+    "stevearc/conform.nvim",
+    config = function()
+      require "config.format.conform"
+    end,
+  },
 }

lua/plugins/git.lua

@@ -1,8 +1,8 @@
 return {
-	{
+  {
-		"lewis6991/gitsigns.nvim",
+    "lewis6991/gitsigns.nvim",
-		config = function()
+    config = function()
-			require("config.gitsigns")
+      require "config.other.gitsigns"
-		end
+    end,
-	}
+  },
 }

lua/plugins/init.lua

@@ -1,254 +1,227 @@
 return {
-  {
+    {
-    require "config.snacks",
+        require "config.snacks",
-  },
-  {
-    "nvim-mini/mini.nvim",
-    version = false,
-
-    modules = function()
-      require "config.mini-modules"
-    end,
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    lazy = false,
-    build = ":TSUpdate",
-    branch = "main",
-    config = function()
-      require "config.treesitter"
-    end,
-  },
-  {
-    "sainnhe/edge",
-    lazy = false,
-    priority = 1000,
-    config = function()
-      vim.g.edge_enable_italic = 1
-      vim.g.edge_style = "default"
-      vim.g.edge_menu_selection_background = "purple"
-    end,
-  },
-  {
-    "rmagatti/auto-session",
-    config = function()
-      require "config.autosession"
-    end,
-  },
-  {
-    "lambdalisue/vim-suda",
-    init = function()
-      vim.g.suda_smart_edit = 1
-    end,
-  },
-  {
-    "nvim-tree/nvim-web-devicons",
-  },
-  {
-    "akinsho/bufferline.nvim",
-    event = "VeryLazy",
-    config = function()
-      require "config.barbar"
-    end,
-  },
-  {
-    "mawkler/modicator.nvim",
-    config = function()
-      require "config.modicator"
-    end,
-  },
-  {
-    "shinchu/lightline-gruvbox.vim",
-  },
-  {
-    "jiaoshijie/undotree",
-    config = function()
-      require "config.undotree"
-    end,
-  },
-  {
-    "hiphish/rainbow-delimiters.nvim",
-    enabled = true,
-  },
-  {
-    "windwp/nvim-autopairs",
-    event = "InsertEnter",
-    config = function()
-      require "config.autopairs"
-    end,
-  },
-  {
-    "tpope/vim-fugitive",
-  },
-  {
-    "rcarriga/nvim-notify",
-    config = function()
-      require "config.notify"
-    end,
-  },
-  {
-    "zbirenbaum/copilot.lua",
-    cmd = "Copilot",
-    event = "InsertEnter",
-    config = function()
-      require "config.ai.copilot"
-    end,
-  },
-  {
-    "CopilotC-Nvim/CopilotChat.nvim",
-    dependencies = {
-      { "zbirenbaum/copilot.lua" },
-      { "nvim-lua/plenary.nvim", branch = "master" },
     },
-    build = "make tiktoken",
+    {
-    config = function()
+        "nvim-treesitter/nvim-treesitter",
-      require "config.ai.copilotchat"
+        lazy = false,
-    end,
+        build = ":TSUpdate",
-  },
+        branch = "main",
-  {
+        config = function()
-    "mfussenegger/nvim-dap",
+            require "config.modules.treesitter"
-    config = function()
+        end,
-      require "config.dapconf"
-    end,
-  },
-  {
-    "mason-org/mason-lspconfig.nvim",
-    opts = {},
-    dependencies = {
-      { "mason-org/mason.nvim", opts = {} },
-      "neovim/nvim-lspconfig",
     },
-  },
+    {
-  {
+        "sainnhe/edge",
-    "folke/lazydev.nvim",
+        lazy = false,
-    ft = "lua",
+        priority = 1000,
-    opts = function()
+        config = function()
-      require "config.lazydev"
+            vim.g.edge_enable_italic = 1
-    end,
+            vim.g.edge_style = "default"
-  },
+            vim.g.edge_menu_selection_background = "purple"
-  {
+        end,
-    "neovim/nvim-lspconfig",
-    enabled = true,
-    dependencies = {
-      -- "williamboman/mason.nvim",
-      -- "williamboman/mason-lspconfig.nvim",
-      "hrsh7th/cmp-nvim-lsp",
-      "hrsh7th/cmp-buffer",
-      "hrsh7th/cmp-path",
-      "hrsh7th/cmp-cmdline",
-      "hrsh7th/nvim-cmp",
-      "L3MON4D3/LuaSnip",
-      "saadparwaiz1/cmp_luasnip",
-      "j-hui/fidget.nvim",
-      "b0o/schemastore.nvim",
     },
-    config = function()
+    {
-      require "config.format.lspconfig"
+        "rmagatti/auto-session",
-    end,
+        config = function()
-  },
+            require "config.modules.autosession"
-  {
+        end,
-    "smolck/command-completion.nvim",
-    opts = {
-      border = nil,
-      highlight_selection = true,
-      use_matchfuzzy = true,
-      tab_completion = true,
     },
-  },
+    {
-  {
+        "lambdalisue/vim-suda",
-    "andweeb/presence.nvim",
+        init = function()
-  },
+            vim.g.suda_smart_edit = 1
-  {
+        end,
-    "mfussenegger/nvim-jdtls",
+    },
-  },
+    {
-  {
+        "nvim-tree/nvim-web-devicons",
-    "ziglang/zig.vim",
+    },
-  },
+    {
-  {
+        "akinsho/bufferline.nvim",
-    "mg979/vim-visual-multi",
+        event = "VeryLazy",
-    branch = "master",
+        config = function()
-  },
+            require "config.other.barbar"
-  {
+        end,
-    "elkowar/yuck.vim",
+    },
-  },
+    {
-  {
+        "mawkler/modicator.nvim",
-    "f3fora/nvim-texlabconfig",
+        config = function()
-    config = function()
+            require "config.gui.modicator"
-      require "config.format.texlab"
+        end,
-    end,
+    },
-    build = "go build",
+    {
-  },
+        "jiaoshijie/undotree",
-  {
+        config = function()
-    "lancewilhelm/horizon-extended.nvim",
+            require "config.modules.undotree"
-  },
+        end,
-  {
+    },
-    "vimpostor/vim-tpipeline",
+    {
-  },
+        "hiphish/rainbow-delimiters.nvim",
-  {
+        enabled = true,
-    "yazeed1s/minimal.nvim",
+    },
-    config = function()
+    {
-      vim.g.minimal_italic_comments = true
+        "windwp/nvim-autopairs",
-    end,
+        event = "InsertEnter",
-  },
+        config = function()
-  {
+            require "config.other.autopairs"
-    "ThePrimeagen/refactoring.nvim",
+        end,
-    config = function()
+    },
-      require "config.format.refactoring"
+    {
-    end,
+        "tpope/vim-fugitive",
-  },
+    },
-  {
+    {
-    "Yazeed1s/minimal.nvim",
+        "rcarriga/nvim-notify",
-    config = function()
+        config = function()
-      vim.g.minimal_italic_comments = true
+            require "config.other.notify"
-      vim.g.minimal_italic_functions = true
+        end,
-    end,
+    },
-  },
+    {
-  {
+        "zbirenbaum/copilot.lua",
-    "aserowy/tmux.nvim",
+        cmd = "Copilot",
-    config = function()
+        event = "InsertEnter",
-      require "config.terminal.tmux"
+        config = function()
-    end,
+            require "config.ai.copilot"
-  },
+        end,
-  {
+    },
-    "rachartier/tiny-inline-diagnostic.nvim",
+    {
-    config = function()
+        "CopilotC-Nvim/CopilotChat.nvim",
-      require "config.format.TID"
+        dependencies = {
-    end,
+            { "zbirenbaum/copilot.lua" },
-  },
+            { "nvim-lua/plenary.nvim", branch = "master" },
-  {
+        },
-    "ThePrimeagen/harpoon",
+        build = "make tiktoken",
-    branch = "harpoon2",
+        config = function()
-    dependencies = {
+            require "config.ai.copilotchat"
-      "nvim-lua/plenary.nvim",
+        end,
+    },
+    {
+        "mfussenegger/nvim-dap",
+        config = function()
+            require "config.other.dapconf"
+        end,
+    },
+    {
+        "mason-org/mason-lspconfig.nvim",
+        dependencies = {
+            { "mason-org/mason.nvim", opts = {} },
+            "neovim/nvim-lspconfig",
+        },
+    },
+    {
+        "folke/lazydev.nvim",
+        ft = "lua",
+        opts = function()
+            require "config.lazydev"
+        end,
+    },
+    {
+        "neovim/nvim-lspconfig",
+        enabled = true,
+        dependencies = {
+            -- "williamboman/mason.nvim",
+            -- "williamboman/mason-lspconfig.nvim",
+            "hrsh7th/cmp-nvim-lsp",
+            "hrsh7th/cmp-buffer",
+            "hrsh7th/cmp-path",
+            "hrsh7th/cmp-cmdline",
+            "hrsh7th/nvim-cmp",
+            "L3MON4D3/LuaSnip",
+            "saadparwaiz1/cmp_luasnip",
+            "j-hui/fidget.nvim",
+            "b0o/schemastore.nvim",
+        },
+        config = function()
+            require "config.format.lspconfig"
+        end,
+    },
+    {
+        "smolck/command-completion.nvim",
+        opts = {
+            border = nil,
+            highlight_selection = true,
+            use_matchfuzzy = true,
+            tab_completion = true,
+        },
+    },
+    {
+        "andweeb/presence.nvim",
+    },
+    {
+        "mfussenegger/nvim-jdtls",
+    },
+    {
+        "ziglang/zig.vim",
+    },
+    {
+        "mg979/vim-visual-multi",
+        branch = "master",
+    },
+    {
+        "elkowar/yuck.vim",
+    },
+    {
+        "f3fora/nvim-texlabconfig",
+        config = function()
+            require "config.format.texlab"
+        end,
+        build = "go build",
+    },
+    {
+        "lancewilhelm/horizon-extended.nvim",
+    },
+    {
+        "vimpostor/vim-tpipeline",
+    },
+    {
+        "Yazeed1s/minimal.nvim",
+        config = function()
+            vim.g.minimal_italic_comments = true
+            vim.g.minimal_italic_functions = true
+        end,
+    },
+    {
+        "aserowy/tmux.nvim",
+        config = function()
+            require "config.terminal.tmux"
+        end,
+    },
+    {
+        "rachartier/tiny-inline-diagnostic.nvim",
+        config = function()
+            require "config.format.TID"
+        end,
+    },
+    {
+        "ThePrimeagen/harpoon",
+        branch = "harpoon2",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+        },
+        config = function()
+            require "config.other.harpoon"
+        end,
+    },
+    {
+        "aznhe21/actions-preview.nvim",
+        config = function()
+            require "config.other.actions-preview"
+        end,
+    },
+    {
+        "Zacharias-Brohn/zterm-navigator.nvim",
+        config = function()
+            require "config.terminal.zterm-navigator"
+        end,
+    },
+    {
+        "Fildo7525/pretty_hover",
+        event = "LspAttach",
+        opts = {},
+    },
+    {
+        "jiaoshijie/undotree",
+        config = function()
+            require "config.modules.undotree"
+        end,
     },
-    config = function()
-      require "config.harpoon"
-    end,
-  },
-  {
-    "aznhe21/actions-preview.nvim",
-    config = function()
-      require "config.actions-preview"
-    end,
-  },
-  {
-    "sbdchd/neoformat",
-    config = function()
-      require "config.format.neoformat"
-    end,
-  },
-  {
-    "Zacharias-Brohn/zterm-navigator.nvim",
-    config = function()
-      require "config.terminal.zterm-navigator"
-    end,
-  },
-  {
-    "Fildo7525/pretty_hover",
-    event = "LspAttach",
-    opts = {},
-  },
-  {
-    "artemave/workspace-diagnostics.nvim",
-  },
 }

lua/plugins/telescope.lua

@@ -5,7 +5,7 @@ return {
 			"nvim-lua/plenary.nvim",
 		},
 		config = function()
-			require("config.telescope")
+			require("config.modules.telescope")
 		end,
 	},
 	{

lua/plugins/themes.lua

@@ -16,13 +16,13 @@ return {
 				})
 				vim.o.laststatus = 0
 			end
-			require("config.theme.lualine")
+			require("config.gui.lualine")
 		end,
 	},
 	{
 		"catgoose/nvim-colorizer.lua",
 		config = function()
-			require("config.theme.colorizer")
+			require("config.gui.colorizer")
 		end,
 	},
     {
@@ -30,7 +30,7 @@ return {
         enabled = false,
 		priority = 1000,
 		config = function()
-			require("config.theme.onedarkpro-light")
+			require("config.gui.themes.onedarkpro-light")
 		end,
 	},
 }

scripts/fWindows.ps1

@@ -15,7 +15,8 @@ $packages = @(
     "GNU.Wget2",
     "GnuWin32.UnZip",
     "GnuWin32.Gzip",
-    "7zip.7zip"
+    "7zip.7zip",
+    "PSScriptAnalyzer"
 )
 
 for ($i = 0; $i -lt $packages.Count; $i++) {