10 aug 2026

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

autoload/neoformat/formatters/pwsh.vim

@@ -1,25 +0,0 @@
-function! neoformat#formatters#pwsh#enabled() abort
-    return ['pwshfmt']
-endfunction
-
-function! neoformat#formatters#pwsh#pwshfmt() abort
-    if has('win32') || has('win64')
-        let l:args = [
-            \ '-NoProfile',
-            \ '-Command',
-            \ 'Invoke-Formatter',
-            \ ]
-    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': l:args,
-        \ 'stdin': 1,
-        \ }
-endfunction

colors/zshell.lua

@@ -27,43 +27,43 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#171216",
+  bg = "#141219",
-  bg_alt = "#201A1F",
+  bg_alt = "#1C1B21",
-  bg_float = "#241E23",
+  bg_float = "#201F25",
-  bg_popup = "#2E282D",
+  bg_popup = "#2B2930",
-  bg_cursorline = pick("#2E282D", "#3A3338"),
+  bg_cursorline = pick("#2B2930", "#36343B"),
-  bg_fold = "#201A1F",
+  bg_fold = "#1C1B21",
-  bg_visual = "#5D3F5C",
+  bg_visual = "#4A4169",
-  bg_search = pick("#8CAB44", "#5D3F5C"),
+  bg_search = pick("#882F73", "#4A4169"),
-  bg_incsearch = "#D285D3",
+  bg_incsearch = "#5840A7",
-  bg_selection = "#D285D3",
+  bg_selection = "#5840A7",
-  bg_statusline = pick("#2E282D", "#241E23"),
+  bg_statusline = pick("#2B2930", "#201F25"),
-  bg_statusline_nc = "#201A1F",
+  bg_statusline_nc = "#1C1B21",
-  bg_tabline = "#201A1F",
+  bg_tabline = "#1C1B21",
-  bg_tabsel = "#2E282D",
+  bg_tabsel = "#2B2930",
 
-  fg = "#EBDFE6",
+  fg = "#E6E0EA",
-  fg_muted = "#D2C2CE",
+  fg_muted = "#CAC4D4",
-  fg_subtle = "#9B8C98",
+  fg_subtle = "#938E9D",
-  fg_comment = pick("#9B8C98", "#4F434D"),
+  fg_comment = pick("#938E9D", "#484552"),
   fg_strong = pick("#1A1B1F", "#F2F2F7"),
   fg_on_soft = pick("#17181C", "#F4F4F8"),
 
-  border = "#4F434D",
+  border = "#484552",
-  accent = "#FCABFC",
+  accent = "#CCBDFF",
-  accent_container = "#D285D3",
+  accent_container = "#5840A7",
-  accent_fg = "#5B1961",
+  accent_fg = "#CCBDFF",
-  accent_solid_fg = "#53115A",
+  accent_solid_fg = "#351783",
 
-  secondary = "#E2BADE",
+  secondary = "#CBC0F0",
-  secondary_container = "#5D3F5C",
+  secondary_container = "#4A4169",
-  secondary_fg = "#D3ADCF",
+  secondary_fg = "#BAAFDD",
-  secondary_solid_fg = "#422742",
+  secondary_solid_fg = "#332B51",
 
-  tertiary = "#B2D266",
+  tertiary = "#FFADE3",
-  tertiary_container = "#8CAB44",
+  tertiary_container = "#882F73",
-  tertiary_fg = "#2C3C00",
+  tertiary_fg = "#FFACE3",
-  tertiary_solid_fg = "#263500",
+  tertiary_solid_fg = "#5E044E",
 
   error = "#FFB4AB",
   error_container = "#93000A",
