some lazy and zsh stuff

2025-08-21 10:38:44 -04:00 · 2025-05-19 13:52:16 -04:00
parent d89392c999
commit e421fb090a
8 changed files with 198 additions and 112 deletions
--- a/nvim/.config/nvim/lazy-lock.json
+++ b/nvim/.config/nvim/lazy-lock.json
@@ -1,58 +1,62 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "LuaSnip": { "branch": "master", "commit": "c1851d5c519611dfc451b6582961b2602e0af89b" },
+  "actions-preview.nvim": { "branch": "master", "commit": "36513ad213855d497b7dd3391a24d1d75d58e36f" },
  "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" },
-  "clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
+  "clangd_extensions.nvim": { "branch": "main", "commit": "db28f29be928d18cbfb86fbfb9f83f584f658feb" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "codesnap.nvim": { "branch": "main", "commit": "6400480aa6cc366cbd931146c429aaa64680dab9" },
+  "codesnap.nvim": { "branch": "main", "commit": "be6d6b9a3b5e6999edbda76b16dace03d9bfcd3d" },
  "compiler.nvim": { "branch": "main", "commit": "eb7f82bb8f9e722dd194f638e67ec53c12ce5ac5" },
-  "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" },
-  "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "conform.nvim": { "branch": "master", "commit": "a4bb5d6c4ae6f32ab13114e62e70669fa67745b9" },
+  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
  "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" },
-  "mini.nvim": { "branch": "main", "commit": "7c0e12076af6a45227273b57110a91e9089a93fc" },
-  "minimap.vim": { "branch": "master", "commit": "395378137e6180762d5b963ca9ad5ac2db5d3283" },
-  "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" },
-  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-cmp": { "branch": "main", "commit": "8c82d0bd31299dbff7f8e780f5e06d2283de9678" },
-  "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" },
-  "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" },
-  "nvim-notify": { "branch": "master", "commit": "a3020c2cf4dfc4c4f390c4a21e84e35e46cf5d17" },
-  "nvim-treesitter": { "branch": "master", "commit": "097fb77312c731347180e8907424f6c967323f05" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
-  "nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
-  "nvim-web-devicons": { "branch": "master", "commit": "aafa5c187a15701a7299a392b907ec15d9a7075f" },
-  "outline.nvim": { "branch": "main", "commit": "454aedc7cc6d5abd1e6776e87ccf8a3df119c207" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "2cb844268288ccc06b8d0f368ef3c2b195e8278c" },
+  "mason-tool-installer.nvim": { "branch": "main", "commit": "75d60a8f928decd8b38897f80849768b7c540a5b" },
+  "mason.nvim": { "branch": "main", "commit": "1aceba8bc158b5aaf90649077cad06744bc23ac4" },
+  "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" },
+  "mini.nvim": { "branch": "main", "commit": "18889a4993a2c6de64eb07f91e7ad8666793441a" },
+  "minimap.vim": { "branch": "master", "commit": "57287e2dd28fa3e63276a32d11c729df14741d54" },
+  "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
+  "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-lint": { "branch": "master", "commit": "fdb04e9285edefbe25a02a31a35e8fbb10fe054d" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ac1dfbe3b60e5e23a2cff90e3bd6a3bc88031a57" },
+  "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
+  "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "5c48b8ba1b0b7b25feb6e34e7eb293ea893aedc4" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
+  "nvim-ufo": { "branch": "main", "commit": "3c7a3570e9c9dc198a2ad4491b0b0e51c4d4ba08" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
+  "outline.nvim": { "branch": "main", "commit": "321f89ef79f168a78685f70d70c52d0e7b563abb" },
  "overseer.nvim": { "branch": "master", "commit": "6271cab7ccc4ca840faa93f54440ffae3a3918bd" },
-  "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" },
-  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
+  "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
  "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
-  "smart-splits.nvim": { "branch": "master", "commit": "7266722346df921535ca3f317164a62069436b7c" },
+  "smart-splits.nvim": { "branch": "master", "commit": "3af62ec991b972379833022c496abe96d727aa35" },
  "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" },
+  "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" },
  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" },
-  "tokyonight.nvim": { "branch": "main", "commit": "775f82f08a3d1fb55a37fc6d3a4ab10cd7ed8a10" },
-  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
  "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
-  "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" },
-  "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
+  "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
+  "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" },
+  "vim-matchup": { "branch": "master", "commit": "56c714495ec7f40cf2c7e92fb124067c7951e650" },
  "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
  "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" },
