From e51db7f78cb02533af1a485ed4e128712411904b Mon Sep 17 00:00:00 2001
From: brettlangdon <brett.langdon@datadoghq.com>
Date: Thu, 11 Nov 2021 13:18:35 -0500
Subject: [PATCH] update

---
 .gitignore        |  3 +++
 emacs.d/custom.el |  3 ++-
 emacs.d/init.el   | 19 ++++++++++++++++++-
 gitconfig         | 11 +++++++++--
 zshrc.d/.env.zsh  |  8 +++++++-
 5 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5eb2838..a621cde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ emacs.d/recentf
 emacs.d/auto-save-list
 emacs.d/custom.el
 emacs.d/.lsp-session*
+emacs.d/forge-database.sqlite
+emacs.d/projects
+emacs.d/transient 
diff --git a/emacs.d/custom.el b/emacs.d/custom.el
index 70e9132..4114e3f 100644
--- a/emacs.d/custom.el
+++ b/emacs.d/custom.el
@@ -4,7 +4,8 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(py-isort flycheck lsp-python-ms helm-lsp go-mode company projectile helm adoc-mode csv-mode php-mode python-black cython-mode scss-mode vue-mode tide rust-mode company-auctex tex-site auctex sphinx-doc company-lsp lsp-ui lsp-mode ws-butler use-package smartparens pip-requirements osx-clipboard monokai-theme markdown-mode helm-projectile helm-ag godoctor go-guru go-eldoc go-autocomplete flycheck-gometalinter doom-modeline dockerfile-mode docker-compose-mode diminish company-go company-anaconda)))
+   '(github-review forge magit clojure-mode py-isort flycheck lsp-python-ms helm-lsp go-mode company projectile helm adoc-mode csv-mode php-mode python-black cython-mode scss-mode vue-mode tide rust-mode company-auctex tex-site auctex sphinx-doc company-lsp lsp-ui lsp-mode ws-butler use-package smartparens pip-requirements osx-clipboard monokai-theme markdown-mode helm-projectile helm-ag godoctor go-guru go-eldoc go-autocomplete flycheck-gometalinter doom-modeline dockerfile-mode docker-compose-mode diminish company-go company-anaconda))
+ '(safe-local-variable-values '((encoding . utf-8))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 786f6d2..8a4eaba 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -233,7 +233,24 @@
   (use-package smartparens
     :diminish
     :config
-    (smartparens-global-mode)))
+    (smartparens-global-mode))
+
+  (use-package auth-source
+    :config
+    (customize-set-variable 'auth-sources (quote (macos-keychain-internet macos-keychain-generic))))
+
+  ;; Magit
+  ;; https://magit.vc/
+  (use-package magit
+    :diminish)
+
+  ;; Forge
+  (use-package forge
+    :after magit)
+
+  ;; github-review
+  (use-package github-review
+    :after forge))
 
 
 ;; -- Load layers --
diff --git a/gitconfig b/gitconfig
index 117e912..6846e94 100644
--- a/gitconfig
+++ b/gitconfig
@@ -29,7 +29,7 @@
 [grep]
   lineNumber = true
 [commit]
-        gpgsign = true
+	gpgsign = true
 [color]
         ui = true
 [color "diff-highlight"]
@@ -47,8 +47,15 @@
 [gpg]
         program = gpg
 [tag]
-        forceSignAnnotated = true
+	forceSignAnnotated = true
 [pull]
 	rebase = true
 [init]
 	defaultBranch = main
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[github]
+	user = brettlangdon
diff --git a/zshrc.d/.env.zsh b/zshrc.d/.env.zsh
index 16e8004..a380b71 100644
--- a/zshrc.d/.env.zsh
+++ b/zshrc.d/.env.zsh
@@ -5,6 +5,8 @@ setopt HIST_FIND_NO_DUPS
 setopt HIST_SAVE_NO_DUPS
 setopt INC_APPEND_HISTORY
 setopt INC_APPEND_HISTORY_TIME
+export HISTSIZE=1000000
+export SAVEHIST=1000000
 
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
@@ -44,15 +46,19 @@ PATH="/usr/local/heroku/bin:$PATH"
 PATH="/usr/local/opt/python/libexec/bin:$PATH"
 PATH="/usr/local/opt/sqlite/bin:$PATH"
 PATH="$HOME/.cargo/bin:$PATH"
-PATH="/usr/local/opt/python@3.8/libexec/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"
+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"
 
+export LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib"
+export CPPFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include"
+
 # Load in any additional .env files provided
 for f in $(find $ZSH_DIR/ -maxdepth 1 -print -type f | grep '\.env\..*\.zsh' | sort)
 do
     source "$f"
 done
+