Updated zsh config

2026-02-14 06:12:34 +00:00 · 2023-10-07 23:08:42 -04:00
parent a3c3ed1d23
commit 30ff7b7652
8 changed files with 66 additions and 58 deletions
--- a/nvim/m-housh/lazy-lock.json
+++ b/nvim/m-housh/lazy-lock.json
@@ -14,7 +14,7 @@
  "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" },
  "go.nvim": { "branch": "master", "commit": "54387e506e597ab65a89baa1681429728f66ed71" },
  "guihua.lua": { "branch": "master", "commit": "5ad8dba19ce9b9fd8965598984dfdc9c119f97e4" },
-  "lazy.nvim": { "branch": "main", "commit": "6687afae42b72fb660bfae2bd0eb98e77156829b" },
+  "lazy.nvim": { "branch": "main", "commit": "62745a7320f48a00ac4f7b0591352608cbc6bcea" },
  "lazygit.nvim": { "branch": "main", "commit": "de35012036d43bca03628d40d083f7c02a4cda3f" },
  "lsp_signature.nvim": { "branch": "master", "commit": "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23" },
  "lspkind-nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
@@ -22,17 +22,20 @@
  "mason-lspconfig.nvim": { "branch": "main", "commit": "e2705063f395b44f676cd26596a11007a2cbd3bd" },
  "mason.nvim": { "branch": "main", "commit": "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a" },
  "neo-tree.nvim": { "branch": "v3.x", "commit": "71f1841ba6c652908678cece623f52c1fea8a6cd" },
-  "neodev.nvim": { "branch": "main", "commit": "ee960afffdb95472f719a72a1edb494ffea09c92" },
+  "neodev.nvim": { "branch": "main", "commit": "f8592cc143a5512b98a2c3683aa43c73f98e34f7" },
  "nightfox.nvim": { "branch": "main", "commit": "fe2fc7b93d66349eff2c5baa6cec922ee3958f56" },
-  "noice.nvim": { "branch": "main", "commit": "7cf858c30841c9c41601ce58e5bc2023228037ef" },
+  "noice.nvim": { "branch": "main", "commit": "fcd01710ff6918d4d3ef90c8e36f3addacba13bf" },
  "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" },
  "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" },
+  "nvim-dap": { "branch": "master", "commit": "27d65bd6301779acbe9674221b7201e5048f3b68" },
+  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
  "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" },
  "nvim-lspconfig": { "branch": "master", "commit": "2b361e043810d5587d9af0787f8ce40da92ec5e9" },
  "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" },