-  "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" },
+  "vim-startuptime": { "branch": "master", "commit": "b6f0d93f6b8cf6eee0b4c94450198ba2d6a05ff6" },
  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-svelte-plugin": { "branch": "master", "commit": "f80ff67a94e3ac279fe55ecdf55ad7342f4a5228" },
  "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" }
 }
--- a/nvim/.config/nvim/lua/plugins/contextcomment.lua
+++ b/nvim/.config/nvim/lua/plugins/contextcomment.lua
@@ -0,0 +1,30 @@
+return {
+	{
+		"numToStr/Comment.nvim",
+		dependencies = {
+			"JoosepAlviste/nvim-ts-context-commentstring",
+		},
+		config = function()
+			require("Comment").setup({
+				pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
+			})
+		end,
+	},
+	{
+		"nvim-treesitter/nvim-treesitter",
+		build = ":TSUpdate",
+		config = function()
+			require("nvim-treesitter.configs").setup({
+				ensure_installed = {
+					"svelte",
+					"html",
+					"javascript",
+					-- Add other languages as needed
+				},
+				highlight = { enable = true },
+				indent = { enable = true },
+				-- Additional configurations can be added here
+			})
+		end,
+	},
+}
--- a/nvim/.config/nvim/lua/plugins/lsp-config.lua
+++ b/nvim/.config/nvim/lua/plugins/lsp-config.lua
@@ -41,8 +41,8 @@ return {
 	{
 		"neovim/nvim-lspconfig",
 		lazy = false,
+		-- This table is used in the config function (below) for vim.diagnostic.config()
 		opts = {
-			-- options for vim.diagnostic.config()
 			diagnostics = {
 				underline = true,
 				update_in_insert = false,
@@ -57,39 +57,42 @@ return {
 					},
 				},
 			},
-			-- Enable this to enable the builtin LSP inlay hints on Neovim >= 0.10.0
-			-- Be aware that you also will need to properly configure your LSP server to
-			-- provide the inlay hints.
 			inlay_hints = {
 				enabled = true,
 			},
-			-- add any global capabilities here
-			-- options for vim.lsp.buf.format
-			-- `bufnr` and `filter` is handled by the LazyVim formatter,
-			-- but can be also overridden when specified
 			format = {
 				formatting_options = nil,
 				timeout_ms = nil,
 			},
 		},
-		config = function()
+		config = function(_, opts)
+			-- 1) Use opts.diagnostics to configure diagnostic signs
+			local diag = opts.diagnostics or {}
+			if diag.signs and diag.signs.text then
+				local sign_config = {}
+				for severity, icon_text in pairs(diag.signs.text) do
+					sign_config[severity] = { text = icon_text }
+				end
+				vim.diagnostic.config({
+					signs = { severity = sign_config },
+					virtual_text = diag.virtual_text,
+					underline = diag.underline,
+					severity_sort = diag.severity_sort,
+					update_in_insert = diag.update_in_insert,
+				})
+			end
+
+			-- 2) Set up capabilities and each LSP
 			local capabilities = require("cmp_nvim_lsp").default_capabilities()
 			capabilities.offsetEncoding = { "utf-16" }
 			capabilities.textDocument.foldingRange = {
 				dynamicRegistration = false,
 				lineFoldingOnly = true,
 			}
+
 			local lspconfig = require("lspconfig")
-			local signs = {
-				Error = " ",
-				Warn = " ",
-				Hint = " ",
-				Info = " ",
-			}
-			for type, icon in pairs(signs) do
-				local hl = "DiagnosticSign" .. type
-				vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
-			end
+
+			-- Example LSPs
 			lspconfig.ts_ls.setup({
 				capabilities = capabilities,
 			})
@@ -102,6 +105,11 @@ return {
 			lspconfig.gopls.setup({
 				capabilities = capabilities,
 			})
+			lspconfig.svelte.setup({
+				capabilities = capabilities,
+			})
+
+			-- Python example
 			local function get_python_path(workspace)
 				-- Use a pattern to find the venv path in the workspace directory
 				local venv_path = lspconfig.util.path.join(workspace, "venv", "bin", "python")
@@ -124,14 +132,16 @@ return {
 					-- Optional: additional setup such as key mappings, etc.
 				end,
 			})
+
+			-- Rust
 			lspconfig.rust_analyzer.setup({
-				-- Server-specific settings. See `:help lspconfig-setup`
 				capabilities = capabilities,
 				settings = {
 					["rust-analyzer"] = {},
 				},
 			})

