From 9570c81a28ea77d446108c2bbe11581bf9011a5b Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Tue, 9 Jan 2024 14:15:50 -0500
Subject: [PATCH] feat: migrate homebrew packages to nix

---
 machines/mac/configuration.nix | 12 ++----------
 user/environments/mac/home.nix |  4 ++--
 user/modules/zsh.nix           |  4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix
index a0f76b2..d3eea95 100644
--- a/machines/mac/configuration.nix
+++ b/machines/mac/configuration.nix
@@ -20,8 +20,6 @@
       VISUAL = "nvim";
     };
     systemPackages = with pkgs; [
-      # Terminal
-      git
       # Containers
       colima
       unstable.docker-client
@@ -32,6 +30,8 @@
       unstable.spicetify-cli
       # Java
       checkstyle
+      # XCode
+      cocoapods
     ];
   };
 
@@ -63,21 +63,13 @@
       # Upgrade outdated formulae on activation
       upgrade = true;
     };
-    taps = [
-      "ddev/ddev"
-      "homebrew/cask-fonts"
-    ];
     brews = [
-      "cocoapods"
       "openjdk@17"
-      "bash" # Required for nix-shell to function properly
-      "ddev/ddev/ddev"
       "firefoxpwa"
     ];
     casks = [
       "hiddenbar"
       "android-platform-tools"
-      "font-caskaydia-cove-nerd-font"
       "gcenx/wine/wineskin"
     ];
   };
diff --git a/user/environments/mac/home.nix b/user/environments/mac/home.nix
index 6e16c52..daa23f8 100644
--- a/user/environments/mac/home.nix
+++ b/user/environments/mac/home.nix
@@ -14,10 +14,10 @@
     firebird-emu
   ];
 
-  # Add homebrew applications to path
   programs.zsh = {
+    # Needed for nix-shell to have the correct bash version
     profileExtra = ''
-      PATH=/opt/homebrew/bin:$PATH
+      PATH=/run/current-system/sw/bin:$PATH
     '';
     prezto.pmodules = [
       "osx"
diff --git a/user/modules/zsh.nix b/user/modules/zsh.nix
index 7e48014..4073c7f 100644
--- a/user/modules/zsh.nix
+++ b/user/modules/zsh.nix
@@ -12,8 +12,8 @@
         src = pkgs.fetchFromGitHub {
           owner = "chisui";
           repo = "zsh-nix-shell";
-          rev = "v0.1.0";
-          sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx";
+          rev = "v0.8.0";
+          sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
         };
       }
       {