diff --git a/Brewfile b/Brewfile index d0fd19d..fa213ea 100644 --- a/Brewfile +++ b/Brewfile @@ -19,8 +19,8 @@ brew "git-absorb" brew "git-lfs" brew "glab" brew "pcre2" -brew "go" -brew "go@1.23" +brew "go", link: false +brew "go@1.23", link: true brew "golangci-lint" brew "goreman" brew "govulncheck" diff --git a/readme.org b/readme.org index 608f850..e394b4b 100644 --- a/readme.org +++ b/readme.org @@ -18,7 +18,7 @@ Before diving into the technical details, below is a brief summary of how I get ** Code editing -For an editor I primarily rely on [[https://www.gnu.org/software/emacs/][emacs]], specifically [[https://github.com/doomemacs/doomemacs][doom emacs]]. +For an editor I primarily rely on [[https://www.gnu.org/software/emacs/][emacs]], specifically [[https://github.com/doomemacs/doomemacs][doom emacs]], running within a terminal. The main feature that I rely on in emacs is [[https://orgmode.org/][org-mode]]. This allows me to do literate programming, writing my documentation with embedded code blocks that are actually executable or exportable via [[https://orgmode.org/worg/org-contrib/babel/intro.html][babel]]. diff --git a/setup.org b/setup.org index 62653f1..e1931e7 100644 --- a/setup.org +++ b/setup.org @@ -43,7 +43,7 @@ bw login mail@jamesblair.net I make extensive use of ~.dotfiles~ to further customise my environment. The script below restores my versions of key dotfiles automatically. -*** Obtain ssh key from bitwarden +** Obtain ssh key from bitwarden In order to be able to clone the repository in the next step we need to obtain our ssh keys from bitwarden. Given we have installed the bitwarden cli we can mostly automte this process minus the initial login to bitwarden. @@ -59,7 +59,7 @@ ssh-keygen -t rsa -f ~/.ssh/james -q -P "" export BW_SESSION=$(bw unlock --raw > ~/.bw_session && cat ~/.bw_session) # Export both keys -export key=$(bw get item desktop --pretty | grep notes) +export key=$(bw get item "$(hostname)" --pretty | grep notes) # Extract private key export private=${key:12} @@ -71,7 +71,7 @@ export public=${key/*ssh-rsa/ssh-rsa} && echo ${public::-2} | awk '{gsub(/\\n/," #+end_src -*** Clone and restore dotfiles +** Clone and restore dotfiles Once our keys are available to us we can clone down our dotfiles and get back to our comfortable normal terminal environment.