chore: update custom config

dot_config/astronvim/lua/user/init.lua

@@ -40,7 +40,8 @@ return {
         },
       },
       disabled = { -- disable formatting capabilities for the listed language servers
-        -- "sumneko_lua",
+        -- disable lua_ls formatting capability if you want to use StyLua to format your lua code
+        -- "lua_ls",
       },
       timeout_ms = 1000, -- default format timeout
       -- filter = function(client) -- fully override the default formatting function
@@ -81,4 +82,4 @@ return {
     --   },
     -- }
   end,
-}
+}

dot_config/astronvim/lua/user/mappings.lua

@@ -7,11 +7,23 @@ return {
   -- first key is the mode
   n = {
     -- second key is the lefthand side of the map
+
+    -- navigate buffer tabs with `H` and `L`
+    -- L = {
+    --   function() require("astronvim.utils.buffer").nav(vim.v.count > 0 and vim.v.count or 1) end,
+    --   desc = "Next buffer",
+    -- },
+    -- H = {
+    --   function() require("astronvim.utils.buffer").nav(-(vim.v.count > 0 and vim.v.count or 1)) end,
+    --   desc = "Previous buffer",
+    -- },
+
     -- mappings seen under group name "Buffer"
-    ["<leader>bn"] = { "<cmd>tabnew<cr>", desc = "New tab" },
     ["<leader>bD"] = {
       function()
-        require("astronvim.utils.status").heirline.buffer_picker(function(bufnr) require("astronvim.utils.buffer").close(bufnr) end)
+        require("astronvim.utils.status").heirline.buffer_picker(
+          function(bufnr) require("astronvim.utils.buffer").close(bufnr) end
+        )
       end,
       desc = "Pick to close",
     },
@@ -25,4 +37,4 @@ return {
     -- setting a mapping to false will disable it
     -- ["<esc>"] = false,
   },
-}
+}

dot_config/astronvim/lua/user/options.lua

@@ -16,6 +16,7 @@ return {
     diagnostics_mode = 3, -- set the visibility of diagnostics in the UI (0=off, 1=only show in status line, 2=virtual text off, 3=all on)
     icons_enabled = true, -- disable icons in the UI (disable if no nerd font is available, requires :PackerSync after changing)
     ui_notifications_enabled = true, -- disable notifications when toggling UI elements
+    resession_enabled = false, -- enable experimental resession.nvim session management (will be default in AstroNvim v4)
   },
 }
 -- If you need more control, you can use the function()...end notation
@@ -26,4 +27,4 @@ return {
 --   local_vim.opt.shortmess = vim.opt.shortmess + { I = true } -- add to option list
 --
 --   return local_vim
--- end
+-- end

dot_config/astronvim/lua/user/plugins/community.lua

@@ -1,7 +1,7 @@
 return {
   -- Add the community repository of plugin specifications
   "AstroNvim/astrocommunity",
-  -- example of imporing a plugin, comment out to use it or add your own
+  -- example of importing a plugin, comment out to use it or add your own
   -- available plugins can be found at https://github.com/AstroNvim/astrocommunity
 
   -- { import = "astrocommunity.colorscheme.catppuccin" },

dot_config/astronvim/lua/user/plugins/mason.lua

@@ -4,23 +4,33 @@ return {
   {
     "williamboman/mason-lspconfig.nvim",
     -- overrides `require("mason-lspconfig").setup(...)`
-    opts = {
+    opts = function(_, opts)
-      -- ensure_installed = { "lua_ls" },
+      -- add more things to the ensure_installed table protecting against community packs modifying it
-    },
+      opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
+        -- "lua_ls",
+      })
+    end,
   },
   -- use mason-null-ls to configure Formatters/Linter installation for null-ls sources
   {
     "jay-babu/mason-null-ls.nvim",
     -- overrides `require("mason-null-ls").setup(...)`
-    opts = {
+    opts = function(_, opts)
-      -- ensure_installed = { "prettier", "stylua" },
+      -- add more things to the ensure_installed table protecting against community packs modifying it
-    },
+      opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
+        -- "prettier",
+        -- "stylua",
+      })
+    end,
   },
   {
     "jay-babu/mason-nvim-dap.nvim",
     -- overrides `require("mason-nvim-dap").setup(...)`
-    opts = {
+    opts = function(_, opts)
-      -- ensure_installed = { "python" },
+      -- add more things to the ensure_installed table protecting against community packs modifying it
-    },
+      opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
+        -- "python",
+      })
+    end,
   },
