diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 5282fda..73c0056 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -3,7 +3,7 @@ name: build on: pull_request: {} push: - branches: [main] + branches: [ main ] jobs: build: diff --git a/.forgejo/workflows/flake-update.yaml b/.forgejo/workflows/flake-update.yaml index 0e8520b..f4f403d 100644 --- a/.forgejo/workflows/flake-update.yaml +++ b/.forgejo/workflows/flake-update.yaml @@ -2,11 +2,11 @@ name: flake update on: schedule: - - cron: "0 3 * * *" + - cron: '0 3 * * *' workflow_dispatch: inputs: target: - description: "Inputs to update" + description: 'Inputs to update' type: choice default: all options: diff --git a/nixosConfigurations/muede-lpt2/containers.nix b/nixosConfigurations/muede-lpt2/containers.nix index 8e4ae9f..ff0e4d5 100644 --- a/nixosConfigurations/muede-lpt2/containers.nix +++ b/nixosConfigurations/muede-lpt2/containers.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - ... -}: - +{ self, ... }: { config = { boot.enableContainers = true; @@ -27,25 +22,13 @@ # }; # }; - # Global DefaultTimeoutStopSec is 10s (modern-desktop.nix), which kills systemd-nspawn - # before it finishes halting, leaving cgroups busy and breaking restarts. - systemd.services = - let - # The imperative template plus every declarative container: nixos-containers - # generates each one as its own unit, so an override on "container@" alone - # would not reach them. - containerUnits = [ - "container@" - ] - ++ map (name: "container@${name}") (lib.attrNames config.containers); - in - lib.genAttrs containerUnits (_: { - serviceConfig = { - TimeoutStopSec = "2min"; - # After a SIGKILL of nspawn, the kernel needs a moment to reap its cgroups. - # Without this, the immediate restart attempt fails with "Device or resource busy". - RestartSec = "5s"; - }; - }); + # # Global DefaultTimeoutStopSec is 10s (modern-desktop.nix), which kills systemd-nspawn + # # before it finishes halting, leaving cgroups busy and breaking restarts. + # systemd.services."container@damocles".serviceConfig = { + # TimeoutStopSec = "60s"; + # # After a SIGKILL of nspawn, the kernel needs a moment to reap its cgroups. + # # Without this, the immediate restart attempt fails with "Device or resource busy". + # RestartSec = "5s"; + # }; }; } diff --git a/nixosConfigurations/muede-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix index 492afcd..59a3eef 100644 --- a/nixosConfigurations/muede-lpt2/default.nix +++ b/nixosConfigurations/muede-lpt2/default.nix @@ -29,13 +29,6 @@ "i686-linux" ]; - # Global default (nixosModules/distributed-builds.nix) is MemoryMax=90%, - # which isn't tight enough on this machine's 31GiB to avoid OOM. - systemd.services.nix-daemon.serviceConfig = { - MemoryHigh = "60%"; - MemoryMax = lib.mkForce "80%"; - }; - services.xserver.xkb = { # Configure keymap in X11 layout = "de";