From 87bb07f015c266fe6eb8608e0bb837b52c819a12 Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler.mayoff@hingehealth.com>
Date: Fri, 14 Feb 2025 09:58:25 -0500
Subject: [PATCH] Merged

---
 dot_config/aerospace/aerospace.toml    |  2 +-
 dot_config/flake/flake.nix             |  4 ++--
 dot_config/flake/home/hinge/darwin.nix | 26 ++++++++++++++++++++++++--
 dot_config/flake/pkgs/default.nix      |  7 +++++++
 run_home-manager.sh.tmpl               |  4 ++++
 5 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 run_home-manager.sh.tmpl

diff --git a/dot_config/aerospace/aerospace.toml b/dot_config/aerospace/aerospace.toml
index f7beebe..de7ef24 100644
--- a/dot_config/aerospace/aerospace.toml
+++ b/dot_config/aerospace/aerospace.toml
@@ -57,7 +57,7 @@ inner.horizontal = 4
 inner.vertical =   4
 outer.left =       0
 outer.bottom =     0
-outer.top =        0
+outer.top =        30
 outer.right =      0
 
 # 'main' binding mode declaration
diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index fbf1e18..252ed33 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -77,8 +77,8 @@
         ./home/hinge/darwin.nix
         home-manager.darwinModules.home-manager
         {
-          home-manager.useGlobalPkgs = false;
-          home-manager.useUserPackages = false;
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
 
           home-manager.extraSpecialArgs = {inherit inputs outputs;};
           home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;
diff --git a/dot_config/flake/home/hinge/darwin.nix b/dot_config/flake/home/hinge/darwin.nix
index efe0685..a44ab98 100644
--- a/dot_config/flake/home/hinge/darwin.nix
+++ b/dot_config/flake/home/hinge/darwin.nix
@@ -1,4 +1,5 @@
 {
+  outputs,
   pkgs,
   lib,
   ...
@@ -7,8 +8,21 @@
 
   imports = [
     # ../fish.nix
+    ./sketchybar.nix
   ];
 
+  nixpkgs = {
+    overlays = [
+      outputs.overlays.additions
+      outputs.overlays.modifications
+      outputs.overlays.unstable-packages
+    ];
+
+    config = {
+      allowUnfree = true;
+    };
+  };
+
   nix.extraOptions =
     ''
       auto-optimise-store = true
@@ -24,17 +38,25 @@
     shell = pkgs.fish;
   };
 
-  services.sketchybar.enable = true;
+  system.defaults.NSGlobalDomain._HIHideMenuBar = true;
 
-  system.stateVersion = 5;
+  security.pam.enableSudoTouchIdAuth = true;
 
   environment.systemPackages = with pkgs; [
     pinentry_mac
     llvmPackages_19.clang-tools
 
+    sketchybar
+    sbarlua
+
+    lua
+
     # android-tools
     jdk17
   ];
+
   programs.fish.enable = true;
   programs.zsh.enable = true;
+
+  system.stateVersion = 5;
 }
diff --git a/dot_config/flake/pkgs/default.nix b/dot_config/flake/pkgs/default.nix
index 5d56bdc..952d3a4 100644
--- a/dot_config/flake/pkgs/default.nix
+++ b/dot_config/flake/pkgs/default.nix
@@ -1,2 +1,9 @@
 pkgs: {
+  sbarlua = {
+    src = pkgs.fetchFromGitHub {
+      repo = "SbarLua";
+      owner = "FelixKratz";
+      rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";
+    };
+  };
 }
diff --git a/run_home-manager.sh.tmpl b/run_home-manager.sh.tmpl
new file mode 100644
index 0000000..1157cab
--- /dev/null
+++ b/run_home-manager.sh.tmpl
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+home-manager switch --flake ~/.config/flake/
+darwin-rebuild switch --flake ~/.config/flake/