-}
+}

dot_config/astronvim/lua/user/plugins/null-ls.lua

@@ -14,4 +14,4 @@ return {
     }
     return config -- return final config table
   end,
-}
+}

dot_config/astronvim/lua/user/plugins/treesitter.lua

@@ -1,6 +1,9 @@
 return {
   "nvim-treesitter/nvim-treesitter",
-  opts = {
+  opts = function(_, opts)
-    -- ensure_installed = { "lua" },
+    -- add more things to the ensure_installed table protecting against community packs modifying it
-  },
+    opts.ensure_installed = require("astronvim.utils").list_insert_unique(opts.ensure_installed, {
-}
+      -- "lua"
+    })
+  end,
+}

dot_config/astronvim/lua/user/plugins/user.lua

@@ -9,4 +9,17 @@ return {
   --     require("lsp_signature").setup()
   --   end,
   -- },
+  {
+    "zbirenbaum/copilot.lua",
+    cmd = "Copilot",
+    event = "InsertEnter",
+    config = function()
+      require("copilot").setup({})
+    end,
+  },
+  {
+   "andweeb/presence.nvim",
+   config = true,
+   lazy = false,
+  },
 }

dot_config/nvim

@@ -1 +1 @@
-Subproject commit ceb212a2fc05ceeef01f23abde81996ad6bce6ad
+Subproject commit 271c9c3f71c2e315cb16c31276dec81ddca6a5a6

dot_zshenv_darwin

@@ -1,4 +1,3 @@
 . "$HOME/.cargo/env"
 . "$HOME/.tokens"
-export THEOS=~/theos
 # ssh-add --apple-use-keychain ~/.ssh/id\_ed25519 2>/dev/null

dot_zshrc_darwin

@@ -51,8 +51,6 @@ alias cn="code-insiders ."
 # cd to z
 alias cd="z"
 
-export VOLTA_HOME="$HOME/.volta"
-export PATH="$VOLTA_HOME/bin:$PATH"
 
 # tabtab source for packages
 # uninstall by removing these lines
@@ -65,6 +63,12 @@ export PATH="$VOLTA_HOME/bin:$PATH"
 export BUN_INSTALL="/Users/rileysmith/.bun"
 export PATH="$BUN_INSTALL/bin:$PATH"
 
+# android
+export ANDROID_HOME=$HOME/Library/Android/sdk
+export PATH=$PATH:$ANDROID_HOME/emulator
+export PATH=$PATH:$ANDROID_HOME/platform-tools
+export JAVA_HOME=`/usr/libexec/java_home -v 17.0.8`
+
 # zoxide
 eval "$(zoxide init zsh)"
 
@@ -74,13 +78,18 @@ if [[ $TERM_PROGRAM != "WarpTerminal" ]]; then
   test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
 fi
 
+
 (
 if ! ssh-add -l >/dev/null 2>&1; then
    ssh-add --apple-load-keychain >/dev/null 2>&1
 fi &
 )
-
 #znap function _sshadd ssh 'eval "$(ssh-add --apple-load-keychain)"'
 # compctl -K _sshadd ssh
 
 source /Users/riley/.docker/init-zsh.sh || true # Added by Docker Desktop
+
+export NVM_DIR="$HOME/.config/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
+export PATH=$PATH:/Users/riley/.spicetify