@@ -71,38 +71,38 @@ local c = {
   error_solid_fg = "#690005",
 
   ok = "#FFBAC2",
-  warn = "#FFDDEA",
+  warn = "#FFDCF2",
-  info = "#B3A2D5",
+  info = "#9FA8D8",
-  hint = "#FFBA93",
+  hint = "#9DCEFF",
   add = "#FFBAC2",
-  change = "#B3A2D5",
+  change = "#9FA8D8",
-  delete = "#F248D2",
+  delete = "#BF68FF",
 
-  cursor_fg = "#53115A",
+  cursor_fg = "#351783",
-  cursor_bg = "#FCABFC",
+  cursor_bg = "#CCBDFF",
-  match_bg = "#8CAB44",
+  match_bg = "#882F73",
-  match_fg = "#2C3C00",
+  match_fg = "#FFACE3",
-  todo_bg = "#8CAB44",
+  todo_bg = "#882F73",
-  todo_fg = "#2C3C00",
+  todo_fg = "#FFACE3",
 
   -- 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 = "#BE9CE6",
-  code_func = "#FFBA93",
+  code_func = "#9DCEFF",
   code_string = "#FFBAC2",
-  code_number = "#FFDDEA",
+  code_number = "#FFDCF2",
-  code_const = "#F248D2",
+  code_const = "#BF68FF",
-  code_type = "#FCABFC",
+  code_type = "#CCBDFF",
-  code_special = "#B2D266",
+  code_special = "#FFADE3",
-  code_preproc = "#E2BADE",
+  code_preproc = "#CBC0F0",
-  code_builtin = "#FCABFC",
+  code_builtin = "#CCBDFF",
-  code_param = "#FFDDEA",
+  code_param = "#FFDCF2",
-  code_field = "#E2BADE",
+  code_field = "#CBC0F0",
-  code_namespace = "#B2D266",
+  code_namespace = "#FFADE3",
-  code_operator = pick("#FCABFC", "#E2BADE"),
+  code_operator = pick("#CCBDFF", "#CBC0F0"),
 
   line_current = pick("#232428", "#E7E7EC"),
-  ref_bg = pick("#3A3338", "#2E282D"),
+  ref_bg = pick("#36343B", "#2B2930"),
 }
 
 -- Core UI -------------------------------------------------------------------

lua/config/format/lspconfig.lua

@@ -17,12 +17,8 @@ local function flatten_to_array(t)
   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()
