Merge branch 'main' into stylix

dot_config/flake/home/hinge/hinge.nix

@@ -1,24 +1,15 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
-  # mac-app-util-src = builtins.fetchTarball {
-  #   url = "https://github.com/hraban/mac-app-util/archive/master.tar.gz";
-  #   sha256 = "1w80vjcnaysjlzxsp3v4pxq4yswbjvxs8ann2bk0m7rkjljnzz6m";
-  # };
-  # mac-app-util = import mac-app-util-src {};
-in rec {
+{pkgs, ...}: {
   imports = [
     ../stylix.nix
     ../common.nix
     ../kitty.nix
-    # mac-app-util.homeManagerModules.default
   ];
 
+  # xdg.enable = lib.mkForce false;
+
   home = {
-    username = lib.mkForce "tyler.mayoff";
-    homeDirectory = lib.mkForce "/Users/tyler.mayoff";
+    username = "tyler.mayoff";
+    # homeDirectory = /Users/tyler.mayoff;
 
     packages = with pkgs; [
       bazel_7
@@ -26,10 +17,7 @@ in rec {
       conan
 
       black
-    
-      # clang
-      # biome
-      deno
+
       swiftlint
       unstable.helix-gpt
       unstable.lsp-ai
@@ -42,13 +30,17 @@ in rec {
       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";
 }