From c9b2a679393af64e5821d27b74f82b1140d11dd3 Mon Sep 17 00:00:00 2001 From: Andrew Haynes Date: Thu, 5 Nov 2026 10:18:51 -0500 Subject: [PATCH] Nvim changes --- brew/.Brewfile | 7 ++ ghostty/.config/ghostty/config | 11 ++- ghostty/.config/ghostty/themes/kanso-ink | 22 ++++++ nvim/.config/nvim/init.lua | 6 +- .../nvim/lua/DarthMooMancer/keymaps.lua | 22 +++--- nvim/.config/nvim/lua/DarthMooMancer/lsp.lua | 68 +++++++++++++++---- nvim/.config/nvim/lua/DarthMooMancer/opts.lua | 6 +- .../nvim/lua/DarthMooMancer/plugins.lua | 14 +++- .../lua/DarthMooMancer/plugins/blink-cmp.lua | 10 --- .../lua/DarthMooMancer/plugins/conform.lua | 4 +- .../nvim/lua/DarthMooMancer/plugins/mason.lua | 2 +- .../lua/DarthMooMancer/plugins/mini-nvim.lua | 15 ++++ .../lua/DarthMooMancer/plugins/snacks.lua | 17 ----- .../nvim/lua/DarthMooMancer/statusline.lua | 17 +++-- nvim/.config/nvim/nvim-pack-lock.json | 30 ++++---- starship/.config/starship.toml | 5 +- tmux/.config/tmux/tmux.conf | 6 +- tmux/.local/bin/tmux-sessionizer | 6 ++ zshrc/.zshrc | 6 +- 19 files changed, 176 insertions(+), 98 deletions(-) create mode 100644 ghostty/.config/ghostty/themes/kanso-ink delete mode 100644 nvim/.config/nvim/lua/DarthMooMancer/plugins/snacks.lua diff --git a/brew/.Brewfile b/brew/.Brewfile index 377582c..2027b89 100644 --- a/brew/.Brewfile +++ b/brew/.Brewfile @@ -2,6 +2,7 @@ cask "ghostty" cask "font-jetbrains-mono-nerd-font" cask "google-chrome" cask "tailscale-app" +cask "colemak-dh" brew "mole" brew "ripgrep" @@ -27,3 +28,9 @@ brew "wget" brew "jq" brew "ruby" brew "opencode" +brew "uv" +brew "lua" +brew "luarocks" +brew "openjdk" +brew "bun" +brew "kanata" diff --git a/ghostty/.config/ghostty/config b/ghostty/.config/ghostty/config index 391e614..2730012 100644 --- a/ghostty/.config/ghostty/config +++ b/ghostty/.config/ghostty/config @@ -1,19 +1,18 @@ theme = "/Users/andrew/.config/ghostty/themes/kanso-zen" +# theme = dark:Rose Pine,light:Rose Pine Dawn font-family = "JetBrainsMono Nerd Font Medium" font-thicken = true font-size = 14 -scrollback-limit = 10000 -macos-titlebar-style = transparent +scrollback-limit-bytes = 10000 +macos-titlebar-style = hidden macos-titlebar-proxy-icon = hidden macos-option-as-alt = true title = " " -background-opacity = 0.90 -background-blur = 64 confirm-close-surface = false window-padding-x = 15 +window-padding-y = 15, 0 mouse-hide-while-typing = true adjust-cell-height = 5% adjust-cell-width = -5% -alpha-blending = linear-corrected -copy-on-select = true +copy-on-select = clipboard diff --git a/ghostty/.config/ghostty/themes/kanso-ink b/ghostty/.config/ghostty/themes/kanso-ink new file mode 100644 index 0000000..91d8162 --- /dev/null +++ b/ghostty/.config/ghostty/themes/kanso-ink @@ -0,0 +1,22 @@ +palette = 0=#14171d +palette = 1=#c4746e +palette = 2=#8a9a7b +palette = 3=#c4b28a +palette = 4=#8ba4b0 +palette = 5=#a292a3 +palette = 6=#8ea4a2 +palette = 7=#a4a7a4 +palette = 8=#5C6066 +palette = 9=#e46876 +palette = 10=#87a987 +palette = 11=#e6c384 +palette = 12=#7fb4ca +palette = 13=#938aa9 +palette = 14=#7aa89f +palette = 15=#c5c9c7 + +background = #14171d +foreground = #c5c9c7 +cursor-color = #c5c9c7 +selection-background = #3E424A +selection-foreground = #c5c9c7 diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 9412279..b92bc75 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,8 +1,12 @@ vim.loader.enable() +vim.g.mapleader = ' ' require('DarthMooMancer.opts') -vim.cmd.colorscheme('min-kanso') require('DarthMooMancer.plugins') +vim.cmd.colorscheme('min-kanso') +-- vim.cmd.colorscheme('vague') +-- vim.cmd.colorscheme('rose-pine-moon') + require('DarthMooMancer.keymaps') require('DarthMooMancer.statusline') require('DarthMooMancer.lsp') diff --git a/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua b/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua index c04d91c..0a9195b 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua @@ -23,21 +23,15 @@ map('n', '', 'l', { silent = true }) map('n', 'E', ':Ex') map('n', 'lp', 'LivePreview pick') -map('n', '', function() - require('snacks.picker').files() -end) -map('n', 'fh', function() - require('snacks.picker').help() -end) -map('n', 'fg', function() - require('snacks.picker').grep() -end) +map('n', '', ':Pick files', { silent = true }) +map('n', 'fh', ':Pick help', { silent = true }) +map('n', 'fg', ':Pick grep', { silent = true }) map('n', 'uu', function() - require('snacks.picker').undo() -end) -map('n', 'zz', function() - require('snacks.zen').zen() -end) + require('undotree').open({ + command = 'topleft 45vnew', + title = 'Undo Tree', + }) +end, { desc = 'native undotree', silent = true }) map('n', 'ff', function() require('conform').format({ async = true, lsp_format = 'never' }) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua b/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua index bdf57dc..49c07d8 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/lsp.lua @@ -1,13 +1,10 @@ -require('lazydev').setup({ - library = { - { path = '${3rd}/luv/library', words = { 'vim%.uv' } }, - }, -}) - vim.lsp.config('*', { capabilities = require('blink.cmp').get_lsp_capabilities() }) vim.lsp.config('lua_ls', { settings = { Lua = { + runtime = { + version = 'LuaJIT', + }, diagnostics = { globals = { 'vim' } }, completion = { callSnippet = 'Replace' }, hint = { enable = true }, @@ -20,6 +17,11 @@ vim.lsp.config('lua_ls', { }, workspace = { checkThirdParty = false, + library = { + vim.env.VIMRUNTIME .. '/lua', + + '/Users/andrew/personal/Projects/Lua/vern-nvim/lua', + }, }, didChangeWatchedFiles = { dynamicRegistration = false, @@ -30,7 +32,6 @@ vim.lsp.config('lua_ls', { vim.lsp.config('vtsls', { settings = { - -- Control memory allocation for large TypeScript projects vtsls = { autoUseWorkspaceTsdk = true, experimental = { @@ -40,12 +41,10 @@ vim.lsp.config('vtsls', { }, }, typescript = { - -- Performance: limit automatic project scanning depth tsserver = { maxTsServerMemory = 8192, }, updateImportsOnFileMove = { enabled = 'always' }, - -- Comprehensive inlay hints configuration inlayHints = { parameterNames = { enabled = 'all', suppressWhenArgumentMatchesName = true }, parameterTypes = { enabled = true }, @@ -54,12 +53,10 @@ vim.lsp.config('vtsls', { functionLikeReturnTypes = { enabled = true }, enumMemberValues = { enabled = true }, }, - -- Auto-import formatting preferences preferences = { importModuleSpecifier = 'non-relative', }, }, - -- Mirror settings for JavaScript files javascript = { updateImportsOnFileMove = { enabled = 'always' }, inlayHints = { @@ -89,13 +86,60 @@ vim.lsp.config('rust_analyzer', { }, }, }) +-- vim.lsp.config('gopls', {}) +vim.lsp.config('gopls', { + cmd = { 'gopls' }, + filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' }, + settings = { + gopls = { + -- Verbose/Enhanced Completion Settings + usePlaceholders = true, -- Enables snippet placeholders (e.g. $1, $2) for function params + completeUnimported = true, -- Auto-suggests and imports packages that aren't yet in your imports block + completeFunctionCalls = false, -- Automatically appends parentheses to function completions + experimentalPostfixCompletions = true, -- Enables postfix completions like slice.sort! + + -- Nice LSP & Diagnostics Settings + analyses = { + unusedparams = true, -- Highlights unused parameters + unusedvariable = true, -- Highlights unused variables + unusedwrite = true, -- Highlights field writes that are never read + shadow = true, -- Catches shadowed variables + fillreturns = true, -- Suggests return values to fill stub functions + nonewdecl = true, -- Catches redeclaration errors early + }, + staticcheck = true, -- Enables staticcheck advanced analyzers for better linting + semanticTokens = true, -- Enables fine-grained semantic syntax highlighting if your theme supports it + codelenses = { + gc_details = true, -- Shows escape analysis details as code lenses + generate = true, -- Adds a code lens to run `go generate` + test = true, -- Adds a code lens to run tests inline + tidy = true, -- Adds a code lens to run `go mod tidy` + upgrade_dependency = true, -- Adds a code lens to upgrade dependencies + vendor = true, -- Adds a code lens to run `go mod vendor` + }, + hints = { + assignVariableTypes = true, -- Inlay hints for variable types + compositeLiteralFields = true, -- Inlay hints for struct literal fields + compositeLiteralTypes = true, -- Inlay hints for struct literal types + constantValues = true, -- Inlay hints for constants + functionTypeParameters = true, -- Inlay hints for generic type parameters + parameterNames = true, -- Inlay hints for function parameter names (e.g. foo(ctx, /* paramName: */ val)) + rangeVariableTypes = true, -- Inlay hints for range loops + }, + }, + }, +}) + +-- Enable the server so it attaches to your Go files automatically +vim.lsp.enable('gopls') vim.lsp.enable({ 'lua_ls', 'clangd', 'pylsp', 'rust_analyzer', + 'gopls', + --- Web 'vtsls', - -- 'vscode-html-language-server', 'superhtml', }) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/opts.lua b/nvim/.config/nvim/lua/DarthMooMancer/opts.lua index 57b10d8..9ca48d1 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/opts.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/opts.lua @@ -1,4 +1,3 @@ -vim.g.mapleader = ' ' vim.opt.nu = true vim.opt.relativenumber = true @@ -24,6 +23,7 @@ local shifts = { python = 4, rust = 4, html = 2, + go = 4, javascript = 2, typescript = 2, } @@ -41,7 +41,7 @@ vim.api.nvim_create_autocmd('FileType', { }) vim.diagnostic.config({ - -- virtual_text = true, - virtual_lines = true, + virtual_text = true, + -- virtual_lines = true, severity_sort = true, }) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua b/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua index 0a2b57a..68dc6ed 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/plugins.lua @@ -1,23 +1,31 @@ vim.pack.add({ - { src = 'https://github.com/folke/snacks.nvim' }, { src = 'https://github.com/nvim-mini/mini.nvim.git', version = vim.version.range('*') }, { src = 'https://github.com/nvim-treesitter/nvim-treesitter' }, { src = 'https://github.com/saghen/blink.cmp', version = vim.version.range('*') }, - { src = 'https://github.com/folke/lazydev.nvim' }, { 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://git.moomancer.xyz/DarthMooMancer/mason-conform.nvim.git' }, { src = 'https://github.com/brianhuster/live-preview.nvim' }, + -- { src = 'https://git.moomancer.xyz/DarthMooMancer/vern-nvim' }, + -- { src = 'https://github.com/vague-theme/vague.nvim' }, + -- { src = 'https://github.com/rose-pine/neovim', name = 'rose-pine' }, }) +-- require('rose-pine').setup({ +-- disable_background = true, +-- styles = { +-- italic = false, +-- }, +-- }) + vim.opt.rtp:append('/Users/andrew/personal/Projects/Lua/vern-nvim') +vim.cmd('packadd nvim.undotree') require('DarthMooMancer.plugins.blink-cmp') require('DarthMooMancer.plugins.mini-nvim') require('DarthMooMancer.plugins.vern') require('DarthMooMancer.plugins.treesitter') require('DarthMooMancer.plugins.mason') -require('DarthMooMancer.plugins.snacks') require('DarthMooMancer.plugins.conform') diff --git a/nvim/.config/nvim/lua/DarthMooMancer/plugins/blink-cmp.lua b/nvim/.config/nvim/lua/DarthMooMancer/plugins/blink-cmp.lua index 04ad108..ba2d714 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/plugins/blink-cmp.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/plugins/blink-cmp.lua @@ -8,14 +8,4 @@ require('blink.cmp').setup({ scrollbar = false, }, }, - sources = { - default = { 'lazydev', 'lsp', 'buffer', 'snippets', 'path' }, - providers = { - lazydev = { - name = 'LazyDev', - module = 'lazydev.integrations.blink', - score_offset = 100, - }, - }, - }, }) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/plugins/conform.lua b/nvim/.config/nvim/lua/DarthMooMancer/plugins/conform.lua index 5a55ce2..c998cd0 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/plugins/conform.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/plugins/conform.lua @@ -6,13 +6,15 @@ require('conform').setup({ json = { 'prettier' }, html = { 'prettier' }, c = { 'clang-format' }, + -- go = { 'goimports', 'crlfmt' }, + go = { 'goimports' }, cpp = { 'clang-format' }, python = { 'ruff_fix', 'ruff_format' }, rust = { 'rustfmt' }, ['_'] = { 'trim_whitespace' }, }, format_on_save = { - timeout_ms = 2000, + timeout_ms = 500, lsp_format = 'fallback', }, }) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/plugins/mason.lua b/nvim/.config/nvim/lua/DarthMooMancer/plugins/mason.lua index bc1b60a..bf7fea6 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/plugins/mason.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/plugins/mason.lua @@ -4,8 +4,8 @@ require('mason-lspconfig').setup({ 'vtsls', 'lua_ls', 'pylsp', - 'html', 'cssls', + 'superhtml', }, automatic_enable = false, }) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/plugins/mini-nvim.lua b/nvim/.config/nvim/lua/DarthMooMancer/plugins/mini-nvim.lua index d93ae6f..a5f28db 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/plugins/mini-nvim.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/plugins/mini-nvim.lua @@ -25,3 +25,18 @@ hipatterns.setup({ require('mini.pairs').setup() require('mini.surround').setup() require('mini.icons').setup() +require('mini.notify').setup() +require('mini.extra').setup() +require('mini.input').setup() + +require('mini.pick').setup({ + window = { + config = { + anchor = 'NW', + row = math.floor(0.5 * (vim.o.lines - math.floor(0.618 * vim.o.lines))), + col = math.floor(0.5 * (vim.o.columns - math.floor(0.618 * vim.o.columns))), + height = math.floor(0.618 * vim.o.lines), + width = math.floor(0.618 * vim.o.columns), + }, + }, +}) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/plugins/snacks.lua b/nvim/.config/nvim/lua/DarthMooMancer/plugins/snacks.lua deleted file mode 100644 index 7ad3ef2..0000000 --- a/nvim/.config/nvim/lua/DarthMooMancer/plugins/snacks.lua +++ /dev/null @@ -1,17 +0,0 @@ -require('snacks').setup({ - notifier = { - enabled = true, - }, - input = { enabled = true }, - picker = { - enabled = true, - prompt = '  ', - }, - zen = { - enabled = true, - toggles = { - diagnostics = true, - inlay_hints = false, - }, - }, -}) diff --git a/nvim/.config/nvim/lua/DarthMooMancer/statusline.lua b/nvim/.config/nvim/lua/DarthMooMancer/statusline.lua index 862bda6..4b5c4e0 100644 --- a/nvim/.config/nvim/lua/DarthMooMancer/statusline.lua +++ b/nvim/.config/nvim/lua/DarthMooMancer/statusline.lua @@ -1,16 +1,18 @@ -local ok, mini_icons = pcall(require, 'mini.icons') +local ok, icons = pcall(require, 'mini.icons') function _G.Status() local win = tonumber(vim.g.statusline_winid) local buf = (win and vim.api.nvim_win_is_valid(win)) and vim.api.nvim_win_get_buf(win) or vim.api.nvim_get_current_buf() - local bufname = vim.api.nvim_buf_get_name(buf) - local path = (bufname == '' and '[No Name]') or vim.fn.fnamemodify(bufname, ':.') + local path = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(buf), ':.') + if path == '' then + path = '[No Name]' + end local nm = ' ' .. path if ok then - local icon, hl = mini_icons.get('file', path) + local icon, hl = icons.get('file', path) if hl and hl ~= '' then nm = ('%%#%s#%s%%* %s'):format(hl, icon or '', path) end @@ -19,15 +21,12 @@ function _G.Status() local dg = vim.diagnostic.status(buf) dg = dg ~= '' and (dg .. ' ') or '' - local prog = vim.lsp.status() - prog = prog ~= '' and ('%#DiagnosticInfo#' .. prog .. '%* ') or '' - - return string.format('%s%%m%%r %%=%s%s%%l:%%L', nm, dg, prog) + return string.format('%s%%m%%r %%=%s%%l:%%L', nm, dg) end vim.opt.statusline = '%!v:lua.Status()' -vim.api.nvim_create_autocmd({ 'DiagnosticChanged', 'BufEnter', 'LspProgress' }, { +vim.api.nvim_create_autocmd({ 'DiagnosticChanged' }, { group = vim.api.nvim_create_augroup('CustomStatusline', { clear = true }), callback = function() vim.cmd.redrawstatus() diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json index 4967e28..c08dacb 100644 --- a/nvim/.config/nvim/nvim-pack-lock.json +++ b/nvim/.config/nvim/nvim-pack-lock.json @@ -9,10 +9,6 @@ "rev": "016802de402556da54c36bd7359b441266b01cdd", "src": "https://github.com/stevearc/conform.nvim" }, - "lazydev.nvim": { - "rev": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d", - "src": "https://github.com/folke/lazydev.nvim" - }, "live-preview.nvim": { "rev": "dad92ae9599f9b19a7dffe7d597d3376c110b818", "src": "https://github.com/brianhuster/live-preview.nvim" @@ -22,7 +18,7 @@ "src": "https://git.moomancer.xyz/DarthMooMancer/mason-conform.nvim.git" }, "mason-lspconfig.nvim": { - "rev": "cd6c64d85c9871aaf759d26f2371029d6d674a48", + "rev": "3a5cd6d562a01f6829a35ae761dc383264ea452b", "src": "https://github.com/mason-org/mason-lspconfig.nvim" }, "mason.nvim": { @@ -34,21 +30,29 @@ "src": "https://github.com/nvim-mini/mini.nvim.git", "version": ">=0.0.0" }, + "neovim": { + "rev": "ff483051a47e27d84bdef47703538df1ed9f4a47", + "src": "https://github.com/rose-pine/neovim" + }, "nvim-lspconfig": { - "rev": "d8d2fda7aae57030452ce8cd6e770b1eb704514e", + "rev": "adfbb74472f6c231b651b650a89f414c2680fb31", "src": "https://github.com/neovim/nvim-lspconfig" }, "nvim-treesitter": { - "rev": "a9c4e1457e2e59f1b82c8f78dcdb3b2517555200", + "rev": "0195cd62fa89950f34c0e0d648ea7897ab85d4d3", "src": "https://github.com/nvim-treesitter/nvim-treesitter" }, - "nvim-ts-autotag": { - "rev": "d7220b55e16ed3c04e88086256def5d282429493", - "src": "https://github.com/windwp/nvim-ts-autotag" + "rose-pine": { + "rev": "ff483051a47e27d84bdef47703538df1ed9f4a47", + "src": "https://github.com/rose-pine/neovim" }, - "snacks.nvim": { - "rev": "882c996cf28183f4d63640de0b4c02ec886d01f2", - "src": "https://github.com/folke/snacks.nvim" + "vague.nvim": { + "rev": "73f8aaa866bf3d14dd0b0ab9e48c11794c1cb7ab", + "src": "https://github.com/vague-theme/vague.nvim" + }, + "vern-nvim": { + "rev": "adbd2bc0e929431cbd2b713df67866019fabfccb", + "src": "https://git.moomancer.xyz/DarthMooMancer/vern-nvim" } } } diff --git a/starship/.config/starship.toml b/starship/.config/starship.toml index f9bea91..c3c35cb 100644 --- a/starship/.config/starship.toml +++ b/starship/.config/starship.toml @@ -1,7 +1,4 @@ -format = """ -$directory\ -$line_break\ -$character""" +format = """$directory$character""" [directory] style = "blue" diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf index d5d8693..8bf3f02 100644 --- a/tmux/.config/tmux/tmux.conf +++ b/tmux/.config/tmux/tmux.conf @@ -1,15 +1,15 @@ -unbind M-, set -g prefix C-Space bind C-Space send-prefix set -g default-shell $SHELL set -s escape-time 0 set -g focus-events on +set -s theme terminal set -g set-clipboard on set -g detach-on-destroy off +set -g default-terminal "tmux-256color" set -ga terminal-features ',xterm-ghostty:RGB' -set -as terminal-overrides ',xterm-ghostty:Tc' set -g base-index 1 set -g pane-base-index 1 @@ -41,6 +41,6 @@ bind -n C-S-k resize-pane -U 5 bind -n C-S-l resize-pane -R 5 set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'christoomey/vim-tmux-navigator' +# set -g @plugin 'christoomey/vim-tmux-navigator' run '$HOME/.config/tmux/plugins/tpm/tpm' diff --git a/tmux/.local/bin/tmux-sessionizer b/tmux/.local/bin/tmux-sessionizer index b670c56..d588fe7 100755 --- a/tmux/.local/bin/tmux-sessionizer +++ b/tmux/.local/bin/tmux-sessionizer @@ -33,6 +33,7 @@ get_projects() { if command -v fd &>/dev/null; then [ -d "$HOME/Projects" ] && fd --type d --max-depth 2 . "$HOME/Projects" 2>/dev/null | sed 's:/*$::' [ -d "$HOME/personal/Projects" ] && fd --type d --min-depth 2 --max-depth 2 . "$HOME/personal/Projects" 2>/dev/null | sed 's:/*$::' + [ -d "$HOME/personal/Projects_Testing" ] && fd --type d --min-depth 2 --max-depth 2 . "$HOME/personal/Projects_Testing" 2>/dev/null | sed 's:/*$::' else if [ -d "$HOME/Projects" ]; then find "$HOME/Projects" -mindepth 1 -maxdepth 2 \ @@ -44,6 +45,11 @@ get_projects() { \( -name ".git" -o -name "node_modules" -o -name "build" -o -name ".cache" \) -prune \ -o -type d -print 2>/dev/null | sed 's:/*$::' fi + if [ -d "$HOME/personal/Projects_Testing" ]; then + find "$HOME/personal/Projects_Testing" -mindepth 2 -maxdepth 2 \ + \( -name ".git" -o -name "node_modules" -o -name "build" -o -name ".cache" \) -prune \ + -o -type d -print 2>/dev/null | sed 's:/*$::' + fi fi } diff --git a/zshrc/.zshrc b/zshrc/.zshrc index dfde67d..303788d 100644 --- a/zshrc/.zshrc +++ b/zshrc/.zshrc @@ -19,7 +19,8 @@ export PATH="$HOME/.local/bin:$PATH" alias cat="bat" alias v="nvim" alias ls="eza -a" -alias brew-update="brew update && brew upgrade && brew bundle --cleanup --zap --file=~/.Brewfile" +# alias brew-update="brew update && brew upgrade && brew bundle --force-cleanup --zap --file=~/.Brewfile" +alias brew-update="brew update && brew upgrade && brew bundle --global --zap cleanup --force" alias cmake-update="sudo rm -rd build && cmake -S . -B build && cmake --build build" alias oasis="ssh oasis" @@ -37,6 +38,9 @@ export HOMEBREW_NO_EMOJI=1 export BUN_INSTALL="$HOME/.bun" export PATH="$BUN_INSTALL/bin:$PATH" export PATH="/opt/homebrew/opt/ruby/bin:$PATH" +export PATH="$HOME/go/bin:$PATH" +export PATH="$HOME/go/bin/my-bin:$PATH" export LDFLAGS="-L/opt/homebrew/opt/ruby/lib" export CPPFLAGS="-I/opt/homebrew/opt/ruby/include" export PATH="/opt/homebrew/opt/openjdk/bin:$PATH" +export LUA_PATH="./lua/?.lua;./lua/?/init.lua;;"