+			-- C/C++ (clangd)
 			lspconfig.clangd.setup({
 				capabilities = capabilities,
 				init_options = {
@@ -172,23 +182,14 @@ return {
 				end,
 			})

+			-- UFO setup
 			require("ufo").setup()

-			-- Global mappings.
-			-- See `:help vim.diagnostic.*` for documentation on any of the below functions
-
-			-- Use LspAttach autocommand to only map the following keys
-			-- after the language server attaches to the current buffer
+			-- 3) Global LspAttach mappings
 			vim.api.nvim_create_autocmd("LspAttach", {
 				group = vim.api.nvim_create_augroup("UserLspConfig", {}),
 				callback = function(ev)
-					-- Enable completion triggered by <c-x><c-o>
-					-- vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc"
-
-					-- Buffer local mappings.
-					-- See `:help vim.lsp.*` for documentation on any of the below functions
 					local opts = { buffer = ev.buf }
-
 					vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, { desc = "Open diagnostic float" })
 					vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, { desc = "Go to previous diagnostic" })
 					vim.keymap.set("n", "]d", vim.diagnostic.goto_next, { desc = "Go to next diagnostic" })
@@ -215,11 +216,14 @@ return {
 						{ desc = "Go to implementations" }
 					)
 					vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
-					-- vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, opts)
 					vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts, { desc = "Rename" })
-					vim.keymap.set({ "n", "v" }, "<leader>ca", require("actions-preview").code_actions, opts, {
-						desc = "Code actions",
-					})
+					vim.keymap.set(
+						{ "n", "v" },
+						"<leader>ca",
+						require("actions-preview").code_actions,
+						opts,
+						{ desc = "Code actions" }
+					)
 					vim.keymap.set("n", "<leader>f", function()
 						vim.lsp.buf.format({ async = true })
 					end, opts, { desc = "Format" })
