From 6f204b885c0c95f768d5bdfccbd14ee62dd09257 Mon Sep 17 00:00:00 2001
From: brett <brettinternet@gmail.com>
Date: Mon, 11 Nov 2024 15:22:47 -0700
Subject: [PATCH] add complete brew list

---
 darwin.yaml                  |  4 +--
 darwin/Brewfile              | 63 +++++++++++++++++++++++-------------
 darwin/{brew.sh => setup.sh} | 10 ++----
 nix/flake.nix                |  2 --
 nix/hosts/kipp/default.nix   | 46 +++++++++++++-------------
 nix/setup.sh                 |  4 ++-
 6 files changed, 70 insertions(+), 59 deletions(-)
 rename darwin/{brew.sh => setup.sh} (51%)

diff --git a/darwin.yaml b/darwin.yaml
index f77138c..c313569 100644
--- a/darwin.yaml
+++ b/darwin.yaml
@@ -29,5 +29,5 @@
       if: '[ -x "$(command -v nix)" ]'
 
 - shell:
-    - ['./darwin/brew.sh']
-    - ['[ -x "$(command -v nix)" ] && ./nix/setup.sh']
+    - ['./darwin/setup.sh']
+    # - ['[ -x "$(command -v nix)" ] && ./nix/setup.sh']
diff --git a/darwin/Brewfile b/darwin/Brewfile
index d5ffe55..5d67ea9 100644
--- a/darwin/Brewfile
+++ b/darwin/Brewfile
@@ -1,37 +1,41 @@
-# https://github.com/Homebrew/homebrew-bundle
-
-mas "Xcode", id: 497799835
-
-brew "git"
-brew "coreutils"
-brew "emacs"
-brew "neovim"
-brew "node"
-brew "elixir"
-brew "btop"
+# CLI
+brew "asdf"
+brew "atuin"
 brew "bat"
-brew "tmux"
 brew "broot"
-brew "asdf"
-brew "terminal-notifier"
-brew "nvm"
-brew "wget"
-brew "qrencode"
-brew "virtualenvwrapper"
+brew "btop"
+brew "coreutils"
+brew "elixir"
 brew "fd"
+brew "git"
+brew "go-task"
 brew "lsd"
-brew "bat"
+brew "mas"
+brew "neovim"
+brew "qrencode"
+brew "rustc"
+brew "terminal-notifier"
+brew "tmux"
 brew "trash-cli"
-brew "go-task"
-brew "atuin"
+brew "wget"
+
+brew "nvm"
+brew "virtualenvwrapper"
 
+# CLI + GUI
 brew "wireguard-tools"
 
+# Custom taps
 tap "finestructure/Hummingbird"
 brew "finestructure/hummingbird/hummingbird"
 
-cask "bitwarden"
+# GUI
+cask "balenaetcher"
+cask "datagrip"
+cask "discord"
 cask "docker"
+cask "elgato-control-center"
+cask "elgato-stream-deck"
 cask "font-fira-code"
 cask "font-hack-nerd-font"
 cask "google-chrome"
@@ -40,10 +44,25 @@ cask "hammerspoon"
 cask "home-assistant"
 cask "iterm2"
 cask "karabiner-elements"
+cask "kopiaui"
+cask "maccy"
+cask "obs"
+cask "plex"
+cask "postico"
+cask "raspberry-pi-imager"
 cask "slack"
 cask "stats"
 cask "spotify"
 cask "telegram"
 cask "unnaturalscrollwheels"
+cask "vnc-viewer"
 cask "visual-studio-code"
+cask "vlc"
 cask "zoom"
+
+# AppStore
+mas "AdGuard for Safari", id: 1440147259
+mas "Bitwarden", id: 1352778147 # appstore for safari support
+mas "WiFiman", id: 1385561119
+mas "Windows App", id: 1295203466 # Microsoft Remote Desktop
+mas "Xcode", id: 497799835
diff --git a/darwin/brew.sh b/darwin/setup.sh
similarity index 51%
rename from darwin/brew.sh
rename to darwin/setup.sh
index e7f0e97..fefb685 100755
--- a/darwin/brew.sh
+++ b/darwin/setup.sh
@@ -3,16 +3,10 @@
 brew bundle --file darwin/Brewfile
 
 # Reset application attributes to allow run
