better cache management

.github/workflows/lint.yml

@@ -26,6 +26,7 @@ jobs:
         if: always()
         env:
           REVIEWDOG_GITEA_API_TOKEN: ${{ secrets.GITEA_TOKEN }}
+          GITEA_ADDRESS: ${{ github.server_url }}
         run: |
           if [ "${{ github.event_name }}" = pull_request ]; then
             nix run -L .#ci -- lint-report gitea-pr-review "$RUNNER_TEMP/findings"

containers/server-n0/git.nix

@@ -163,10 +163,9 @@ in
             trusted-public-keys = [ "microvm.cachix.org-1:oXnBc6hRE3eX5rSYdRyMYXnfzcCxC7yKPTbZXALsqys=" ];
           };
 
-          nix.gc = {
-            automatic = true;
-            dates = "daily";
-            options = "--delete-older-than 14d";
+          nix.settings = {
+            min-free = 5 * 1024 * 1024 * 1024;
+            max-free = 10 * 1024 * 1024 * 1024;
           };
           # nix.optimise.automatic = true; - doesn't work with microvm.writableStoreOverlay
 

containers/server-n0/ssh.nix

@@ -61,27 +61,16 @@ let
       net ? { },
       resources ? { },
       traits ? [ ],
-      isolation ? { },
     }:
     mkContainer {
       inherit name;
       inherit net resources;
       svc.autoStart = true;
-      isolation = { nixDaemon = nixDaemon; } // isolation;
+      isolation.nixDaemon = nixDaemon;
       traits = [ sshTrait ] ++ traits;
       packages = with pkgs; [ tmux ] ++ packages;
       miscProperties = self._sshpiperRegister routingInfo;
     };
-
-  kvmTrait = {
-    containerConfig =
-      { pkgs, ... }:
-      {
-        users.users.runner.extraGroups = [ "wheel" ];
-        security.sudo.wheelNeedsPassword = false;
-        environment.systemPackages = [ pkgs.qemu_kvm ];
-      };
-  };
 in
 {
   ssh-admin = mkSsh {
@@ -132,25 +121,6 @@ in
       mem = "16G";
       cpu = 65;
     };
-    traits = [ kvmTrait ];
-    isolation.allowedDevices = [
-      {
-        node = "/dev/kvm";
-        modifier = "rw";
-      }
-      {
-        node = "/dev/vhost-net";
-        modifier = "rw";
-      }
-      {
-        node = "/dev/net/tun";
-        modifier = "rwm";
-      }
-    ];
-    isolation.additionalCapabilities = [
-      "CAP_NET_ADMIN"
-      "CAP_MKNOD"
-    ];
     routingInfo = [
       {
         username = "autumn";

dsl.nix

@@ -228,17 +228,6 @@ rec {
     : systemd-nspawn user namespacing; see `--private-users=` in
       systemd-nspawn(1). Bind mounts always go through idmapped `--bind`.
 
-    `isolation.allowedDevices`
-    : List of `{ node; modifier; }` host devices to grant the container's
-      cgroup access to; see `containers.<name>.allowedDevices` in the NixOS
-      manual. nspawn bind-mounts a handful of devices (`/dev/kvm`,
-      `/dev/net/tun`, ...) into the container itself once the cgroup allows it -
-      this doesn't need a matching `resources.fs` bind mount.
-
-    `isolation.additionalCapabilities`
-    : Extra Linux capabilities granted to the container; see
-      `containers.<name>.additionalCapabilities` in the NixOS manual.
-
     `miscProperties`
     : Arbitrary data attached to the result. Used for cross-container discovery
       via `collectContainers`.
@@ -283,8 +272,6 @@ rec {
       bindMounts = resources.fs or { };
       allowsNixDaemon = isolation.nixDaemon or false;
       privateUsers = isolation.privateUsers or "pick";
-      allowedDevices = isolation.allowedDevices or [ ];
-      additionalCapabilities = isolation.additionalCapabilities or [ ];
 
       allowInternet = hasInternetAccess access;
       allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts;
@@ -381,12 +368,7 @@ rec {
       kind = "nspawn";
       miscProperties = flattenMiscProp self miscProperties;
       nixosContainer = {
-        inherit
-          autoStart
-          privateUsers
-          allowedDevices
-          additionalCapabilities
-          ;
+        inherit autoStart privateUsers;
         bindMounts = { };
         extraFlags = bindMountExtraFlags;
         privateNetwork = true;