--- a/nvim/.config/nvim/lua/plugins/treesitter-autotag.lua
+++ b/nvim/.config/nvim/lua/plugins/treesitter-autotag.lua
@@ -1,6 +1,6 @@
 return {
 	"windwp/nvim-ts-autotag",
-	event = { "BufReadPost", "BufWritePost", "BufNewFile" },
+	event = { "BufReadPre", "BufNewFile" },
 	config = function()
 		local config = require("nvim-ts-autotag")
 		config.setup({
--- a/nvim/.config/nvim/lua/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/plugins/treesitter.lua
@@ -11,6 +11,7 @@ return {
 				ensure_installed = {
 					"c",
 					"cpp",
+					"svelte",
 					"css",
 					"html",
 					"javascript",
--- a/nvim/.config/nvim/lua/plugins/vim-matchup.lua
+++ b/nvim/.config/nvim/lua/plugins/vim-matchup.lua
@@ -0,0 +1,11 @@
+return {
+	"andymass/vim-matchup",
+	event = "BufReadPost",
+	config = function()
+		-- Enable match-up's matchparen module
+		vim.g.matchup_matchparen_enabled = 1
+
+		-- Configure offscreen match highlighting
+		vim.g.matchup_matchparen_offscreen = { method = "popup" }
+	end,
+}
--- a/nvim/.config/nvim/lua/plugins/vim-svelte-plugin.lua
+++ b/nvim/.config/nvim/lua/plugins/vim-svelte-plugin.lua
@@ -0,0 +1,10 @@
+return {
+	"leafOfTree/vim-svelte-plugin",
+	ft = "svelte",
+	config = function()
+		-- Enable TypeScript support within Svelte files
+		vim.g.vim_svelte_plugin_use_typescript = 1
+		-- Enable folding based on syntax
+		vim.g.vim_svelte_plugin_use_foldexpr = 1
+	end,
+}
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -11,7 +11,9 @@ export ET_NO_TELEMETRY=FALSE
 export PYENV_ROOT="$HOME/.pyenv"
 export PATH="$PYENV_ROOT/bin:$PATH"
 # export PATH="$HOME/.cargo/bin:$PATH"
+# export PATH="$PATH:/Users/joshp/tizen-studio/tools/ide/bin"
 export PATH="$HOME/go/bin:$PATH"
+export PATH="$HOME/.composer/vendor/bin:$PATH"
 export PATH="/opt/homebrew/opt/libgit2@1.7/bin:$PATH"
 export PATH="$HOME/flutter/bin:$PATH"
 export ANDROID_HOME=/opt/homebrew/share/android-commandlinetools
@@ -23,6 +25,12 @@ export FZF_CTRL_T_OPTS="--preview 'bat -n --color=always --line-range :500 {}'"
 export FZF_ALT_C_OPTS="--preview 'eza --tree --color=always {} | head -200'"
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
+export MANPAGER='nvim +Man!'
+#Nano Zone for gcc on MacOS
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    export MallocNanoZone=0
+fi
+

 # History settings
 setopt EXTENDED_HISTORY
@@ -62,61 +70,62 @@ alias cat=bat
 # OS-specific settings
 if [[ "$OSTYPE" == "darwin"* ]]; then
  export PATH=$PATH:/Users/joshp/.spicetify
+
  alluptd() {
    skip_all=false
+    run_music=false

-    # Check for -all argument
-    if [[ "$1" == "-all" ]]; then
-        skip_all=true
-    fi
+    # Check for -all and -music arguments
+    for arg in "$@"; do
+        if [[ "$arg" == "-all" ]]; then
+            skip_all=true
+        elif [[ "$arg" == "-music" ]]; then
+            run_music=true
+        fi
+    done

-    # # Combined port selfupdate and port upgrade
-    # if [ "$skip_all" = true ]; then
-    #     sudo port selfupdate
-    #     sudo port upgrade outdated
-    # else
-    #     echo "Run port selfupdate and upgrade outdated? (y/n): "
-    #     read confirm
-    #     if [[ $confirm == [yY] ]]; then
-    #         sudo port selfupdate
-    #         sudo port upgrade outdated
-    #     fi
-    # fi
-
-    # Display mas list, and prompt for mas upgrade
-    mas list
+    # Perform system updates if -all is specified or if running normally
    if [ "$skip_all" = true ]; then
+        # Uncomment the following lines if MacPorts updates are needed
+        # sudo port selfupdate
+        # sudo port upgrade outdated
+
+        mas list
        mas upgrade
+
+        brew update
+        brew upgrade
+        brew cu --all --yes
+
+        rustup update
+        cargo install-update -a
+
+        pip install --upgrade pip
+        pip-review --local --auto
    else
+        # Prompt-based updates
+        mas list
        echo "Run mas upgrade? (y/n): "
        read confirm
        if [[ $confirm == [yY] ]]; then
            mas upgrade
        fi
-    fi

-    brew update
-    brew upgrade
-    brew cu --all --yes
+        echo "Run brew update and upgrade? (y/n): "
+        read confirm
+        if [[ $confirm == [yY] ]]; then
+            brew update
+            brew upgrade
+            brew cu --all --yes
+        fi

-    # Combined rustup update and cargo install-update
-    if [ "$skip_all" = true ]; then
-        rustup update
-        cargo install-update -a
-    else
        echo "Run rustup update and cargo install-update? (y/n): "
        read confirm
        if [[ $confirm == [yY] ]]; then
            rustup update
            cargo install-update -a
        fi
-    fi

-    # Combined pip install and pip-review
-    if [ "$skip_all" = true ]; then
-        pip install --upgrade pip
-        pip-review --local --auto
-    else
        echo "Run pip install --upgrade pip and pip-review? (y/n): "
        read confirm
        if [[ $confirm == [yY] ]]; then
@@ -124,10 +133,23 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
            pip-review --local --auto
        fi
    fi
-}

+    # Perform music-related tasks if -music is specified
+    if [ "$run_music" = true ]; then
+        echo "Running music sync..."
+        cd ~/Projects/lrcput
+        python lrcput.py -d "/Volumes/Crucial X8/Media/Music/" -r -R
+
+        rsync -avP --delete --chown=navidrome:nogroup -e 'ssh -p 5222' "/Volumes/Crucial X8/Media/Music/" root@ddns.joshpatra.me:/media/FiveTB/Navidrome/joshp
+
+        rsync -avP --delete "/Volumes/Crucial X8/Media/Music/" "/Volumes/Samsung USB/Music/"
+    fi
+  }
+
+  # Additional configurations
  export DISPLAY=:0
  source ~/Projects/fzf-git.sh/fzf-git.sh
+  alias brewfixes="brew cleanup && brew cleanup --prune=all && brew autoremove && brew doctor && brew update && brew upgrade && brew missing"
 fi

 # Editor settings
@@ -168,3 +190,7 @@ bindkey '^[OA' atuin-up-search

 #Temp
 export DYLD_LIBRARY_PATH="/opt/homebrew/Cellar/libgit2/1.9.0/lib:$DYLD_LIBRARY_PATH"
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion