lots of diff things

hosts/default.nix

@@ -3,22 +3,29 @@
   inputs,
   homeImports,
   ...
-}: {
-  flake.nixosConfigurations = let
-    inherit (inputs.nixpkgs.lib) nixosSystem;
+}: let
+  specialArgs = {
+    inherit inputs self;
+  };
+in {
+  flake.colmena = let
     mod = "${self}/system";
-
-    # get the basic config to build on top of
     inherit (import "${self}/system") desktop;
-
-    # get these into the module system
-    specialArgs = {
-      inherit inputs self;
-    };
   in {
-    nixdesk = nixosSystem {
+    meta = {
+      nixpkgs = import inputs.nixpkgs {
+        system = "x86_64-linux";
+        config.allowUnfree = true;
+      };
+
       inherit specialArgs;
-      modules =
+    };
+    nixdesk = {
+      deployment = {
+        allowLocalDeployment = true;
+        targetHost = null;
+      };
+      imports =
         desktop
         ++ [
           ./nixdesk
@@ -37,9 +44,11 @@
           }
         ];
     };
-    hopper = nixosSystem {
-      inherit specialArgs;
-      modules = [
+    hopper = {
+      deployment = {
+        targetUser = "xun";
+      };
+      imports = [
         ./hopper
 
         "${self}/secrets"
@@ -79,4 +88,11 @@
       ];
     };
   };
+  flake.nixosConfigurations = let
+    l = inputs.nixpkgs.lib;
+  in (builtins.mapAttrs (n: v:
+    l.nixosSystem {
+      inherit specialArgs;
+      modules = v.imports;
+    }) (l.filterAttrs (n: _: n != "meta") self.colmena));
 }

hosts/hopper/default.nix

@@ -8,10 +8,6 @@
 
   networking.hostName = "hopper";
 
-  #services.tailscale.extraUpFlags = [
-  #  "--ssh"
-  #];
-
   swapDevices = [];
 
   system.stateVersion = "23.11";

hosts/hopper/hardware.nix

@@ -29,7 +29,7 @@
     "/" = {
       device = "/dev/disk/by-uuid/1297e638-f2ff-49a2-a362-314ac7eeaabc";
       fsType = "btrfs";
-      options = ["subvol=root" "compress=zstd"];
+      options = ["subvol=root" "compress=zstd" "autodefrag" "noatime"];
     };
     "/home" = {
       device = "/dev/disk/by-uuid/1297e638-f2ff-49a2-a362-314ac7eeaabc";