From 1a2108643d3fc2b9149c07611e7d4d35d6149640 Mon Sep 17 00:00:00 2001
From: Brett Langdon <brett.langdon@datadoghq.com>
Date: Wed, 1 Nov 2023 13:42:22 -0400
Subject: [PATCH] update

---
 emacs.d/init.el               | 20 +++++++++++++-------
 emacs.d/layers/go/init.el     | 14 ++++++++++++++
 emacs.d/layers/python/init.el |  2 +-
 emacs.d/layers/rust/init.el   |  4 +++-
 setup.sh                      |  2 +-
 zshrc.d/.env.zsh              |  4 ++++
 6 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 emacs.d/layers/go/init.el

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 9fdd2aa..08c1542 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -320,7 +320,7 @@
     (setq lsp-eldoc-enable-hover t)
     (setq lsp-modeline-code-actions-enable nil)
     (setq lsp-modeline-diagnostics-enable nil)
-    (setq lsp-headerline-breadcrumb-enable nil)
+    (setq lsp-headerline-breadcrumb-enable t)
     (setq lsp-semantic-tokens-enable nil)
     (setq lsp-enable-folding nil)
     (setq lsp-enable-imenu nil)
@@ -343,13 +343,19 @@
       :defer t
       :commands helm-lsp-workspace-symbol)
 
+    (use-package copilot
+      :quelpa (copilot :fetcher github
+                       :repo "zerolfx/copilot.el"
+                       :branch "main"
+                       :files ("dist" "*.el")))
+
     ;; dap-mode
-    (use-package dap-mode
-      :defer t
-      :ensure t :after lsp-mode
-      :config
-      (dap-mode t)
-      (dap-ui-mode t))
+    ;; (use-package dap-mode
+    ;;   :defer t
+    ;;   :ensure t :after lsp-mode
+    ;;   :config
+    ;;   (dap-mode t)
+    ;;   (dap-ui-mode t))
 
     ;; ;; Turn `C-]' into a sticky "super" modifier.
     (define-key local-function-key-map [?\C-\]] 'event-apply-super-modifier)
diff --git a/emacs.d/layers/go/init.el b/emacs.d/layers/go/init.el
new file mode 100644
index 0000000..e768465
--- /dev/null
+++ b/emacs.d/layers/go/init.el
@@ -0,0 +1,14 @@
+(defun lsp-go-install-save-hooks ()
+  (add-hook 'before-save-hook #'lsp-format-buffer t t)
+  (add-hook 'before-save-hook #'lsp-organize-imports t t))
+
+(use-package go-mode
+  :defer t
+  :diminish go-mode
+  :ensure t
+  :mode (("\\.go\\'" . go-mode))
+  :init
+  (setq rust-format-on-save t)
+  :hook (go-mode . (lambda ()
+                     (lsp)))
+  :hook (go-mode . lsp-go-install-save-hooks))
diff --git a/emacs.d/layers/python/init.el b/emacs.d/layers/python/init.el
index 924b9f8..a9308d8 100644
--- a/emacs.d/layers/python/init.el
+++ b/emacs.d/layers/python/init.el
@@ -44,4 +44,4 @@
 ;; Enable Flycheck for python
 ;; (enable-flycheck 'python-mode-hook)
 
-(require 'dap-python)
+;; (require 'dap-python)
diff --git a/emacs.d/layers/rust/init.el b/emacs.d/layers/rust/init.el
index 0d00807..2aabccd 100644
--- a/emacs.d/layers/rust/init.el
+++ b/emacs.d/layers/rust/init.el
@@ -4,4 +4,6 @@
   :ensure t
   :mode (("\\.rs\\'" . rust-mode))
   :init
-  (setq rust-format-on-save t))
+  (setq rust-format-on-save t)
+  :hook (rust-mode . (lambda ()
+                                 (lsp))))  ; or lsp-deferred
diff --git a/setup.sh b/setup.sh
index 92fc7f5..c60517c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -8,7 +8,7 @@
 dir=~/dotfiles                    # dotfiles directory
 olddir=~/dotfiles_old             # old dotfiles backup directory
 files="emacs.d gitconfig gitignore_global psqlrc sqliterc zshrc.d zshrc"    # list of files/folders to symlink in homedir
-config_dir="~/.config/"
+config_dir=~/.config/
 config_files="starship.toml"  # list of files for ~/config/
 ##########
 
diff --git a/zshrc.d/.env.zsh b/zshrc.d/.env.zsh
index a380b71..8faa820 100644
--- a/zshrc.d/.env.zsh
+++ b/zshrc.d/.env.zsh
@@ -8,6 +8,9 @@ setopt INC_APPEND_HISTORY_TIME
 export HISTSIZE=1000000
 export SAVEHIST=1000000
 
+# Omit `/` from the list of word characters so delete work on a path only deletes sub-path and not the whole thing
+export WORDCHARS=${WORDCHARS/\/}
+
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export TERM="xterm-256color"
@@ -49,6 +52,7 @@ PATH="$HOME/.cargo/bin:$PATH"
 PATH="~/.local/bin:/usr/local/bin:/usr/local/sbin:/sbin:$PATH"
 PATH="$PATH:/usr/local/go/bin:$GOPATH/bin"
 PATH="$HOME/.poetry/bin:$PATH"
+PATH="/opt/homebrew/bin:$PATH"
 command -v pyenv 2>&1 > /dev/null && PATH="$(pyenv root)/shims:${PATH}"
 export PATH="$HOME/.rvm/bin:$PATH"
 export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"