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

colors/zshell.lua

@@ -27,82 +27,82 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#141219",
-  bg_alt = "#1C1B21",
-  bg_float = "#201F25",
-  bg_popup = "#2B2930",
-  bg_cursorline = pick("#2B2930", "#36343B"),
-  bg_fold = "#1C1B21",
-  bg_visual = "#4A4169",
-  bg_search = pick("#882F73", "#4A4169"),
-  bg_incsearch = "#5840A7",
-  bg_selection = "#5840A7",
-  bg_statusline = pick("#2B2930", "#201F25"),
-  bg_statusline_nc = "#1C1B21",
-  bg_tabline = "#1C1B21",
-  bg_tabsel = "#2B2930",
+  bg = "#121318",
+  bg_alt = "#1A1B20",
+  bg_float = "#1E1F25",
+  bg_popup = "#292A2F",
+  bg_cursorline = pick("#292A2F", "#33343A"),
+  bg_fold = "#1A1B20",
+  bg_visual = "#3E4867",
+  bg_search = pick("#C177BE", "#3E4867"),
+  bg_incsearch = "#718EDF",
+  bg_selection = "#718EDF",
+  bg_statusline = pick("#292A2F", "#1E1F25"),
+  bg_statusline_nc = "#1A1B20",
+  bg_tabline = "#1A1B20",
+  bg_tabsel = "#292A2F",
 
-  fg = "#E6E0EA",
-  fg_muted = "#CAC4D4",
-  fg_subtle = "#938E9D",
-  fg_comment = pick("#938E9D", "#484552"),
+  fg = "#E3E2E9",
+  fg_muted = "#C4C6D3",
+  fg_subtle = "#8E909C",
+  fg_comment = pick("#8E909C", "#444651"),
   fg_strong = pick("#1A1B1F", "#F2F2F7"),
   fg_on_soft = pick("#17181C", "#F4F4F8"),
 
-  border = "#484552",
-  accent = "#CCBDFF",
-  accent_container = "#5840A7",
-  accent_fg = "#CCBDFF",
-  accent_solid_fg = "#351783",
+  border = "#444651",
+  accent = "#B3C5FF",
+  accent_container = "#718EDF",
+  accent_fg = "#001748",
+  accent_solid_fg = "#002B75",
 
-  secondary = "#CBC0F0",
-  secondary_container = "#4A4169",
-  secondary_fg = "#BAAFDD",
-  secondary_solid_fg = "#332B51",
+  secondary = "#BBC5EA",
+  secondary_container = "#3E4867",
+  secondary_fg = "#ADB7DB",
+  secondary_solid_fg = "#252F4D",
 
-  tertiary = "#FFADE3",
-  tertiary_container = "#882F73",
-  tertiary_fg = "#FFACE3",
-  tertiary_solid_fg = "#5E044E",
+  tertiary = "#FCACF7",
+  tertiary_container = "#C177BE",
+  tertiary_fg = "#360039",
+  tertiary_solid_fg = "#531356",
 
   error = "#FFB4AB",
   error_container = "#93000A",
   error_fg = "#FFDAD6",
   error_solid_fg = "#690005",
 
-  ok = "#FFBAC2",
+  ok = "#44DEF5",
   warn = "#FFDCF2",
-  info = "#9FA8D8",
-  hint = "#9DCEFF",
-  add = "#FFBAC2",
-  change = "#9FA8D8",
-  delete = "#BF68FF",
+  info = "#90ACD5",
+  hint = "#9BCEFE",
+  add = "#44DEF5",
+  change = "#90ACD5",
+  delete = "#947DFF",
 
-  cursor_fg = "#351783",
-  cursor_bg = "#CCBDFF",
-  match_bg = "#882F73",
-  match_fg = "#FFACE3",
-  todo_bg = "#882F73",
-  todo_fg = "#FFACE3",
+  cursor_fg = "#002B75",
+  cursor_bg = "#B3C5FF",
+  match_bg = "#C177BE",
+  match_fg = "#360039",
+  todo_bg = "#C177BE",
+  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 = "#BE9CE6",
-  code_func = "#9DCEFF",
-  code_string = "#FFBAC2",
+  code_keyword = "#A6A3EE",
+  code_func = "#9BCEFE",
+  code_string = "#44DEF5",
   code_number = "#FFDCF2",
