Commit affa2c6a0708
Changed files (3)
systems
common
desktop
services
kyushu
systems/common/desktop/default.nix
@@ -11,7 +11,6 @@
../programs/nix-ld.nix
../services/pipewire.nix
../hardware/yubikey.nix
- # ../virt
];
# Enable Plymouth and surpress some logs by default.
boot = {
systems/common/services/docker.nix
@@ -1,4 +1,4 @@
-_: {
+{ pkgs, ... }: {
virtualisation = {
docker = {
enable = true;
systems/kyushu/extra.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
{
imports = [
@@ -8,8 +8,16 @@
../common/programs/tmux.nix
../common/services/networkmanager.nix
# ../common/services/fprint.nix # With yubikey I don't really need this to be honest
+ ../common/services/containers.nix
+ ../common/services/docker.nix
+ ../common/services/lxd.nix
../redhat
];
+ # Make sure we don't start docker until required
+ systemd.services.docker.wantedBy = lib.mkForce [ ];
+ # Make sure we don't start lxd until required
+ systemd.services.lxd.wantedBy = lib.mkForce [ ];
+
}