I made a lot of changes, especially to neovim for xcode development and want a branch for it.

brew/.Brewfile

@@ -7,6 +7,9 @@ cask "logi-options+"
 cask "font-jetbrains-mono-nerd-font"
 # cask "utm"
 cask "bitwarden"
+# cask "modrinth"
+# cask "vlc"
+cask "prismlauncher"
 
 brew "ripgrep"
 brew "neovim"
@@ -23,8 +26,15 @@ brew "git"
 brew "zoxide"
 brew "stow"
 brew "mosh"
+brew "go"
 # brew "jpeg-turbo"
 brew "npm"
 brew "wget"
 brew "opencode"
+brew "xcp"
+brew "xcbeautify"
+brew "pipx"
+brew "jq"
+brew "coreutils"
+brew "xcode-build-server"
 # brew "podman"

nvim/.config/nvim/init.lua

@@ -1,121 +1,3 @@
-vim.pack.add({
-        { src = "https://github.com/rose-pine/neovim",                  name = "rose-pine" },
-        { src = "https://github.com/brenoprata10/nvim-highlight-colors" },
-        { src = "https://github.com/mbbill/undotree" },
-        { src = "https://github.com/nvim-mini/mini.pairs",              version = vim.version.range('*') },
-        { src = "https://github.com/nvim-tree/nvim-web-devicons" },
-        { src = "https://github.com/ibhagwan/fzf-lua" },
-        { src = "https://github.com/saghen/blink.cmp",                  version = vim.version.range('*'), },
-        { src = "git@moo:dmm/polydev.git" },
-        { src = "https://github.com/nvim-treesitter/nvim-treesitter",   build = ":TSUpdate" },
-        { src = "https://github.com/alexghergh/nvim-tmux-navigation" },
-        { src = "https://github.com/mason-org/mason.nvim" },
-        { src = "https://github.com/mason-org/mason-lspconfig.nvim" },
-        { src = "https://github.com/neovim/nvim-lspconfig" },
-        { src = "https://github.com/stevearc/conform.nvim" },
-})
-
---- Configurations
-
-require("mason").setup()
-require("mason-lspconfig").setup({
-        ensure_installed = { "ts_ls", "lua_ls", "ts_ls" },
-        automatic_enable = true,
-})
-require 'nvim-tmux-navigation'.setup {
-        disable_when_zoomed = true -- defaults to false
-}
-require('nvim-treesitter').install { 'rust', 'c', 'cpp', 'lua', 'javascript' }
-vim.api.nvim_create_autocmd('FileType', {
-        pattern = { 'c', 'cpp', 'rust', 'lua', 'javascript' },
-        callback = function()
-                vim.treesitter.start()
-                vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-        end,
-})
-require("conform").setup({
-        formatters_by_ft = {
-                rust = { "rustfmt", lsp_format = "fallback" },
-                lua = { "emmylua-codeformat", lsp_format = "fallback" },
-                javascript = { "ts_ls", stop_after_first = true },
-                ["_"] = { "trim_whitespace" },
-        },
-        format_on_save = {
-                timeout_ms = 500,
-                lsp_format = "fallback",
-        },
-})
-
-require('nvim-highlight-colors').turnOn()
-require("Polydev").setup({
-        -- terminal = {
-        --         mode = "split",
-        --         win = {
-        --                 type = "vertical",
-        --                 anchor = "right",
-        --                 -- size = "20"
-        --         },
-        --
-        -- },
-})
-require("blink.cmp").setup({
-        completion = {
-                menu = {
-                        draw = {
-                                columns = { { "label", gap = 1 }, { "kind_icon", gap = 1, "kind" } },
-                        }
-                }
-        }
-})
-require('mini.pairs').setup()
-require("fzf-lua").setup({
-        "border-fused",
-        previewers = {
-                builtin = {
-                        syntax_limit_b = -51200, -- 50KB limit on highlighting files
-                },
-        },
-        winopts = {
-                height     = 0.50,
-                width      = 0.45,
-                row        = 0.35,
-                col        = 0.50,
-                border     = "rounded",
-                backdrop   = 0,
-                fullscreen = false,
-                preview    = {
-                        hidden = true,
-                },
-        },
-        grep = {
-                rg_glob = true,
-                rg_glob_fn = function(query)
-                        local regex, flags = query:match("^(.-)%s%-%-(.*)$")
-                        return (regex or query), flags
-                end,
-        },
-        defaults = {
-                formatter = "path.filename_first",
-        },
-})
-
---- LSP
-
-local capabilities = require('blink.cmp').get_lsp_capabilities()
-vim.lsp.config("lua_ls", {
-        capabilities = capabilities,
-        settings = {
-                Lua = {
-                        diagnostics = { globals = { "vim" } },
-                        workspace = {
-                                library = vim.api.nvim_get_runtime_file("", true),
-                                checkThirdParty = false,
-                        },
-                },
-        },
-})
-vim.lsp.enable({ "lua_ls", "clangd", "rust-analyzer", "ts_ls" })
-
 --- Options
 
 vim.opt.termguicolors = true
