Merge branch 'main' of github.com:tmayoff/.dotfiles

dot_config/flake/home/common.nix

@@ -16,14 +16,14 @@
     ./nushell.nix
   ];
 
-  nixpkgs = {
-    overlays = [
-      outputs.overlays.additions
-      outputs.overlays.modifications
-      outputs.overlays.unstable-packages
-      inputs.helix.overlays.default
-    ];
-  };
+  # nixpkgs = {
+  #   overlays = [
+  #     outputs.overlays.additions
+  #     outputs.overlays.modifications
+  #     outputs.overlays.unstable-packages
+  #     inputs.helix.overlays.default
+  #   ];
+  # };
 
   home.packages = with pkgs; [
     # unstable.nix-output-monitor

dot_config/flake/home/hinge/darwin.nix

@@ -1,62 +0,0 @@
-{
-  outputs,
-  pkgs,
-  lib,
-  ...
-}: {
-  # services.aerospace.enable = true;
-
-  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
-      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;
-  };
-
-  system.defaults.NSGlobalDomain._HIHideMenuBar = true;
-
-  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;
-}

dot_config/flake/home/hinge/hinge.nix

@@ -1,46 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ../stylix.nix
-    ../common.nix
-    ../kitty.nix
-  ];
-
-  # xdg.enable = lib.mkForce false;
-
-  home = {
-    username = "tyler.mayoff";
-    # homeDirectory = /Users/tyler.mayoff;
-
-    packages = with pkgs; [
-      bazel_7
-      cmake
-      conan
-
-      black
-
-      swiftlint
-      unstable.helix-gpt
-      unstable.lsp-ai
-      python312Packages.python-lsp-server
-      typescript-language-server
-      cmake-language-server
-      jdt-language-server
-      ffmpeg
-      sccache
-      just
-      yarn
-      cocoapods
-    ];
-
-    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";
-}

dot_config/flake/home/hinge/sketchybar.nix

@@ -1,6 +0,0 @@
-{...}: {
-  # services.sketchybar = {
-  #   enable = true;
-  #   extraPackages = [];
-  # };
-}