-  "nvim-treesitter": { "branch": "master", "commit": "10bfa4826f2235c600c073a82e0d78718aa7240e" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "4724694bc03ce1148860a46d9d77c3664d8188ab" },
-  "nvim-web-devicons": { "branch": "master", "commit": "45d0237c427baba8cd05e0ab26d30e2ee58c2c82" },
+  "nvim-treesitter": { "branch": "master", "commit": "957f3f8c15a88ef0f0c77ecd13edf2e2578f176e" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "76c7a89b41de77a4f83fb77fa072c5ad7605fe3b" },
+  "nvim-web-devicons": { "branch": "master", "commit": "56b3a6ce6d69329cbf603dd38ac59fb4d7774b01" },
  "plenary.nvim": { "branch": "master", "commit": "9ce85b0f7dcfe5358c0be937ad23e456907d410b" },
  "swift.nvim": { "branch": "main", "commit": "a84cb608b0076aef39d3d4b1d20448a86a73b2eb" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
--- a/nvim/m-housh/lua/user/plugin/go.lua
+++ b/nvim/m-housh/lua/user/plugin/go.lua
@@ -5,6 +5,9 @@ return {
    "ray-x/guihua.lua",
    "neovim/nvim-lspconfig",
    "nvim-treesitter/nvim-treesitter",
+    'mfussenegger/nvim-dap',
+    'rcarriga/nvim-dap-ui',
+    'theHamsta/nvim-dap-virtual-text',
  },
  config = function()
    require("go").setup()
--- a/nvim/m-housh/lua/user/plugin/lsp.lua
+++ b/nvim/m-housh/lua/user/plugin/lsp.lua
@@ -88,7 +88,7 @@ return {
      -- Use a loop to conveniently call 'setup' on multiple servers and
      -- map buffer local keybindings when the language server attaches
      --local capabilities = vim.lsp.protocol.make_client_capabilities()
-      capabilities = require("cmp_nvim_lsp").default_capabilities()
+      local capabilities = require("cmp_nvim_lsp").default_capabilities()

      local servers = {
          "bashls",
--- a/scripts/scripts/mhlink
+++ b/scripts/scripts/mhlink
@@ -27,8 +27,8 @@ zparseopts -- \

 #################### Main ####################

-if [ -d "$HOME/projects/github.com/m-housh/mhoush.com" ]; then
-  root="$HOME/projects/github.com/m-housh/mhoush.com"
+if [ -d "$GHREPOS/mhoush.com" ]; then
+  root="$$GHREPOS/mhoush.com"
 else
  root="$HOME/projects/mhoush.com"
 fi
--- a/scripts/scripts/newx
+++ b/scripts/scripts/newx
@@ -7,7 +7,7 @@ test ! -n "${SCRIPTS}" && echo "SCRIPTS not set" && exit 1;

 # fallback to check if the name arg ${1} exists, if not show usage text.
 test ! -n "${1}" && \
-  echo "usage: newscript <name> <optional: shell>" && \
+  echo "usage: newx <name> <optional: shell>" && \
  echo "shell defaults to sh if not supplied" && \
  exit 1;

--- a/scripts/scripts/tmux-sessionator
+++ b/scripts/scripts/tmux-sessionator
@@ -81,4 +81,5 @@ if ! tmux has-session -t "$selected_name" 2> /dev/null; then
  tmux new-session -ds "$selected_name" -c "$selected"
 fi

-tmux switch-client -t "$selected_name"
+[ -z $TMUX ] && tmux attach -t "$selected_name"  \
+  || tmux switch-client -t "$selected_name"
--- a/zsh/config/.zshenv
+++ b/zsh/config/.zshenv
@@ -1,2 +1,46 @@
-# Point to where the zsh config is.
+# Config
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local"
 export ZDOTDIR="$HOME/.config/zsh"
+export SHELL="$(which zsh)"
+
+# Git
+export GITUSER="m-housh"
+export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
+
+# Directories
+export ARCHIVE="/Volumes/Archive"
+export BUCKET="/Volumes/Bucket"
+export REPOS="$BUCKET/Repos"
+export GHREPOS="$REPOS/github.com/$GITUSER"
+export HHEREPOS="$BUCKET/Repos/github.com/hhe-dev"
+export LOCAL_REPOS="$REPOS/local"
+export HCP_NOTES="$HHEREPOS/hcp-notes"
+export HXZET="$BUCKET/Repos/github.com/hvac-hx/hx-zets"
+export HAAS="$BUCKET/Repos/github.com/haas"
+export HAASZET="$HAAS/zets"
+export DOCUMENTS="$HOME/Documents"
+export DOWNLOADS="$HOME/Downloads"
+export PDFS="$HOME/Library/Mobile Documents/com~apple~Preview/Documents"
+export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals"
+export SCREENSHOTS="$BUCKET/Pictures/Screenshots"
+export DOTFILES="$HOME/.dotfiles"
+export SCRIPTS="$HOME/.local/scripts"
+export WORK="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work"
+export ZETDIR="$GHREPOS/zets"
+
+# NPM
+export NPM_CONFIG_CACHE="$HOME/.local/npm"
+
+# Go
+export GOPATH="$HOME/go"
+
+export TERM=xterm-256color
+export EDITOR=nvim
+export VISUAL=nvim
+export EDITOR_PREFIX=nvim
+#export VIMINIT='source $MYVIMRC'
+#export MYVIMRC="$HOME/.vim/vimrc"
+export MYZSHRC="$ZDOTDIR/.zshrc"
+export NVIM_APPNAME="m-housh"
+export NAP_CONFIG="$HOME/.config/nap/config.yaml"
--- a/zsh/config/.zshrc
+++ b/zsh/config/.zshrc
@@ -12,50 +12,6 @@
 _source_if() { test -r "$1" && source "$1" || return 0 }

 #------------------------------ exports ------------------------------
-# Config
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local"
-export ZDOTDIR="$HOME/.config/zsh"
-export SHELL="$(which zsh)"
-
-# Directories
-export ARCHIVE="/Volumes/Archive"
-export BUCKET="/Volumes/Bucket"
-export REPOS="$BUCKET/Repos"
-export GHREPOS="$REPOS/github.com/$GITUSER"
-export HHEREPOS="$BUCKET/Repos/github.com/hhe-dev"
-export LOCAL_REPOS="$REPOS/local"
-export HCP_NOTES="$HHEREPOS/hcp-notes"
-export HXZET="$BUCKET/Repos/github.com/hvac-hx/hx-zets"
-export HAAS="$BUCKET/Repos/github.com/haas"
-export HAASZET="$HAAS/zets"
-export DOCUMENTS="$HOME/Documents"
-export DOWNLOADS="$HOME/Downloads"
-export PDFS="$HOME/Library/Mobile Documents/com~apple~Preview/Documents"
-export PROPOSALS="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work/Proposals"
-export SCREENSHOTS="$BUCKET/Pictures/Screenshots"
-export DOTFILES="$HOME/.dotfiles"
-export SCRIPTS="$HOME/.local/scripts"
-export WORK="$HOME/Library/Mobile Documents/com~apple~CloudDocs/Work"
-export ZETDIR="$GHREPOS/zets"
-
-# Git
-export GITUSER="m-housh"
-export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
-
-# NPM
-NPM_CONFIG_CACHE="$HOME/.local/npm"
-
-export TERM=xterm-256color
-export EDITOR=nvim
-export VISUAL=nvim
-export EDITOR_PREFIX=nvim
-#export VIMINIT='source $MYVIMRC'
-#export MYVIMRC="$HOME/.vim/vimrc"
-export MYZSHRC="$ZDOTDIR/.zshrc"
-export NVIM_APPNAME="m-housh"
-export NAP_CONFIG="$HOME/.config/nap/config.yaml"
-
 autoload -U up-line-or-beginning-search
 autoload -U down-line-or-beginning-search
 zle -N up-line-or-beginning-search
@@ -115,7 +71,8 @@ path_prepend \
  "/usr/local/bin" \
  "/opt/homebrew/bin" \
  "/opt/homebrew/sbin" \
-  "$HOME/go/bin" \
+  "$GOROOT/bin" \
+  "$GOPATH/bin" \
  "$HOME/.local/bin" \
  "$SCRIPTS"

@@ -204,7 +161,7 @@ alias gs='git status'
 alias l='ls -lah --color=auto'
 alias reload='exec zsh -l'
 alias t='tmux'
-alias ts='$~/.local/scripts/tmux-sessionator'
+alias ts='~/.local/scripts/tmux-sessionator'
 alias tss='~/.local/scripts/tmux-sessionator --choose'
 alias tls='tmux list-sessions'
 alias temp='cd $(mktemp -d)'