-  code_const = "#BF68FF",
-  code_type = "#CCBDFF",
-  code_special = "#FFADE3",
-  code_preproc = "#CBC0F0",
-  code_builtin = "#CCBDFF",
+  code_const = "#947DFF",
+  code_type = "#B3C5FF",
+  code_special = "#FCACF7",
+  code_preproc = "#BBC5EA",
+  code_builtin = "#B3C5FF",
   code_param = "#FFDCF2",
-  code_field = "#CBC0F0",
-  code_namespace = "#FFADE3",
-  code_operator = pick("#CCBDFF", "#CBC0F0"),
+  code_field = "#BBC5EA",
+  code_namespace = "#FCACF7",
+  code_operator = pick("#B3C5FF", "#BBC5EA"),
 
   line_current = pick("#232428", "#E7E7EC"),
-  ref_bg = pick("#36343B", "#2B2930"),
+  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 } },
-}

lua/autocmd.lua

@@ -1,42 +1,40 @@
 local autocmd = vim.api.nvim_create_autocmd
 
 autocmd("LspAttach", {
-  callback = function(args)
-    local client = vim.lsp.get_client_by_id(args.data.client_id)
-    if client then
-      vim.lsp.document_color.enable(false, { bufnr = args.buf })
-    end
-  end,
+    callback = function(args)
+        local client = vim.lsp.get_client_by_id(args.data.client_id)
+        if client then
+            vim.lsp.document_color.enable(false, { bufnr = args.buf })
+        end
+    end,
 })
 
 autocmd("VimLeave", {
-  command = "set guicursor=a:ver25-Cursor",
+    command = "set guicursor=a:ver25-Cursor",
 })
 
 autocmd("BufWritePre", {
-  callback = function()
-    local ok = pcall(function()
-      vim.cmd "undojoin"
-    end)
-    vim.cmd "Neoformat"
-  end,
+    pattern = "*",
+    callback = function(args)
+        require("conform").format({ bufnr = args.buf })
+    end,
 })
 
 -- fWindows
 autocmd("VimLeavePre", {
-  group = vim.api.nvim_create_augroup("fuck_shada_temp", { clear = true }),
-  pattern = { "*" },
-  callback = function()
-    local status = 0
-    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
-        status = status + vim.fn.delete(f)
-      end
-    end
-    if status ~= 0 then
-      vim.notify("Could not delete empty temporary ShaDa files.", vim.log.levels.ERROR)
-      vim.fn.getchar()
-    end
-  end,
-  desc = "Delete empty temp ShaDa files",
+    group = vim.api.nvim_create_augroup("fuck_shada_temp", { clear = true }),
+    pattern = { "*" },
+    callback = function()
+        local status = 0
+        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
+                status = status + vim.fn.delete(f)
+            end
+        end
+        if status ~= 0 then
+            vim.notify("Could not delete empty temporary ShaDa files.", vim.log.levels.ERROR)
+            vim.fn.getchar()
+        end
+    end,
+    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,282 +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 function _flatten(tbl)
-    for _, v in ipairs(tbl) do
-      if type(v) == "table" then
-        _flatten(v)
-      else
-        table.insert(res, v)
-      end
+    local res = {}
+    local function _flatten(tbl)
+        for _, v in ipairs(tbl) do
+            if type(v) == "table" then
+                _flatten(v)
+            else
+                table.insert(res, v)
+            end
+        end
     end
-  end
-  _flatten(t)
-  return res
+    _flatten(t)
+    return res
 end
 
 local capabilities =
-  vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities())
+    vim.tbl_deep_extend("force", {}, vim.lsp.protocol.make_client_capabilities(), cmp_lsp.default_capabilities())
 
 require("fidget").setup {}
-require("mason").setup()
 require("mason-lspconfig").setup {
-  automatic_enable = true,
-  ensure_installed = {
-    "lua_ls",
-    "qmlls",
-    "rust_analyzer",
-    "gopls",
-  },
-  handlers = {
-    function(server_name) -- default handler (optional)
-      require("lspconfig")[server_name].setup {
-        capabilities = capabilities,
-      }
-    end,
+    automatic_enable = false,
+    ensure_installed = {
+        "lua_ls",
+        "qmlls",
+        "rust_analyzer",
+    },
+    handlers = {
+        function(server_name) -- default handler (optional)
+            require("lspconfig")[server_name].setup {
+                capabilities = capabilities,
+            }
+        end,
 
-    ["tailwindcss"] = function()
-      local lspconfig = require "lspconfig"
-      lspconfig.tailwindcss.setup {
-        capabilities = capabilities,
-      }
-    end,
+        ["tailwindcss"] = function()
+            local lspconfig = require "lspconfig"
+            lspconfig.tailwindcss.setup {
+                capabilities = capabilities,
+            }
+        end,
 
-    ["css-lsp"] = function()
-      local lspconfig = require "lspconfig"
-      lspconfig.cssls.setup {
-        capabilities = capabilities,
-      }
-    end,
+        ["css-lsp"] = function()
+            local lspconfig = require "lspconfig"
+            lspconfig.cssls.setup {
+                capabilities = capabilities,
+            }
+        end,
 
-    zls = function()
-      local lspconfig = require "lspconfig"
-      lspconfig.zls.setup {
-        capabilities = capabilities,
-        root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"),
-        settings = {
-          zls = {
-            enable_inlay_hints = true,
-            enable_snippets = true,
-            warn_style = true,
-          },
-        },
-      }
-      vim.g.zig_fmt_parse_errors = 0
-      vim.g.zig_fmt_autosave = 0
-    end,
-    ["lua_ls"] = function()
-      local lspconfig = require "lspconfig"
-      lspconfig.lua_ls.setup {
-        capabilities = capabilities,
-        settings = {
-          Lua = {
-            runtime = { version = "Lua 5.1" },
-            diagnostics = {
-              globals = {
-                "bit",
-                "vim",
-                "it",
-                "describe",
-                "before_each",
-                "after_each",
-              },
-            },
-          },
-        },
-      }
-    end,
-  },
+        ["rust_analyzer"] = function()
+            local lspconfig = require "lspconfig"
+            lspconfig.rust_analyzer.setup {
+                capabilities = capabilities,
+                settings = {
+                    ["rust-analyzer"] = {
+                        cargo = { allFeatures = true },
+                        checkOnSave = { command = "clippy" },
+                    },
+                },
+            }
+        end,
+
+        zls = function()
+            local lspconfig = require "lspconfig"
+            lspconfig.zls.setup {
+                capabilities = capabilities,
+                root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"),
+                settings = {
+                    zls = {
+                        enable_inlay_hints = true,
+                        enable_snippets = true,
+                        warn_style = true,
+                    },
+                },
+            }
+            vim.g.zig_fmt_parse_errors = 0
+            vim.g.zig_fmt_autosave = 0
+        end,
+
+        ["lua_ls"] = function()
+            local lspconfig = require "lspconfig"
+            lspconfig.lua_ls.setup {
+                capabilities = capabilities,
+                settings = {
+                    Lua = {
+                        runtime = { version = "Lua 5.1" },
+                        diagnostics = {
+                            globals = {
+                                "bit",
+                                "vim",
+                                "it",
+                                "describe",
+                                "before_each",
+                                "after_each",
+                            },
+                        },
+                    },
+                },
+            }
+        end,
+    },
 }
 
 cmp.setup {
-  preselect = "None",
-  formatting = {
-    fields = { "kind", "abbr" },
-    format = function(entry, vim_item)
-      vim_item.kind = cmp_kinds[vim_item.kind] or ""
-      if entry.completion_item.detail then
-        vim_item.menu = entry.completion_item.detail
-      end
-      return vim_item
-    end,
-  },
-  completion = { completeopt = "menu,menuone" },
-  snippet = {
-    expand = function(args)
-      require("luasnip").lsp_expand(args.body)
-    end,
-  },
-
-  window = {
-    completion = cmp.config.window.bordered(),
-    documentation = cmp.config.window.bordered(),
-  },
-
-  view = {
-    entries = "custom",
-  },
-
-  mapping = {
-    ["<C-p>"] = cmp.mapping.select_prev_item(),
-    ["<C-n>"] = cmp.mapping.select_next_item(),
-    ["<C-d>"] = cmp.mapping.scroll_docs(-4),
-    ["<C-f>"] = cmp.mapping.scroll_docs(4),
-    ["<C-Space>"] = cmp.mapping.complete(),
-    ["<C-e>"] = cmp.mapping.close(),
-    ["<CR>"] = cmp.mapping.confirm {
-      behavior = cmp.ConfirmBehavior.Insert,
-      select = true,
+    preselect = "None",
+    formatting = {
+        fields = { "kind", "abbr" },
+        format = function(entry, vim_item)
+            vim_item.kind = cmp_kinds[vim_item.kind] or ""
+            if entry.completion_item.detail then
+                vim_item.menu = entry.completion_item.detail
+            end
+            return vim_item
+        end,
+    },
+    completion = { completeopt = "menu,menuone" },
+    snippet = {
+        expand = function(args)
+            require("luasnip").lsp_expand(args.body)
+        end,
     },
-    ["<Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif require("luasnip").expand_or_jumpable() then
-        require("luasnip").expand_or_jump()
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-    ["<S-Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif require("luasnip").jumpable(-1) then
-        require("luasnip").jump(-1)
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-  },
 
-  sources = cmp.config.sources {
-    { name = "path" },
-    { name = "nvim_lsp" },
-    { name = "luasnip" },
-    { name = "buffer" },
-    { name = "nvim_lua" },
-    { name = "copilot" },
-  },
+    window = {
+        completion = cmp.config.window.bordered(),
+        documentation = cmp.config.window.bordered(),
+    },
+
+    view = {
+        entries = "custom",
+    },
+
+    mapping = {
+        ["<C-p>"] = cmp.mapping.select_prev_item(),
+        ["<C-n>"] = cmp.mapping.select_next_item(),
+        ["<C-d>"] = cmp.mapping.scroll_docs(-4),
+        ["<C-f>"] = cmp.mapping.scroll_docs(4),
+        ["<C-Space>"] = cmp.mapping.complete(),
+        ["<C-e>"] = cmp.mapping.close(),
+        ["<CR>"] = cmp.mapping.confirm {
+            behavior = cmp.ConfirmBehavior.Insert,
+            select = true,
+        },
+        ["<Tab>"] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_next_item()
+            elseif require("luasnip").expand_or_jumpable() then
+                require("luasnip").expand_or_jump()
+            else
+                fallback()
+            end
+        end, { "i", "s" }),
+        ["<S-Tab>"] = cmp.mapping(function(fallback)
+            if cmp.visible() then
+                cmp.select_prev_item()
+            elseif require("luasnip").jumpable(-1) then
+                require("luasnip").jump(-1)
+            else
+                fallback()
+            end
+        end, { "i", "s" }),
+    },
+
+    sources = cmp.config.sources {
+        { name = "path" },
+        { name = "nvim_lsp" },
+        { name = "luasnip" },
+        { name = "buffer" },
+        { name = "nvim_lua" },
+        { name = "copilot" },
+    },
 }
 
 vim.diagnostic.config {
-  virtual_text = false,
-  virtual_lines = false,
-  signs = true,
-  underline = true,
-  float = {
-    focusable = false,
-    style = "minimal",
-    border = "rounded",
-    source = true,
-    header = "",
-    prefix = "",
-  },
+    virtual_text = false,
+    virtual_lines = false,
+    signs = true,
+    underline = true,
+    float = {
+        focusable = false,
+        style = "minimal",
+        border = "rounded",
+        source = true,
+        header = "",
+        prefix = "",
+    },
 }
 
 local lspconfig = vim.lsp.config
 
 lspconfig("texlab", {
-  cmd = { "texlab" },
-  filetypes = { "tex", "bib", "plaintex" },
-  root_markers = {
-    ".git",
-    ".latexmkrc",
-    "latexmkrc",
-    ".texlabroot",
-    "texlabroot",
-    "Tectonic.toml",
-  },
-  settings = {
-    texlab = {
-      rootDirectory = nil,
-      build = {
-        executable = "latexmk",
-        args = {
-          "-pdf",
-          "-interaction=nonstopmode",
-          "-synctex=1",
-          "%f",
-        },
-        onSave = true,
-        forwardSearchAfter = true,
-      },
-      forwardSearch = {
-        executable = "zathura",
-        args = {
-          "--synctex-editor-command",
-          [[ nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
-          "--synctex-forward",
-          "%l:1:%f",
-          "%p",
-        },
-      },
-      chktex = {
-        onEdit = false,
-        onOpenAndSave = true,
-      },
-      diagnosticsDelay = 300,
-      latexFormatter = "latexindent",
-      latexindent = {
-        ["local"] = nil,
-        modifyLineBreaks = false,
-      },
-      bibtexFormatter = "texlab",
-      formatterLineLength = 80,
+    cmd = { "texlab" },
+    filetypes = { "tex", "bib", "plaintex" },
+    root_markers = {
+        ".git",
+        ".latexmkrc",
+        "latexmkrc",
+        ".texlabroot",
+        "texlabroot",
+        "Tectonic.toml",
+    },
+    settings = {
+        texlab = {
+            rootDirectory = nil,
+            build = {
+                executable = "latexmk",
+                args = {
+                    "-pdf",
+                    "-interaction=nonstopmode",
+                    "-synctex=1",
+                    "%f",
+                },
+                onSave = true,
+                forwardSearchAfter = true,
+            },
+            forwardSearch = {
+                executable = "zathura",
+                args = {
+                    "--synctex-editor-command",
+                    [[ nvim-texlabconfig -file '%%%{input}' -line %%%{line} -server ]] .. vim.v.servername,
+                    "--synctex-forward",
+                    "%l:1:%f",
+                    "%p",
+                },
+            },
+            chktex = {
+                onEdit = false,
+                onOpenAndSave = true,
+            },
+            diagnosticsDelay = 300,
+            latexFormatter = "latexindent",
+            latexindent = {
+                ["local"] = nil,
+                modifyLineBreaks = false,
+            },
+            bibtexFormatter = "texlab",
+            formatterLineLength = 80,
+        },
     },
-  },
 })
 
 lspconfig("qmlls", {
-  cmd = { "qmlls6", "qmlls" },
-  filetypes = { "qml", "qmljs" },
-  root_markers = { ".git" },
+    cmd = { "qmlls6", "qmlls" },
+    filetypes = { "qml", "qmljs" },
+    root_markers = { ".git" },
 })
 
 lspconfig("jsonls", {
-  settings = {
-    json = {
-      schemas = require("schemastore").json.schemas(),
-      validate = { enable = true },
+    settings = {
+        json = {
+            schemas = require("schemastore").json.schemas(),
+            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 = {
-    yaml = {
-      schemaStore = {
-        enable = false,
-        url = "",
-      },
-      schemas = require("schemastore").yaml.schemas(),
+    settings = {
+        yaml = {
+            schemaStore = {
+                enable = false,
+                url = "",
+            },
+            schemas = require("schemastore").yaml.schemas(),
+        },
     },
-  },
 })
 
 local lspenable = vim.lsp.enable
 local servers = {
-  "html",
-  "bashls",
-  "pyright",
-  "ts_ls",
-  "texlab",
-  "sourcekit",
-  "qmlls",
-  "tailwindcss",
-  "systemd-lsp",
-  require("mason-lspconfig").get_installed_servers(),
+    "html",
+    "bashls",
+    "pyright",
+    "ts_ls",
+    "texlab",
+    "sourcekit",
+    "qmlls",
+    "tailwindcss",
+    "systemd-lsp",
+    require("mason-lspconfig").get_installed_servers(),
 }
 
 local flat_servers = flatten_to_array(servers)
 
 for _, server in ipairs(flat_servers) do
-  lspconfig(server, {
-    on_attach = function(client, bufnr)
-      if client.name == "typos_lsp" or client.name == "copilot" then
-        return
-      end
-    end,
-    capabilities = capabilities,
-  })
-  lspenable(server)
+    lspconfig(server, {
+        on_attach = function(client)
+            if client.name == "typos_lsp" or client.name == "copilot" then
+                return
+            end
+        end,
+        capabilities = capabilities,
+    })
+    lspenable(server)
 end

lua/config/format/neoformat.lua

@@ -1,20 +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_rust = { "rustfmt" }
-    vim.g.neoformat_enabled_ps1 = { "pwshfmt" }
-  end,
-}
-
-return M

lua/lualine/themes/zshell.lua

@@ -6,19 +6,19 @@ local function pick(light, dark)
 end
 
 local c = {
-  bg = "#141219",
-  bg_alt = "#1C1B21",
-  bg_mid = pick("#2B2930", "#201F25"),
-  fg = "#E6E0EA",
-  fg_muted = "#CAC4D4",
+  bg = "#121318",
+  bg_alt = "#1A1B20",
+  bg_mid = pick("#292A2F", "#1E1F25"),
+  fg = "#E3E2E9",
+  fg_muted = "#C4C6D3",
   fg_strong = pick("#15161A", "#F4F4F8"),
 
-  normal = "#5840A7",
-  insert = "#4A4169",
-  visual = "#882F73",
+  normal = "#718EDF",
+  insert = "#3E4867",
+  visual = "#C177BE",
   replace = "#93000A",
-  command = pick("#FFDCF2", "#9FA8D8"),
-  inactive = "#1C1B21",
+  command = pick("#FFDCF2", "#90ACD5"),
+  inactive = "#1A1B20",
 
   normal_fg = pick("#15161A", "#F4F4F8"),
   insert_fg = pick("#15161A", "#F4F4F8"),

lua/mappings.lua

@@ -11,13 +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>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 })
+map("n", "<leader>u", require("undotree").toggle, { noremap = true, silent = true })
 
 -- Copilot Chat buffer
 map("n", "<A-c>", vim.cmd.CopilotChatToggle)

lua/plugins/formatter.lua

@@ -15,12 +15,9 @@ return {
     -- lazy = false,
   },
   {
-    "sbdchd/neoformat",
+    "stevearc/conform.nvim",
     config = function()
-      require "config.format.neoformat"
+      require "config.format.conform"
     end,
-    -- init = function()
-    --   vim.cmd("source" .. vim.fn.stdpath "config" .. "/lua/config/test.vim")
-    -- end,
   },
 }

lua/plugins/init.lua

@@ -1,228 +1,227 @@
 return {
-  {
-    require "config.snacks",
-  },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    lazy = false,
-    build = ":TSUpdate",
-    branch = "main",
-    config = function()
-      require "config.modules.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.modules.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.other.barbar"
-    end,
-  },
-  {
-    "mawkler/modicator.nvim",
-    config = function()
-      require "config.gui.modicator"
-    end,
-  },
-  {
-    "jiaoshijie/undotree",
-    config = function()
-      require "config.modules.undotree"
-    end,
-  },
-  {
-    "hiphish/rainbow-delimiters.nvim",
-    enabled = true,
-  },
-  {
-    "windwp/nvim-autopairs",
-    event = "InsertEnter",
-    config = function()
-      require "config.other.autopairs"
-    end,
-  },
-  {
-    "tpope/vim-fugitive",
-  },
-  {
-    "rcarriga/nvim-notify",
-    config = function()
-      require "config.other.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" },
+    {
+        require "config.snacks",
     },
-    build = "make tiktoken",
-    config = function()
-      require "config.ai.copilotchat"
-    end,
-  },
-  {
-    "mfussenegger/nvim-dap",
-    config = function()
-      require "config.other.dapconf"
-    end,
-  },
-  {
-    "mason-org/mason-lspconfig.nvim",
-    opts = {},
-    dependencies = {
-      { "mason-org/mason.nvim", opts = {} },
-      "neovim/nvim-lspconfig",
+    {
+        "nvim-treesitter/nvim-treesitter",
+        lazy = false,
+        build = ":TSUpdate",
+        branch = "main",
+        config = function()
+            require "config.modules.treesitter"
+        end,
     },
-  },
-  {
-    "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",
+    {
+        "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,
     },
-    config = function()
-      require "config.format.lspconfig"
-    end,
-  },
-  {
-    "smolck/command-completion.nvim",
-    opts = {
-      border = nil,
-      highlight_selection = true,
-      use_matchfuzzy = true,
-      tab_completion = true,
+    {
+        "rmagatti/auto-session",
+        config = function()
+            require "config.modules.autosession"
+        end,
     },
-  },
-  {
-    "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",
+    {
+        "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.other.barbar"
+        end,
+    },
+    {
+        "mawkler/modicator.nvim",
+        config = function()
+            require "config.gui.modicator"
+        end,
+    },
+    {
+        "jiaoshijie/undotree",
+        config = function()
+            require "config.modules.undotree"
+        end,
+    },
+    {
+        "hiphish/rainbow-delimiters.nvim",
+        enabled = true,
+    },
+    {
+        "windwp/nvim-autopairs",
+        event = "InsertEnter",
+        config = function()
+            require "config.other.autopairs"
+        end,
+    },
+    {
+        "tpope/vim-fugitive",
+    },
+    {
+        "rcarriga/nvim-notify",
+        config = function()
+            require "config.other.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()
+            require "config.ai.copilotchat"
+        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.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,
-  },
 }