Reorg and updates to support macos

- Split kitty to it's own file
- Updated flake.nix to support multiple systems
- Updated flake.lock

dot_config/flake/home/gui.nix

@@ -5,6 +5,7 @@
   ...
 }: {
   imports = [
+    ./kitty.nix
   ];
 
   nixGL.packages = inputs.nixgl.packages;
@@ -24,21 +25,6 @@
 
   # programs.vscode.enable = true;
 
-  programs.kitty = {
-    enable = true;
-    package = config.lib.nixGL.wrap pkgs.kitty;
-    font = {
-      name = "JetBrainsMono Nerd Font";
-      # package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
-    };
-
-    settings = {
-      disable_ligatures = "cursor";
-    };
-
-    themeFile = "Catppuccin-Macchiato";
-  };
-
   programs.alacritty = {
     enable = true;
     package = config.lib.nixGL.wrap pkgs.alacritty;

dot_config/flake/home/hinge/hinge.nix

@@ -1,20 +1,24 @@
 {
-  inputs,
-  outputs,
   lib,
-  config,
   pkgs,
   ...
-}: {
- imports = [../common.nix];
- 
-  home.username =lib.mkForce "tyler.mayoff";
+}: 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 {
+  imports = [
+    ../common.nix
+    ../kitty.nix
+    # mac-app-util.homeManagerModules.default
+  ];
+
+  home.username = lib.mkForce "tyler.mayoff";
   home.homeDirectory = lib.mkForce "/Users/tyler.mayoff";
 
   home.packages = with pkgs; [
-
-  bazel  ];
-
- # home.stateVersion = "23.11";
-
+    bazel_7
+  ];
 }

dot_config/flake/home/kitty.nix

@@ -0,0 +1,16 @@
+{pkgs, config, ...}: {
+  programs.kitty = {
+    enable = true;
+    package = config.lib.nixGL.wrap pkgs.kitty;
+    font = {
+      name = "JetBrainsMono Nerd Font";
+      package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
+    };
+
+    settings = {
+      disable_ligatures = "cursor";
+    };
+
+    themeFile = "Catppuccin-Macchiato";
+  };
+}