-xattr -cr /Applications/Chromium.app
-xattr -cr /Applications/Yippy.app
 xattr -cr /Applications/UnnaturalScrollWheels.app
 
-xcode-select --install
-
-# vim plug
-if [[ ! -f ~/.vim/autoload/plug.vim ]]; then
-  curl -fLo ~/.vim/autoload/plug.vim --create-dirs \
-    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
+if ! xcode-select -p 1>/dev/null; then
+  xcode-select --install
 fi
 
 if ! command -v rustc; then
diff --git a/nix/flake.nix b/nix/flake.nix
index 360a85d..d5c65e9 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -1,5 +1,3 @@
-# Nix annoyances:
-# - git add first? 🤔 https://github.com/NixOS/nix/issues/6642
 {
   description = "My nix-darwin system flake";
 
diff --git a/nix/hosts/kipp/default.nix b/nix/hosts/kipp/default.nix
index 06b5656..a807936 100644
--- a/nix/hosts/kipp/default.nix
+++ b/nix/hosts/kipp/default.nix
@@ -1,6 +1,4 @@
 { pkgs, ... }: {
-  nix.settings.experimental-features = "nix-command flakes";
-
   system.defaults = {
     dock.autohide = true;
     dock.persistent-apps = [];
@@ -17,33 +15,32 @@
   services.nix-daemon.enable = true;
   nix.settings.experimental-features = "nix-command flakes";
   programs.zsh.enable = true;
-  system.configurationRevision = self.rev or self.dirtyRev or null;
   # Read changelog before upgrading: darwin-rebuild changelog
   system.stateVersion = 5;
   nixpkgs.hostPlatform = "aarch64-darwin";
   time.timeZone = "America/Denver";
 
     # Search packages: nix-env -qaP | grep wget
-  environment.systemPackages = [
-    pkgs.asdf
-    pkgs.atuin
-    pkgs.bat
-    pkgs.broot
-    pkgs.btop
-    pkgs.coreutils
-    pkgs.elixir
-    pkgs.fd
-    pkgs.git
-    pkgs.go-task
-    pkgs.lsd
-    pkgs.mas
-    pkgs.neovim
-    pkgs.qrencode
-    pkgs.rustc
-    pkgs.terminal-notifier
-    pkgs.tmux
-    pkgs.trash-cli
-    pkgs.wget
+  environment.systemPackages = with pkgs; [
+    asdf
+    atuin
+    bat
+    broot
+    btop
+    coreutils
+    elixir
+    fd
+    git
+    go-task
+    lsd
+    mas
+    neovim
+    qrencode
+    rustc
+    terminal-notifier
+    tmux
+    trash-cli
+    wget
   ];
 
   homebrew = {
@@ -60,6 +57,7 @@
     casks = [
       "balenaetcher"
       "datagrip"
+      "discord"
       "docker"
       "elgato-control-center"
       "elgato-stream-deck"
@@ -70,7 +68,7 @@
       "hammerspoon"
       "home-assistant"
       "iterm2"
-      # "karabiner-elements"
+      "karabiner-elements"
       "kopiaui"
       "maccy"
       "obs"
diff --git a/nix/setup.sh b/nix/setup.sh
index 8eef273..d62433c 100755
--- a/nix/setup.sh
+++ b/nix/setup.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-# Note: flake is not accessible through symlink - https://github.com/NixOS/nix/issues/8013
+# Nix annoyances:
+# - git add first? 🤔 https://github.com/NixOS/nix/issues/6642
+# - flake is not accessible through symlink - https://github.com/NixOS/nix/issues/8013
 
 # Install Nix
 # https://nixos.org/download/