Fixed merge conflict

Makefile

@@ -1,15 +1,22 @@
 bootstrap-homebrew:
 	xcode-select --install | true
 	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-	chmod -R go-w $(brew --prefix)/share
+	chmod -R go-w $(brew --prefix)
 
-bootsrap-brews:
+bootstrap-brews:
 	@brew bundle \
 		--no-lock \
 		--cleanup \
 		--debug \
 		--file "$(PWD)/macOS/.config/macOS/Brewfile"
 
+bootstrap-casks:
+	@brew bundle \
+		--no-lock \
+		--cleanup \
+		--debug \
+		--file "$(PWD)/macOS/.config/macOS/Casks.Brewfile"
+
 bootstrap-logitech:
 	@curl \
 		--output ~/Downloads/logi-options.zip \
@@ -27,9 +34,11 @@ bootstrap-app-store:
 		--debug \
 		--file "$(PWD)/macOS/.config/macOS/AppStore.Brewfile"
 
+bootstrap-non-brews: bootstrap-logitech bootstrap-amazon-workdocs
+
 stow:
 	@stow --stow --verbose --target ~ */
 
 # Order matters, need to install home-brew first then formula
-bootstrap: bootstrap-homebrew bootstrap-brews stow bootstrap-logitech bootstrap-amazon-workdocs bootstrap-app-store
+bootstrap: bootstrap-homebrew bootstrap-brews bootstrap-casks stow bootstrap-non-brews bootstrap-app-store
 	open ~/Downloads

README.md

@@ -87,12 +87,18 @@ It is also possible to not do the full bootstrapping.  If you would only like to
 make bootstrap-homebrew
 ```
 
-Once homebrew is installed, if you'd like to install the homebrew formula and casks (located in `macOS/.config/macOS/Brewfile`) then you can run the following command.
+Once homebrew is installed, if you'd like to install the homebrew formula (located in `macOS/.config/macOS/Brewfile`) then you can run the following command.
 
 ```
 make bootstrap-brews
 ```
 
+To install homebrew casks (located in `macOS/.config/macOS/Casks.Brewfile`) then you can run the following command.
+
+```
+make bootstrap-casks
+```
+
 To symlink the configuration files only then you can run.
 
 ```
@@ -105,6 +111,12 @@ To download the logitech options application and place in your `~/Downloads` fol
 make bootstrap-logitech
 ```
 
+To download the amazon workdocs drive installer and place in your `~/Downloads` folder, you can run.
+
+```
+make bootstrap-amazon-workdocs
+```
+
 And finally to download the app store applications run.
 
 ```

macOS/.config/macOS/Brewfile

@@ -17,15 +17,5 @@ brew "swift-format"
 brew "zsh"
 brew "zsh-completions"
 
-# casks
-cask "docker"
-cask "google-chrome"
-cask "iterm2"
-cask "microsoft-teams"
-cask "obs"
-cask "rectangle"
-cask "paw"
-cask "sketchup-pro"
-
 # fonts
 cask "font-inconsolata-nerd-font"

macOS/.config/macOS/Casks.Brewfile

@@ -0,0 +1,12 @@
+tap "homebrew/cask"
+
+# casks
+cask "docker"
+cask "google-chrome"
+cask "iterm2"
+cask "microsoft-teams"
+cask "obs"
+cask "paw"
+cask "rectangle"
+cask "sketchup-pro"
+

nvim/.config/nvim/lua/settings.lua

@@ -37,7 +37,7 @@ o.scrolloff = 3 -- Minimal number of screen lines to keep above and below the cu
 o.sidescrolloff = 5 -- The minimal number of columns to scroll horizontally
 o.hlsearch = true -- highlight all matches on previous search pattern
 o.ignorecase = true -- ignore case in search patterns
-o.foldenable = false -- disable folding; enable with zi
+o.foldenable = true -- disable folding; enable with zi
 o.foldmethod = "expr"
 o.foldexpr = "nvim_treesitter#foldexpr()"
 -- o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<"

zsh/.config/zsh/.zshrc

@@ -1,8 +1,4 @@
 
-# configure keeping history of commands
-
-
-# TODO: move to $ZDOTDIR/.zsh_history
 setopt appendhistory
 setopt sharehistory
 setopt incappendhistory

zsh/.config/zsh/zsh-aliases

@@ -4,6 +4,7 @@ alias cdots() { cd "$HOME/.dotfiles" }
 alias zdots() { nvim "$ZDOTDIR" }
 alias dots() { nvim ~/.dotfiles }
 alias reload() { source "$ZDOTDIR/.zshrc" }
+alias banner() { clear && cat < "$ZDOTDIR/banner" }
 
 alias mkcd() { mkdir $1 && cd $1 }
 alias l() { ls -lah "$@" }
@@ -19,3 +20,6 @@ alias gco() { git checkout "$@" }
 alias gma() { git add . && git commit -m "$1" }
 alias gs() { git status }
 
+# move back to old cwd
+alias bk() { cd "$OLDPWD" }
+

zsh/.config/zsh/zsh-exports

@@ -6,6 +6,12 @@ HISTFILE=$ZDOTDIR/history
 # Allow useful scripts in ~/.bin to be in the search path.
 export PATH=~/.bin:$PATH
 
+# Add homebrew to the path
+if [ -d /opt/homebrew ]; then
+  export PATH=/opt/homebrew/bin:$PATH
+  export PATH=/opt/homebrew/sbin:$PATH
+fi
+
 # zsh-completions installed by homebrew
 if type brew &>/dev/null; then
  FPATH=$(brew --prefix)/share/zsh-completions:$FPATH
@@ -15,3 +21,4 @@ if type brew &>/dev/null; then
 fi
 
 export EDITOR="nvim"
+