@@ -59,11 +55,7 @@ require("mason-lspconfig").setup {
       local lspconfig = require "lspconfig"
       lspconfig.zls.setup {
         capabilities = capabilities,
-				root_dir = lspconfig.util.root_pattern(
+        root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"),
-					".git",
-					"build.zig",
-					"zls.json"
-				),
         settings = {
           zls = {
             enable_inlay_hints = true,
@@ -214,8 +206,7 @@ lspconfig("texlab", {
         executable = "zathura",
         args = {
           "--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",
           "%l:1:%f",
           "%p",
@@ -286,11 +277,6 @@ for _, server in ipairs(flat_servers) do
       if client.name == "typos_lsp" or client.name == "copilot" then
         return
       end
-
-			require("workspace-diagnostics").populate_workspace_diagnostics(
-				client,
-				bufnr
-			)
     end,
     capabilities = capabilities,
   })

lua/config/format/neoformat.lua

@@ -13,7 +13,7 @@ M.plugin = {
     vim.g.neoformat_enabled_bash = { "shfmt" }
     vim.g.neoformat_enabled_zsh = { "shfmt" }
     vim.g.neoformat_enabled_rust = { "rustfmt" }
-    vim.g.neoformat_enabled_pwsh = { "pwshfmt" }
+    vim.g.neoformat_enabled_ps1 = { "pwshfmt" }
   end,
 }
 

lua/config/modules/undotree.lua

@@ -0,0 +1,30 @@
+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",
+    ["quit"] = "q",
+  },
+  -- Deprecated
+  -- 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/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,17 +1,20 @@
 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 = "✎",
 	}, 

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 = "#141219",
-  bg_alt = "#201A1F",
+  bg_alt = "#1C1B21",
-  bg_mid = pick("#2E282D", "#241E23"),
+  bg_mid = pick("#2B2930", "#201F25"),
-  fg = "#EBDFE6",
+  fg = "#E6E0EA",
-  fg_muted = "#D2C2CE",
+  fg_muted = "#CAC4D4",
   fg_strong = pick("#15161A", "#F4F4F8"),
 
-  normal = "#D285D3",
+  normal = "#5840A7",
-  insert = "#5D3F5C",
+  insert = "#4A4169",
-  visual = "#8CAB44",
+  visual = "#882F73",
   replace = "#93000A",
-  command = pick("#FFDDEA", "#B3A2D5"),
+  command = pick("#FFDCF2", "#9FA8D8"),
-  inactive = "#201A1F",
+  inactive = "#1C1B21",
 
   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" })
@@ -12,10 +12,12 @@ map("n", "<C-j>", "<C-d>zz")
 map("n", "<C-k>", "<C-u>zz")
 map("n", "<A-->", ":bdelete<CR>")
 -- 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("config.modules.undotree").toggle, { noremap = true, silent = true })
 
 -- Copilot Chat buffer
 map("n", "<A-c>", vim.cmd.CopilotChatToggle)
@@ -27,17 +29,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

lua/options.lua

@@ -29,11 +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.numberwidth = 3
 vim.o.ruler = false
 vim.o.showmode = false

lua/plugins/formatter.lua

@@ -10,8 +10,17 @@ return {
     opts = require "config.format.markdown",
   },
   {
-      'mrcjkb/rustaceanvim',
+    "mrcjkb/rustaceanvim",
-      version = '^9',
+    version = "^9",
     -- lazy = false,
   },
+  {
+    "sbdchd/neoformat",
+    config = function()
+      require "config.format.neoformat"
+    end,
+    -- init = function()
+    --   vim.cmd("source" .. vim.fn.stdpath "config" .. "/lua/config/test.vim")
+    -- end,
+  },
 }

lua/plugins/git.lua

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

lua/plugins/init.lua

@@ -1,14 +1,6 @@
 return {
   {
-    require "config.snacks",
+	require("config.snacks")
-  },
-  {
-    "nvim-mini/mini.nvim",
-    version = false,
-
-    modules = function()
-      require "config.mini-modules"
-    end,
   },
   {
     "nvim-treesitter/nvim-treesitter",
@@ -16,7 +8,7 @@ return {
     build = ":TSUpdate",
     branch = "main",
     config = function()
-      require "config.treesitter"
+      require("config.modules.treesitter")
     end,
   },
   {
@@ -32,7 +24,7 @@ return {
   {
     "rmagatti/auto-session",
     config = function()
-      require "config.autosession"
+      require("config.modules.autosession")
     end,
   },
   {
@@ -48,22 +40,19 @@ return {
     "akinsho/bufferline.nvim",
     event = "VeryLazy",
     config = function()
-      require "config.barbar"
+      require("config.other.barbar")
     end,
   },
   {
     "mawkler/modicator.nvim",
     config = function()
-      require "config.modicator"
+      require("config.gui.modicator")
     end,
   },
-  {
-    "shinchu/lightline-gruvbox.vim",
-  },
   {
     "jiaoshijie/undotree",
     config = function()
-      require "config.undotree"
+      require("config.modules.undotree")
     end,
   },
   {
@@ -74,7 +63,7 @@ return {
     "windwp/nvim-autopairs",
     event = "InsertEnter",
     config = function()
-      require "config.autopairs"
+      require("config.other.autopairs")
     end,
   },
   {
@@ -83,7 +72,7 @@ return {
   {
     "rcarriga/nvim-notify",
     config = function()
-      require "config.notify"
+      require("config.other.notify")
     end,
   },
   {
@@ -91,7 +80,7 @@ return {
     cmd = "Copilot",
     event = "InsertEnter",
     config = function()
-      require "config.ai.copilot"
+      require("config.ai.copilot")
     end,
   },
   {
@@ -102,13 +91,13 @@ return {
     },
     build = "make tiktoken",
     config = function()
-      require "config.ai.copilotchat"
+      require("config.ai.copilotchat")
     end,
   },
   {
     "mfussenegger/nvim-dap",
     config = function()
-      require "config.dapconf"
+      require("config.other.dapconf")
     end,
   },
   {
@@ -123,7 +112,7 @@ return {
     "folke/lazydev.nvim",
     ft = "lua",
     opts = function()
-      require "config.lazydev"
+      require("config.lazydev")
     end,
   },
   {
@@ -143,7 +132,7 @@ return {
       "b0o/schemastore.nvim",
     },
     config = function()
-      require "config.format.lspconfig"
+      require("config.format.lspconfig")
     end,
   },
   {
@@ -174,7 +163,7 @@ return {
   {
     "f3fora/nvim-texlabconfig",
     config = function()
-      require "config.format.texlab"
+      require("config.format.texlab")
     end,
     build = "go build",
   },
@@ -184,12 +173,6 @@ return {
   {
     "vimpostor/vim-tpipeline",
   },
-  {
-    "yazeed1s/minimal.nvim",
-    config = function()
-      vim.g.minimal_italic_comments = true
-    end,
-  },
   {
     "Yazeed1s/minimal.nvim",
     config = function()
@@ -200,13 +183,13 @@ return {
   {
     "aserowy/tmux.nvim",
     config = function()
-      require "config.terminal.tmux"
+      require("config.terminal.tmux")
     end,
   },
   {
     "rachartier/tiny-inline-diagnostic.nvim",
     config = function()
-      require "config.format.TID"
+      require("config.format.TID")
     end,
   },
   {
@@ -216,25 +199,19 @@ return {
       "nvim-lua/plenary.nvim",
     },
     config = function()
-      require "config.harpoon"
+      require("config.other.harpoon")
     end,
   },
   {
     "aznhe21/actions-preview.nvim",
     config = function()
-      require "config.actions-preview"
+      require("config.other.actions-preview")
-    end,
-  },
-  {
-    "sbdchd/neoformat",
-    config = function()
-      require "config.format.neoformat"
     end,
   },
   {
     "Zacharias-Brohn/zterm-navigator.nvim",
     config = function()
-      require "config.terminal.zterm-navigator"
+      require("config.terminal.zterm-navigator")
     end,
   },
   {
@@ -242,7 +219,4 @@ return {
     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,
 	},
 }