@@ -131,7 +13,7 @@ vim.opt.wrap = false
 vim.opt.swapfile = false
 vim.opt.signcolumn = "yes"
 vim.opt.undofile = true -- Keeps undo history even after we close a file
-vim.opt.scrolloff = 8
+vim.opt.scrolloff = 4
 vim.opt.sidescrolloff = 8
 vim.opt.hlsearch = false
 vim.opt.completeopt = { "menuone", "noselect", "popup" }
@@ -151,6 +33,47 @@ vim.opt.smartcase = true    -- However if we use a capital in search string we t
 vim.opt.smartindent = false -- smarter indentation
 vim.opt.smarttab = true     -- make tab behaviour smarter
 vim.opt.laststatus = 3
+vim.opt.showmode = false
+vim.opt.cmdheight = 0
+vim.opt.smoothscroll = true
+vim.diagnostic.config({
+        virtual_text = true,      -- This is the magic line
+        signs = true,             -- Shows icons in the gutter
+        underline = true,
+        update_in_insert = false, -- Don't clutter the screen while typing
+        severity_sort = true,
+})
+
+vim.pack.add({
+        { src = "https://github.com/rose-pine/neovim",                  name = "rose-pine" },
+        { src = "https://github.com/brenoprata10/nvim-highlight-colors" },
+        { src = "https://github.com/mbbill/undotree" },
+        { src = "https://github.com/nvim-mini/mini.pairs",              version = vim.version.range('*') },
+        { src = "https://github.com/nvim-tree/nvim-web-devicons" },
+        { src = "https://github.com/ibhagwan/fzf-lua" },
+        { src = "https://github.com/saghen/blink.cmp",                  version = vim.version.range('*'), },
+        { src = "git@moo:dmm/polydev.git" },
+        { src = "https://github.com/nvim-treesitter/nvim-treesitter",   build = ":TSUpdate" },
+        { src = "https://github.com/alexghergh/nvim-tmux-navigation" },
+        { src = "https://github.com/mason-org/mason.nvim" },
+        { src = "https://github.com/mason-org/mason-lspconfig.nvim" },
+        { src = "https://github.com/neovim/nvim-lspconfig" },
+        { src = "https://github.com/stevearc/conform.nvim" },
+        { src = "https://github.com/b0o/incline.nvim" },
+        { src = "https://github.com/windwp/nvim-ts-autotag" },
+        { src = "https://github.com/folke/which-key.nvim" },
+
+        --- XCode Plugins
+        { src = "https://github.com/MunifTanjim/nui.nvim" },
+        { src = "https://github.com/mfussenegger/nvim-dap" },
+        { src = "https://github.com/rcarriga/nvim-dap-ui" },
+        { src = "https://github.com/nvim-lualine/lualine.nvim" },
+        { src = "https://github.com/nvim-neo-tree/neo-tree.nvim" },
+        { src = "https://github.com/wojciech-kulik/xcodebuild.nvim" },
+        { src = "https://github.com/nvim-lua/plenary.nvim" },
+        { src = "https://github.com/folke/noice.nvim" },
+        { src = "https://github.com/folke/snacks.nvim" },
+})
 
 --- COLORS
 
