From 386ecf3d14ea486aba523b14200fcd2e7e04b9d6 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 13 Feb 2025 16:54:19 -0500 Subject: nixos: make more "traits" mixins --- systems/glados-wsl/default.nix | 6 +++++- systems/glados/default.nix | 11 ++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'systems') diff --git a/systems/glados-wsl/default.nix b/systems/glados-wsl/default.nix index 2d7060f..b30451c 100644 --- a/systems/glados-wsl/default.nix +++ b/systems/glados-wsl/default.nix @@ -1,4 +1,5 @@ { pkgs, inputs, ... }: + { imports = [ inputs.nixos-wsl.nixosModules.wsl @@ -22,13 +23,16 @@ # (nixos-wsl probably doesn't set it) security.apparmor.enable = false; + services = { + resolved.enable = false; + }; + system.stateVersion = "23.11"; traits = { arm-builder.enable = true; determinate.enable = true; mac-builder.enable = true; - resolved.enable = false; }; wsl = { diff --git a/systems/glados/default.nix b/systems/glados/default.nix index 0d64af7..42cdeb8 100644 --- a/systems/glados/default.nix +++ b/systems/glados/default.nix @@ -4,6 +4,7 @@ inputs, ... }: + { imports = [ ./hardware-configuration.nix @@ -80,10 +81,14 @@ traits = { arm-builder.enable = true; - containers.enable = true; determinate.enable = true; mac-builder.enable = true; - tailscale.enable = true; - zram.enable = true; }; + + virtualisation = { + oci-containers.backend = "podman"; + podman.enable = true; + }; + + zramSwap.enable = true; } -- cgit v1.2.3