Re-enable darwin builds

home-manager only for now

flake.lock

@@ -556,11 +556,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765480374,
+        "lastModified": 1769723138,
-        "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",
+        "narHash": "sha256-kgkwjs33YfJasADIrHjHcTIDs3wNX0xzJhnUP+oldEw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",
+        "rev": "175532b6275b34598a0ceb1aef4b9b4006dd4073",
         "type": "github"
       },
       "original": {

home/by-host/vasa/default.nix

@@ -0,0 +1,16 @@
+{
+  pkgs,
+  config,
+  ...
+} @ all: {
+  bosun.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHl33DPxxzxrNNjM8rL4ktAj4ExzCyGiU8rKog0csxNA";
+
+  imports =
+    [
+    ];
+
+  home.username = "christopher";
+  home.homeDirectory = "/Users/christopher";
+
+  elements.kitty.enable = true;
+}

hosts/vasa/default.nix

@@ -1,13 +1,10 @@
 {...}: {
   system.stateVersion = 5;
 
-  elements = {
+  # bosun = {
-    hostname = "molybdenum";
+  #   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjqieS4GkYAa1WRYZpxjgYsj7VGZ9U+rTFCkX8M0umD";
-    secrets = {
+  # };
-      key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjqieS4GkYAa1WRYZpxjgYsj7VGZ9U+rTFCkX8M0umD";
-    };
-  };
 
   # For some reason this is required for hm to work with nix-darwin
-  users.users.christopher = {};
+  # users.users.christopher = {};
 }

modules/darwin/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./secrets.nix
+  ];
+}

modules/darwin/secrets.nix

@@ -0,0 +1,8 @@
+{
+  inputs,
+  ...
+}: {
+  imports = [
+#     inputs.agenix.darwinModules.default 
+  ];
+}

modules/flake/homes.nix

@@ -1,12 +1,16 @@
 {inputs, ...}: let
   inherit (inputs) self;
 
-  mkHome = user: host: {
+  mkHome = user: host: system: inputs.home-manager.lib.homeManagerConfiguration {
-    imports = [
+    pkgs = inputs.nixpkgs.legacyPackages.${system};
-      (self + "/home")
+    extraSpecialArgs = {
-      # TODO: Import this conditionally!
+      inherit inputs;
-      # (self + "/home/by-host/${host}")
+      hostname = host;
+    };
+
+    modules = [
       (self + "/modules/home")
+      (self + "/home/by-host/${host}")
     ];
   };
 in {
@@ -15,8 +19,7 @@ in {
   ];
 
   flake.homeConfigurations = {
-    "toph@endurance" = mkHome "toph" "endurance";
+    "toph@endurance" = mkHome "toph" "endurance" "x86_64-linux";
-    "toph@vasa" = mkHome "toph" "vasa";
+    "toph@vasa" = mkHome "toph" "vasa" "x86_64-darwin";
-    "toph@aepplet" = mkHome "toph" "aepplet";
   };
 }

modules/generic/default.nix

@@ -9,22 +9,18 @@
     ./nix.nix
     ./profiles.nix
     ./secrets.nix
-    ./ssh.nix
   ];
 
   # TODO: Move all of these into their own modules?
 
-  console = {
-    font = "Lat2-Terminus16";
-    useXkbConfig = true; # use xkbOptions in tty.
-  };
-
   networking.hostName = hostname;
 
   environment.systemPackages = with pkgs; [
     pre-commit
     git
     gitleaks
+    helix
+    fish
     just
     nh
     age

modules/generic/nix.nix

@@ -2,6 +2,7 @@
   pkgs,
   lib,
   inputs,
+  hostname,
   ...
 }: {
   nix = {
@@ -15,7 +16,8 @@
     # automatic cleanup
     gc = {
       automatic = true;
-      dates = "weekly";
+      # TODO: nix-darwin uses "interval" as a key
+      dates = lib.mkIf (hostname != "vasa") "weekly";
       options = "--delete-older-than 21d";
     };
 

modules/generic/secrets.nix

@@ -11,11 +11,6 @@
 with lib; let
   cfg = config.bosun;
 in {
-  imports = [
-    inputs.agenix.nixosModules.default
-    inputs.agenix-rekey.nixosModules.default
-  ];
-
   options.bosun = {
     rekeyPath = mkOption {
       type = types.str;

modules/nixos/default.nix

@@ -5,5 +5,12 @@
     ./system.nix
     ./users.nix
     ./nix-ld.nix
+    ./ssh.nix
+    ./secrets.nix
   ];
+
+  console = {
+    font = "Lat2-Terminus16";
+    useXkbConfig = true; # use xkbOptions in tty.
+  };
 }

modules/nixos/secrets.nix

@@ -0,0 +1,16 @@
+{
+  config,
+  inputs',
+  inputs,
+  hostname,
+  pkgs,
+  lib,
+  self,
+  ...
+}: {
+  imports = [
+     inputs.agenix.nixosModules.default 
+     inputs.agenix-rekey.nixosModules.default
+     ../generic/secrets.nix
+  ];
+}