@@ -167,11 +90,234 @@ vim.api.nvim_set_hl(0, "LineNr", { link = 'Normal' })
 vim.api.nvim_set_hl(0, "FoldColumn", { link = 'Normal' })
 vim.api.nvim_set_hl(0, "CursorLineNr", { bg = "none", link = 'MatchParen', bold = true })
 
+
+local function xcodebuild_device()
+        if not vim.g.xcodebuild_platform then return " macOS" end
+
+        if vim.g.xcodebuild_platform == "macOS" then
+                return " macOS"
+        end
+
+        local deviceIcon = ""
+        if vim.g.xcodebuild_platform:match("watch") then
+                deviceIcon = "􀟤"
+        elseif vim.g.xcodebuild_platform:match("tv") then
+                deviceIcon = "􀡴 "
+        elseif vim.g.xcodebuild_platform:match("vision") then
+                deviceIcon = "􁎖 "
+        end
+
+        if vim.g.xcodebuild_os then
+                return deviceIcon .. " " .. vim.g.xcodebuild_device_name .. " (" .. vim.g.xcodebuild_os .. ")"
+        end
+
+        return deviceIcon .. " " .. (vim.g.xcodebuild_device_name or "Unknown")
+end
+
+require('lualine').setup({
+        options = {
+                theme = 'auto', -- Or try 'catppuccin' if you use it
+                component_separators = '|',
+                section_separators = { left = '', right = '' },
+                globalstatus = true, -- Crucial for clean look with cmdheight=0
+        },
+        sections = {
+                lualine_a = { { 'mode', separator = { left = '' }, right_padding = 2 } },
+                lualine_b = { 'filename', 'branch' },
+                lualine_c = { 'diff', 'diagnostics' },
+                lualine_x = {
+                        {
+                                function() return ' ' .. (vim.g.xcodebuild_last_status or "Idle") end,
+                                color = { fg = "Gray" }
+                        },
+                        {
+                                function() return '󰙨 ' .. (vim.g.xcodebuild_test_plan or "No Plan") end,
+                                color = { fg = "#a6e3a1" }
+                        },
+                        {
+                                xcodebuild_device,
+                                color = { fg = "#f9e2af" }
+                        },
+                },
+                lualine_y = { 'filetype', 'progress' },
+                lualine_z = { { 'location', separator = { right = '' }, left_padding = 2 } },
+        },
+})
+require("snacks").setup({
+        image = { enabled = true },
+})
+require('which-key').setup({
+        preset = "helix"
+})
+vim.schedule(function()
+        -- Mason & LSP
+        require("mason").setup()
+        require("mason-lspconfig").setup({
+                ensure_installed = { "vtsls", "lua_ls", "pylsp", "gopls", "html", "tailwindcss", "bashls", },
+                automatic_enable = true,
+        })
+
+        -- Noice & Xcodebuild
+        require("xcodebuild").setup()
+        require("noice").setup({
+                lsp = {
+                        -- override markdown rendering so that **cmp** and other plugins use **Treesitter**
+                        override = {
+                                ["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+                                ["vim.lsp.util.stylize_markdown"] = true,
+                                ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
+                        },
+                },
+                presets = {
+                        bottom_search = true,         -- use a classic bottom cmdline for search
+                        command_palette = true,       -- position the cmdline and popupmenu together
+                        long_message_to_split = true, -- long messages will be sent to a split
+                        inc_rename = false,           -- enables an input dialog for inc-rename.nvim
+                        lsp_doc_border = false,       -- add a border to hover docs and signature help
+                },
+        })
+
+        -- Blink & Fzf
+        require("blink.cmp").setup({
+                completion = {
+                        menu = {
+                                draw = {
+                                        columns = { { "label", gap = 1 }, { "kind_icon", gap = 1, "kind" } },
+                                }
+                        }
+                }
+        })
+        require("fzf-lua").setup({
+                winopts = {
+                        height  = 0.50,
+                        width   = 0.45,
+                        -- row        = 0.35,
+                        -- col        = 0.50,
+                        border  = "rounded",
+                        -- backdrop = 100,
+                        -- fullscreen = false,
+                        preview = {
+                                hidden = true,
+                        },
+                },
+                grep = {
+                        rg_glob = true,
+                        rg_glob_fn = function(query)
+                                local regex, flags = query:match("^(.-)%s%-%-(.*)$")
+                                return (regex or query), flags
+                        end,
+                },
+                defaults = {
+                        formatter = "path.filename_first",
+                },
+        })
+
+        -- Treesitter
+        require('nvim-treesitter').install { 'swift', 'rust', 'c', 'cpp', 'lua', 'javascript', 'go', 'typescript', 'css', 'html', 'python' }
+        vim.api.nvim_create_autocmd('FileType', {
+                pattern = { 'c', 'cpp', 'rust', 'lua', 'typescript', 'javascript', 'css', 'html', 'python', 'go', 'swift' },
+                callback = function()
+                        vim.treesitter.start()
+                        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+                end,
+        })
+end)
+
+--- Configurations
+local helpers = require 'incline.helpers'
+local devicons = require 'nvim-web-devicons'
+require('incline').setup {
+        window = {
+                padding = 0,
+                margin = { horizontal = 0 },
+        },
+        render = function(props)
+                local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
+                if filename == '' then
+                        filename = '[No Name]'
+                end
+                local ft_icon, ft_color = devicons.get_icon_color(filename)
+                local modified = vim.bo[props.buf].modified
+                return {
+                        ft_icon and { ' ', ft_icon, ' ', guibg = ft_color, guifg = helpers.contrast_color(ft_color) } or
+                        '',
+                        ' ',
+                        { filename, gui = modified and 'bold,italic' or 'bold' },
+                        ' ',
+                        guibg = '#44406e',
+                }
+        end,
+}
+require 'nvim-tmux-navigation'.setup {
+        disable_when_zoomed = true -- defaults to false
+}
+require("conform").setup({
+        formatters_by_ft = {
+                rust = { "rustfmt", lsp_format = "fallback" },
+                lua = { "emmylua-codeformat", lsp_format = "fallback" },
+                javascript = { "prettier", stop_after_first = true },
+                typescript = { "prettier", stop_after_first = true },
+                json = { "prettier" },
+                html = { "prettier" },
+                go = { "goimports" },
+                c = { "lsp" },
+                cpp = { "lsp" },
+                ["_"] = { "trim_whitespace" },
+        },
+        format_on_save = {
+                timeout_ms = 500,
+                lsp_format = "fallback",
+        },
+})
+
+require('nvim-ts-autotag').setup({
+        opts = {
+                enable_close = true,          -- Auto close tags
+                enable_rename = true,         -- Auto rename pairs of tags
+                enable_close_on_slash = false -- Auto close on trailing </
+        },
+})
+require('nvim-highlight-colors').turnOn()
+require("Polydev").setup()
+require('mini.pairs').setup()
+
+--- LSP
+
+local capabilities = require('blink.cmp').get_lsp_capabilities()
+vim.lsp.config("lua_ls", {
+        capabilities = capabilities,
+        settings = {
+                Lua = {
+                        diagnostics = { globals = { "vim" } },
+                        workspace = {
+                                library = vim.api.nvim_get_runtime_file("", true),
+                                checkThirdParty = false,
+                        },
+                },
+        },
+})
+vim.lsp.config("vtsls", {
+        settings = {
+                typescript = {
+                        updateImportsOnFileMove = { enabled = "always" },
+                        inlayHints = {
+                                parameterNames = { enabled = "all" },
+                                variableTypes = { enabled = true },
+                        },
+                },
+        },
+})
+vim.lsp.enable({ "lua_ls", "clangd", "rust-analyzer", "vtsls", "tailwindcss-language-server",
+        "vscode-html-language-server", "gopls", "xcode-build-server", "sourcekit" })
+
 --- KEYMAPS
 
 vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
 vim.keymap.set("n", "<leader>ff", vim.lsp.buf.format)
+-- vim.keymap.set("n", "<leader>ff", function()
+--         require("conform").format({ async = true, lsp_format = "never" })
+-- end)
 vim.keymap.set("n", "<leader>vs", ":vsplit<CR>")
 vim.keymap.set("n", "<leader>ss", ":split<CR>")
 vim.keymap.set("n", "<leader>E", ":Ex<CR>")
@@ -201,3 +347,30 @@ vim.keymap.set("n", "<C-h>", ":NvimTmuxNavigateLeft<CR>", { silent = true })
 vim.keymap.set("n", "<C-j>", ":NvimTmuxNavigateDown<CR>", { silent = true })
 vim.keymap.set("n", "<C-k>", ":NvimTmuxNavigateUp<CR>", { silent = true })
 vim.keymap.set("n", "<C-l>", ":NvimTmuxNavigateRight<CR>", { silent = true })
+vim.keymap.set("n", "<leader>nn", ":Neotree toggle<CR>")
+vim.keymap.set("n", "<leader>X", "<cmd>XcodebuildPicker<cr>", { desc = "Show Xcodebuild Actions" })
+vim.keymap.set("n", "<leader>xf", "<cmd>XcodebuildProjectManager<cr>", { desc = "Show Project Manager Actions" })
+
+vim.keymap.set("n", "<leader>xb", "<cmd>XcodebuildBuild<cr>", { desc = "Build Project" })
+vim.keymap.set("n", "<leader>xB", "<cmd>XcodebuildBuildForTesting<cr>", { desc = "Build For Testing" })
+vim.keymap.set("n", "<leader>xr", "<cmd>XcodebuildBuildRun<cr>", { desc = "Build & Run Project" })
+
+vim.keymap.set("n", "<leader>xt", "<cmd>XcodebuildTest<cr>", { desc = "Run Tests" })
+vim.keymap.set("v", "<leader>xt", "<cmd>XcodebuildTestSelected<cr>", { desc = "Run Selected Tests" })
+vim.keymap.set("n", "<leader>xT", "<cmd>XcodebuildTestClass<cr>", { desc = "Run Current Test Class" })
+vim.keymap.set("n", "<leader>x.", "<cmd>XcodebuildTestRepeat<cr>", { desc = "Repeat Last Test Run" })
+
+vim.keymap.set("n", "<leader>xl", "<cmd>XcodebuildToggleLogs<cr>", { desc = "Toggle Xcodebuild Logs" })
+vim.keymap.set("n", "<leader>xc", "<cmd>XcodebuildToggleCodeCoverage<cr>", { desc = "Toggle Code Coverage" })
+vim.keymap.set("n", "<leader>xC", "<cmd>XcodebuildShowCodeCoverageReport<cr>", { desc = "Show Code Coverage Report" })
+vim.keymap.set("n", "<leader>xe", "<cmd>XcodebuildTestExplorerToggle<cr>", { desc = "Toggle Test Explorer" })
+vim.keymap.set("n", "<leader>xs", "<cmd>XcodebuildFailingSnapshots<cr>", { desc = "Show Failing Snapshots" })
+
+vim.keymap.set("n", "<leader>xp", "<cmd>XcodebuildPreviewGenerateAndShow<cr>", { desc = "Generate Preview" })
+vim.keymap.set("n", "<leader>x<cr>", "<cmd>XcodebuildPreviewToggle<cr>", { desc = "Toggle Preview" })
+
+vim.keymap.set("n", "<leader>xd", "<cmd>XcodebuildSelectDevice<cr>", { desc = "Select Device" })
+vim.keymap.set("n", "<leader>xq", "<cmd>Telescope quickfix<cr>", { desc = "Show QuickFix List" })
+
+vim.keymap.set("n", "<leader>xx", "<cmd>XcodebuildQuickfixLine<cr>", { desc = "Quickfix Line" })
+vim.keymap.set("n", "<leader>xa", "<cmd>XcodebuildCodeActions<cr>", { desc = "Show Code Actions" })

nvim/.config/nvim/nvim-pack-lock.json

@@ -1,7 +1,7 @@
 {
   "plugins": {
     "blink.cmp": {
-      "rev": "451168851e8e2466bc97ee3e026c3dcb9141ce07",
+      "rev": "78336bc89ee5365633bcf754d93df01678b5c08f",
       "src": "https://github.com/saghen/blink.cmp",
       "version": ">=0.0.0"
     },
@@ -10,19 +10,31 @@
       "src": "https://github.com/norcalli/nvim-colorizer.lua"
     },
     "conform.nvim": {
-      "rev": "086a40dc7ed8242c03be9f47fbcee68699cc2395",
+      "rev": "dca1a190aa85f9065979ef35802fb77131911106",
       "src": "https://github.com/stevearc/conform.nvim"
     },
     "fzf-lua": {
-      "rev": "bde73a6886b607246095aa59f396de5e0d036890",
+      "rev": "17e3507b788699776ba6d2f8dd101ec177f37a96",
       "src": "https://github.com/ibhagwan/fzf-lua"
     },
+    "incline.nvim": {
+      "rev": "8b54c59bcb23366645ae10edca6edfb9d3a0853e",
+      "src": "https://github.com/b0o/incline.nvim"
+    },
+    "lackluster.nvim": {
+      "rev": "70dd682e564784893b984deb51dd5ddd263c8cc7",
+      "src": "https://github.com/slugbyte/lackluster.nvim"
+    },
+    "lualine.nvim": {
+      "rev": "131a558e13f9f28b15cd235557150ccb23f89286",
+      "src": "https://github.com/nvim-lualine/lualine.nvim"
+    },
     "mason-lspconfig.nvim": {
-      "rev": "38499e0bda64bc0f3ec6e7f03f8e13dd11c0fa00",
+      "rev": "0c2823e0418f3d9230ff8b201c976e84de1cb401",
       "src": "https://github.com/mason-org/mason-lspconfig.nvim"
     },
     "mason.nvim": {
-      "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65",
+      "rev": "cb8445f8ce85d957416c106b780efd51c6298f89",
       "src": "https://github.com/mason-org/mason.nvim"
     },
     "mini.pairs": {
@@ -30,16 +42,44 @@
       "src": "https://github.com/nvim-mini/mini.pairs",
       "version": ">=0.0.0"
     },
+    "muted.nvim": {
+      "rev": "6967424df29fecf248f58a5a597b9ec94cc8b36a",
+      "src": "https://github.com/pisgahk/muted.nvim"
+    },
+    "neo-tree.nvim": {
+      "rev": "ff84e6e1608b24773f1b73cd4182e0bcf2b3d637",
+      "src": "https://github.com/nvim-neo-tree/neo-tree.nvim"
+    },
+    "neogen": {
+      "rev": "23e7e9f883d01289ebd90e98025acc860ea26366",
+      "src": "https://github.com/danymat/neogen"
+    },
+    "noice.nvim": {
+      "rev": "7bfd942445fb63089b59f97ca487d605e715f155",
+      "src": "https://github.com/folke/noice.nvim"
+    },
+    "nui.nvim": {
+      "rev": "de740991c12411b663994b2860f1a4fd0937c130",
+      "src": "https://github.com/MunifTanjim/nui.nvim"
+    },
     "nvim-colorizer.lua": {
       "rev": "a065833f35a3a7cc3ef137ac88b5381da2ba302e",
       "src": "https://github.com/norcalli/nvim-colorizer.lua"
     },
+    "nvim-dap": {
+      "rev": "45a69eba683a2c448dd9ecfc4de89511f0646b5f",
+      "src": "https://github.com/mfussenegger/nvim-dap"
+    },
+    "nvim-dap-ui": {
+      "rev": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49",
+      "src": "https://github.com/rcarriga/nvim-dap-ui"
+    },
     "nvim-highlight-colors": {
-      "rev": "e2cb22089cc2358b2b995c09578224f142de6039",
+      "rev": "e4c7af0211866162d999ce0bdd6a029302e19139",
       "src": "https://github.com/brenoprata10/nvim-highlight-colors"
     },
     "nvim-lspconfig": {
-      "rev": "8e2084bf5e40c79c1f42210a6ef96a0a4793a763",
+      "rev": "31026a13eefb20681124706a79fc1df6bf11ab27",
       "src": "https://github.com/neovim/nvim-lspconfig"
     },
     "nvim-tmux-navigation": {
@@ -47,24 +87,44 @@
       "src": "https://github.com/alexghergh/nvim-tmux-navigation"
     },
     "nvim-treesitter": {
-      "rev": "7caec274fd19c12b55902a5b795100d21531391f",
+      "rev": "4916d6592ede8c07973490d9322f187e07dfefac",
       "src": "https://github.com/nvim-treesitter/nvim-treesitter"
     },
+    "nvim-ts-autotag": {
+      "rev": "88c1453db4ba7dd24131086fe51fdf74e587d275",
+      "src": "https://github.com/windwp/nvim-ts-autotag"
+    },
     "nvim-web-devicons": {
-      "rev": "d7462543c9e366c0d196c7f67a945eaaf5d99414",
+      "rev": "4fc505ac7bd7692824a142e96e5f529c133862f8",
       "src": "https://github.com/nvim-tree/nvim-web-devicons"
     },
+    "plenary.nvim": {
+      "rev": "74b06c6c75e4eeb3108ec01852001636d85a932b",
+      "src": "https://github.com/nvim-lua/plenary.nvim"
+    },
     "polydev": {
       "rev": "8d41141e9ab68c271bb8bb2db5528bb0a61c78eb",
       "src": "git@moo:dmm/polydev.git"
     },
     "rose-pine": {
-      "rev": "cf2a288696b03d0934da713d66c6d71557b5c997",
+      "rev": "6a961effd67f6130d36df6d1c05c48c739796dd2",
       "src": "https://github.com/rose-pine/neovim"
     },
+    "snacks.nvim": {
+      "rev": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e",
+      "src": "https://github.com/folke/snacks.nvim"
+    },
     "undotree": {
       "rev": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d",
       "src": "https://github.com/mbbill/undotree"
+    },
+    "which-key.nvim": {
+      "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a",
+      "src": "https://github.com/folke/which-key.nvim"
+    },
+    "xcodebuild.nvim": {
+      "rev": "59ee76b947cfd680b0354f3318aec2cab71a18db",
+      "src": "https://github.com/wojciech-kulik/xcodebuild.nvim"
     }
   }
 }

ssh/.ssh/config

@@ -9,7 +9,7 @@ Host moo
     IdentityFile ~/.ssh/id_ed25519  # Path to your private key
 
 Host oasis
-    HostName 100.90.3.48
+    HostName 100.111.101.97
     User oasis
     Port 2222
     IdentityFile ~/.ssh/id_ed25519

zshrc/.zshrc

@@ -55,3 +55,10 @@ else
 fi
 
 ### End of Zinit's installer chunk
+
+# bun completions
+[ -s "/Users/andrew/.bun/_bun" ] && source "/Users/andrew/.bun/_bun"
+
+# bun
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"