From 9aae46a78f76944a827178e840039eb94fb5c852 Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler.mayoff@hingehealth.com>
Date: Wed, 12 Feb 2025 15:34:33 -0500
Subject: [PATCH] Updated macos settings

---
 dot_config/aerospace/aerospace.toml    |  4 ++--
 dot_config/flake/flake.nix             |  5 ++---
 dot_config/flake/home/common.nix       |  2 ++
 dot_config/flake/home/fish.nix         |  4 ++--
 dot_config/flake/home/hinge/darwin.nix | 27 +++++++++++++++++++++++---
 dot_config/flake/home/hinge/hinge.nix  |  6 ++++--
 6 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/dot_config/aerospace/aerospace.toml b/dot_config/aerospace/aerospace.toml
index db3e92c..f7beebe 100644
--- a/dot_config/aerospace/aerospace.toml
+++ b/dot_config/aerospace/aerospace.toml
@@ -211,5 +211,5 @@ shift-down = ['volume set 0', 'mode main']
 
 [workspace-to-monitor-force-assignment]
 1 = 'built-in'
-2 = ['^DELL U2723QE \(1\)$']
-3 = ['^DELL U2723QE \(2\)$', '3']
+2 = ['^DELL U2723QE \(1\)$', 'BenQ EX2710 \(2\)$']
+3 = ['^DELL U2723QE \(2\)$', 'BenQ EX2710 \(1\)$']
diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index d2a8afa..348c2d9 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -55,9 +55,8 @@
         ./home/hinge/darwin.nix
         home-manager.darwinModules.home-manager
         {
-	 # pkgs = allPkgs."aarch64-darwin";
-          #home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
+          home-manager.useGlobalPkgs = false;
+          home-manager.useUserPackages = false;
 
           home-manager.extraSpecialArgs = {inherit inputs outputs;};
           home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;
diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix
index 2f2d9e5..b848516 100644
--- a/dot_config/flake/home/common.nix
+++ b/dot_config/flake/home/common.nix
@@ -77,6 +77,8 @@
 
   programs.zellij = {
     enable = true;
+    enableFishIntegration = false;
+    enableZshIntegration = false;
   };
 
   programs.starship = {
diff --git a/dot_config/flake/home/fish.nix b/dot_config/flake/home/fish.nix
index b765c69..d8d837a 100644
--- a/dot_config/flake/home/fish.nix
+++ b/dot_config/flake/home/fish.nix
@@ -7,8 +7,8 @@
       set -gx DEBEMAIL "tyler@tylermayoff.com"
 
       fish_add_path $HOME/.local/bin
-      fish_add_path /opt/homebrew/bin
-      fish_add_path /opt/homebrew/opt/llvm@18/bin
+      # fish_add_path /opt/homebrew/bin
+      # fish_add_path /opt/homebrew/opt/llvm@18/bin
 
       if test -e $HOME/.config/fish/variables-$(hostname)fish
         source $HOME/.config/fish/variables-$(hostname).fish
diff --git a/dot_config/flake/home/hinge/darwin.nix b/dot_config/flake/home/hinge/darwin.nix
index aab833a..efe0685 100644
--- a/dot_config/flake/home/hinge/darwin.nix
+++ b/dot_config/flake/home/hinge/darwin.nix
@@ -1,11 +1,28 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   # services.aerospace.enable = true;
 
   imports = [
     # ../fish.nix
   ];
 
-  users.users."tyler.mayoff".shell = pkgs.fish;
+  nix.extraOptions =
+    ''
+      auto-optimise-store = true
+      experimental-features = nix-command flakes
+    ''
+    + lib.optionalString (pkgs.system == "aarch64-darwin") ''
+      extra-platforms = x86_64-darwin aarch64-darwin
+    '';
+
+  users.knownUsers = ["tyler.mayoff"];
+  users.users."tyler.mayoff" = {
+    uid = 502;
+    shell = pkgs.fish;
+  };
 
   services.sketchybar.enable = true;
 
@@ -13,7 +30,11 @@
 
   environment.systemPackages = with pkgs; [
     pinentry_mac
-  ];
+    llvmPackages_19.clang-tools
 
+    # android-tools
+    jdk17
+  ];
   programs.fish.enable = true;
+  programs.zsh.enable = true;
 }
diff --git a/dot_config/flake/home/hinge/hinge.nix b/dot_config/flake/home/hinge/hinge.nix
index e402083..3392259 100644
--- a/dot_config/flake/home/hinge/hinge.nix
+++ b/dot_config/flake/home/hinge/hinge.nix
@@ -29,14 +29,16 @@
       just
       yarn
       cocoapods
-      # android-tools
-      jdk17
     ];
 
     sessionVariables = {
       ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk";
       PATH = "$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools";
     };
+
+    file.".gnupg/gpg-agent.conf".text = ''
+      pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
+    '';
   };
 
   home.stateVersion = "24.11";