Reorg

dot_config/aerospace/aerospace.toml

@@ -9,7 +9,7 @@ after-login-command = []
 after-startup-command = []
 
 # Start AeroSpace at login
-start-at-login = true
+# start-at-login = true
 
 # Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
 enable-normalization-flatten-containers = true

dot_config/flake/flake.nix

@@ -76,13 +76,12 @@
     };
 
     darwinConfigurations."MAC-C57KK2TC69" = darwin.lib.darwinSystem {
-      pkgs = allPkgs."aarch64-darwin";
+      specialArgs = {inherit inputs outputs;};
-      specialArgs = {inherit inputs;};
 
       modules = [
         lix-module.nixosModules.default
 
-        ./home/hinge/darwin.nix
+        ./machines/hinge/darwin.nix
 
         home-manager.darwinModules.home-manager
         {
@@ -90,7 +89,7 @@
           home-manager.useUserPackages = true;
 
           home-manager.extraSpecialArgs = {inherit inputs outputs;};
-          home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;
+          home-manager.users."tyler.mayoff" = import ./machines/hinge/home.nix;
           users.users."tyler.mayoff".home = "/Users/tyler.mayoff";
         }
       ];
@@ -103,6 +102,12 @@
         modules = [./home/guidebolt/guidebolt.nix];
       };
 
+      # "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration {
+      #   pkgs = allPkgs."aarch64-darwin";
+      #   extraSpecialArgs = {inherit inputs outputs;};
+      #   modules = [./home/wash/wash.nix];
+      # };
+
       "tyler@wash" = home-manager.lib.homeManagerConfiguration {
         pkgs = allPkgs."x86_64-linux";
         extraSpecialArgs = {inherit inputs outputs;};

dot_config/flake/home/common.nix

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

dot_config/flake/machines/hinge/darwin.nix

@@ -1,11 +1,9 @@
 {
+  inputs,
   outputs,
   pkgs,
-  lib,
   ...
 }: {
-  # services.aerospace.enable = true;
-
   imports = [
     # ../fish.nix
     ./sketchybar.nix
@@ -16,21 +14,26 @@
       outputs.overlays.additions
       outputs.overlays.modifications
       outputs.overlays.unstable-packages
+      inputs.helix.overlays.default
     ];
 
     config = {
       allowUnfree = true;
     };
+
+    hostPlatform = "aarch64-darwin";
   };
 
-  nix.extraOptions =
+  nix.settings.experimental-features = ["nix-command" "flakes"];
-    ''
+
-      auto-optimise-store = true
+  # nix.extraOptions =
-      experimental-features = nix-command flakes
+  #   ''
-    ''
+  #     auto-optimise-store = true
-    + lib.optionalString (pkgs.system == "aarch64-darwin") ''
+  #     experimental-features = nix-command flakes
-      extra-platforms = x86_64-darwin aarch64-darwin
+  #   ''
-    '';
+  #   + lib.optionalString (pkgs.system == "aarch64-darwin") ''
+  #     extra-platforms = x86_64-darwin aarch64-darwin
+  #   '';
 
   users.knownUsers = ["tyler.mayoff"];
   users.users."tyler.mayoff" = {
@@ -47,7 +50,7 @@
     llvmPackages_19.clang-tools
 
     sketchybar
-    sbarlua
+    # sbarlua
 
     lua
 
@@ -55,6 +58,8 @@
     jdk17
   ];
 
+  # services.aerospace.enable = true;
+
   programs.fish.enable = true;
   programs.zsh.enable = true;
 

dot_config/flake/machines/hinge/home.nix

@@ -1,8 +1,8 @@
 {pkgs, ...}: {
   imports = [
-    ../stylix.nix
+    # ../../home/stylix.nix
-    ../common.nix
+    ../../home/common.nix
-    ../kitty.nix
+    ../../home/kitty.nix
   ];
 
   # xdg.enable = lib.mkForce false;
@@ -42,5 +42,7 @@
     '';
   };
 
+  programs.home-manager.enable = true;
+
   home.stateVersion = "24.11";
 }

dot_config/flake/pkgs/default.nix

@@ -1,9 +1,3 @@
 pkgs: {
-  sbarlua = {
+  sbarlua = pkgs.callPackage ./sbarlua {};
-    src = pkgs.fetchFromGitHub {
-      repo = "SbarLua";
-      owner = "FelixKratz";
-      rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";
-    };
-  };
 }

dot_config/flake/pkgs/sbarlua/default.nix

@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gcc,
+  lua,
+  nix-update-script,
+  apple-sdk_15,
+  versionCheckHook,
+}: let
+  inherit (stdenv.hostPlatform) system;
+
+  target =
+    {
+      "aarch64-darwin" = "arm64";
+      "x86_64-darwin" = "x86";
+    }
+    .${system}
+    or (throw "Unsupported system: ${system}");
+in
+  stdenv.mkDerivation (
+    finalAttrs: {
+      pname = "SBarLua";
+      version = "437bd2031da38ccda75827cb7548e7baa4aa9978";
+      src = fetchFromGitHub {
+        repo = "SbarLua";
+        owner = "FelixKratz";
+        rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";
+        hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg=";
+      };
+
+      nativeBuildInputs = [
+        gcc
+      ];
+
+      buildInputs = [
+        apple-sdk_15
+        lua
+      ];
+
+      # buildPhase = ''
+      #   make
+      # '';
+
+      installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out/bin
+
+        ls -la
+
+        cp ./bin/sbarlua $out/bin/sbarlua
+        
+        runHook postInstall
+      '';
+
+      meta = {
+        homepage = "https://github.com/FelixKratz/SbarLua";
+        platforms = lib.platforms.darwin;
+      };
+    }
+  )

run_nix-rebuild.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 [[ $(command -v nixos-rebuild) ]] && sudo nixos-rebuild switch --flake ~/.config/flake
-[[ $(command -v darwin-rebuild) ]] && sudo darwin-rebuild switch --flake ~/.config/flake/
+[[ $(command -v darwin-rebuild) ]] && darwin-rebuild switch --flake ~/.config/flake/
 [[ $(command -v home-manager) ]] && home-manager switch --flake ~/.config/flake/