flake.lock

@@ -401,11 +401,11 @@
         "nixvim": "nixvim"
       },
       "locked": {
-        "lastModified": 1741086060,
+        "lastModified": 1735219902,
-        "narHash": "sha256-35fw6MoEXEutctwNS0z7VQ0AX8thHhU2KT0UxD/s3P4=",
+        "narHash": "sha256-s1aI4l9e0OX861wHsvAPqz/s8B9ZTltAMJzPRXt5Kqo=",
         "ref": "refs/heads/master",
-        "rev": "9240bb4db98fe13b3fdaa0e15a06949959df568a",
+        "rev": "4439691030d1a28f4ad49c542104e3f880f7c183",
-        "revCount": 26,
+        "revCount": 25,
         "type": "git",
         "url": "https://git.xiny.li/xin/nixvim"
       },

flake.nix

@@ -123,9 +123,6 @@
         comin.nixosModules.comin
       ];
       nodeNixosModules = {
-        weilite = [
-          ./machines/weilite
-        ];
         calcite = [
           nixos-hardware.nixosModules.asus-zephyrus-ga401
           catppuccin.nixosModules.catppuccin
@@ -272,6 +269,17 @@
             ] ++ sharedColmenaModules;
           };
 
+        weilite =
+          { ... }:
+          {
+            imports = [ machines/weilite ] ++ sharedColmenaModules;
+            deployment = {
+              targetHost = "weilite.coho-tet.ts.net";
+              targetPort = 22;
+              buildOnTarget = false;
+            };
+            nixpkgs.system = "x86_64-linux";
+          };
         thorite =
           { ... }:
           {
@@ -301,11 +309,6 @@
         calcite = mkNixos {
           hostname = "calcite";
         };
-
-        weilite = mkNixos {
-          hostname = "weilite";
-        };
-
         baryte = mkNixos {
           hostname = "baryte";
         };

garnix.yaml

@@ -7,4 +7,13 @@ builds:
       - homeConfigurations.aarch64-linux.*
       - darwinConfigurations.*
       - nixosConfigurations.*
-    branch: testing-calcite
+    branch: deploy
+  - include:
+      - '*.x86_64-linux.*'
+      - defaultPackage.x86_64-linux
+      - devShell.x86_64-linux
+      - homeConfigurations.x86_64-linux.*
+      - homeConfigurations.aarch64-linux.*
+      - darwinConfigurations.*
+      - nixosConfigurations.*
+    branch: next

home/xin/calcite.nix

@@ -122,7 +122,6 @@ in
     enable = true;
     options = {
       recolor = false;
-      selection-clipboard = "clipboard";
     };
   };
 

machines/calcite/configuration.nix

@@ -188,8 +188,8 @@ in
   services.printing.enable = true;
   services.printing.drivers = [
     pkgs.hplip
-    pkgs.gutenprint
     pkgs.gutenprintBin
+    pkgs.canon-cups-ufr2
   ];
   hardware.sane = {
     enable = true;

machines/calcite/network.nix

@@ -12,41 +12,19 @@
   networking = {
     networkmanager = {
       enable = true;
-      dns = "default";
+      dns = "systemd-resolved";
-      settings = {
-        main = {
-          rc-manager = "resolvconf";
-        };
-      };
     };
   };
 
-  networking.resolvconf = {
+  services.resolved = {
     enable = true;
-    dnsExtensionMechanism = false;
-    useLocalResolver = false;
-  };
-
-  services.kresd = {
-    enable = true;
-    listenPlain = [ ];
     extraConfig = ''
-      log_level("notice")
+      Cache=no
-      net.listen('127.0.0.1', 53)
-      modules = { 'hints > iterate', 'stats', 'predict' }
-      cache.size = 100 * MB
-      trust_anchors.remove(".")
-      policy.add(policy.all(policy.TLS_FORWARD( {
-        { "8.8.8.8", hostname="dns.google" } })))
     '';
-      # policy.add(policy.suffix(policy.FORWARD({ "100.100.100.100" }), policy.todnames({ 'coho-tet.ts.net' })))
   };
 
   # Enable Tailscale
-  services.tailscale = {
+  services.tailscale.enable = true;
-    enable = true;
-    extraUpFlags = [ "--accept-dns=false" ];
-  };
   # services.tailscale.useRoutingFeatures = "both";
 
   services.dae.enable = true;

machines/weilite/default.nix

@@ -63,7 +63,6 @@
     };
 
     nixpkgs.config.allowUnfree = true;
-    nixpkgs.hostPlatform = "x86_64-linux";
 
     environment.systemPackages = [
       pkgs.virtiofsd