From 88aac720292322d47366df3a1a97d4ca343ac696 Mon Sep 17 00:00:00 2001
From: Michael Housh <mhoush@houshhomeenergy.com>
Date: Sun, 12 Dec 2021 13:25:48 -0500
Subject: [PATCH] Added neogit keybindings to which-key

---
 Makefile                                |  12 ++-
 README.md                               | 101 ++++++++++++++++++++++++
 macOS/.config/macOS/Brewfile            |   4 +-
 nvim/.config/nvim/lua/config/neogit.lua |   8 +-
 nvim/.config/nvim/lua/config/which.lua  |   5 ++
 5 files changed, 124 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 75c0eb1..da061c3 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,16 @@ bootsrap-brews:
 		--debug \
 		--file "$(PWD)/macOS/.config/macOS/Brewfile"
 
+bootstrap-logitech:
+	@curl \
+		--output ~/Downloads/logi-options.zip \
+		https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip
+
+bootstrap-amazon-workdocs:
+	@curl \
+		--output ~/Downloads/AmazonWorkDocsDrive.pkg \
+	  https://d3f2hupz96ggz3.cloudfront.net/mac/AmazonWorkDocsDrive.pkg
+
 bootstrap-app-store:
 	@brew bundle \
 		--no-lock \
@@ -20,4 +30,4 @@ stow:
 	@stow --stow --verbose --target ~ */
 
 # Order matters, need to install home-brew first then formula
-bootstrap: bootstrap-homebrew bootstrap-brews stow bootstrap-app-store
+bootstrap: bootstrap-homebrew bootstrap-brews stow bootstrap-logitech bootstrap-amazon-workdocs bootstrap-app-store
diff --git a/README.md b/README.md
index 7498071..f49b2e0 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,104 @@
 # My Dotfiles
 
 This is my repository for learning dotfiles.
+
+It currently will install homebrew and the following homebrew formula.
+
+```
+fd
+git
+mas
+neovim
+node
+ripgrep
+stow
+swift-format
+zsh
+
+```
+
+It will also install the following homebrew casks in the `~/Applications` directory.
+
+```
+docker
+google-chrome
+iterm2
+microsoft-teams
+obs
+paw
+sketchup-pro
+```
+
+And the following fonts.
+
+```
+font-inconsolata-nerd-font
+
+```
+
+The following applications will be installed from the macOS app store.
+
+```
+pwSafe
+Xcode
+```
+
+The following non-app-store applications will be downloaded for later installation / setup.  These will be placed in `~/Downloads`
+
+```
+Logi Options      # logitech mouse / keyboard settings
+AmazonWorkDocsDrive
+```
+
+## Installation
+
+Clone the repository.
+
+```bash
+git clone https://m-housh/dotfiles.git ~/.dotfiles && \
+  cd ~/.dotfiles
+```
+
+The Makefile includes commands to install dependencies andlink the configuration using `gnu-stow`.
+
+On a fresh system run the following command from the dotfiles root.
+
+```
+make bootstrap
+```
+
+This start by installing homebrew, then install the required homebrew formulas and casks.  Next it will use `gnu-stow` to symlink configuration files to the appropriate locations.  And finally, it will download applications from the `App Store`.
+
+After everything has finished up, you will be able to open `iTerm2` and load the profile which should now be symlinked to `~/.config/macOS/iterm/profile.json`
+
+## Make commands
+
+It is also possible to not do the full bootstrapping.  If you would only like to install homebrew (without any formula or casks) then you can run the following command.
+
+```
+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.
+
+```
+make bootstrap-brews
+```
+
+To symlink the configuration files only then you can run.
+
+```
+make stow
+```
+
+To download the logitech options application and place in your `~/Downloads` folder, you can run.
+
+```
+make bootstrap-logitech
+```
+
+And finally to download the app store applications run.
+
+```
+make bootstrap-app-store
+```
diff --git a/macOS/.config/macOS/Brewfile b/macOS/.config/macOS/Brewfile
index aebcf27..10d3ad9 100644
--- a/macOS/.config/macOS/Brewfile
+++ b/macOS/.config/macOS/Brewfile
@@ -20,8 +20,10 @@ brew "zsh"
 cask "docker"
 cask "google-chrome"
 cask "iterm2"
+cask "obs"
 cask "paw"
-#cask "sketchup-pro"
+cask "sketchup-pro"
+cask "microsoft-teams"
 
 # fonts
 cask "font-inconsolata-nerd-font"
diff --git a/nvim/.config/nvim/lua/config/neogit.lua b/nvim/.config/nvim/lua/config/neogit.lua
index 9048173..ff13f66 100644
--- a/nvim/.config/nvim/lua/config/neogit.lua
+++ b/nvim/.config/nvim/lua/config/neogit.lua
@@ -4,7 +4,7 @@ local neogit = require('neogit')
 neogit.setup {
 disable_signs = false,
   disable_context_highlighting = false,
-  disable_commit_confirmation = false,
+  disable_commit_confirmation = true,
   -- customize displayed signs
   signs = {
     -- { CLOSED, OPENED }
@@ -20,10 +20,10 @@ disable_signs = false,
     -- modify status buffer mappings
     status = {
       -- Adds a mapping with "B" as key that does the "BranchPopup" command
-      -- ["B"] = "BranchPopup",
-      -- ["C"] = "CommitPopup",
+       ["B"] = "BranchPopup",
+       ["C"] = "CommitPopup",
       -- ["P"] = "PullPopup",
-      -- ["S"] = "Stage",
+       ["S"] = "Stage",
       -- ["D"] = "Discard",
       -- Removes the default mapping of "s"
       -- ["s"] = "",
diff --git a/nvim/.config/nvim/lua/config/which.lua b/nvim/.config/nvim/lua/config/which.lua
index 3a02630..a9b341e 100644
--- a/nvim/.config/nvim/lua/config/which.lua
+++ b/nvim/.config/nvim/lua/config/which.lua
@@ -90,6 +90,11 @@ wk.register({
             "Find buffer"
         }
      },
+    g = {
+      name = "Git",
+      c = { "<cmd>Neogit Commit<cr>", "Git Commit" },
+      g = { "<cmd>Neogit<cr>", "Open NeoGit" }
+    },
     f = {
       name = "File",
       f = { "<cmd>Telescope find_files<cr>", "Find File" },