Commit e54529a69059
Changed files (7)
systems/aomi/extra.nix
@@ -15,7 +15,6 @@
# ../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
../common/services/libvirt.nix
../common/desktop/binfmt.nix # TODO: move to something else than desktop
# ../common/services/buildkit.nix # maybe ?
systems/common/services/lxd.nix
@@ -1,22 +0,0 @@
-{
- pkgs,
- ...
-}:
-{
- virtualisation = {
- lxd = {
- enable = true;
- # https://documentation.ubuntu.com/lxd/en/latest/howto/access_ui/
- ui = {
- enable = true;
- package = pkgs.lxd-ui;
- };
- };
- };
-
- networking = {
- firewall = {
- trustedInterfaces = [ "lxdbr0" ];
- };
- };
-}
systems/common/users/vincent.nix
@@ -21,29 +21,27 @@ in
uid = 1000;
isNormalUser = true;
shell = pkgs.zsh;
- extraGroups =
- [
- "users"
- "wheel"
- ]
- ++ lib.optionals (builtins.isString desktop) [
- "networkmanager"
- "audio"
- "video"
- ]
- ++ ifExists [
- "buildkit"
- "docker"
- "libvirt"
- "libvirtd"
- "lxd"
- "nginx"
- "plugdev"
- "tss"
- "messagebus"
- "lp"
- "scanner"
- ];
+ extraGroups = [
+ "users"
+ "wheel"
+ ]
+ ++ lib.optionals (builtins.isString desktop) [
+ "networkmanager"
+ "audio"
+ "video"
+ ]
+ ++ ifExists [
+ "buildkit"
+ "docker"
+ "libvirt"
+ "libvirtd"
+ "nginx"
+ "plugdev"
+ "tss"
+ "messagebus"
+ "lp"
+ "scanner"
+ ];
subUidRanges = [
{
startUid = 100000;
systems/kobe/extra.nix
@@ -10,7 +10,6 @@
../common/services/prometheus-exporters-node.nix
../common/services/containers.nix
../common/services/docker.nix
- ../common/services/lxd.nix
../common/services/libvirt.nix
];
systems/kyushu/extra.nix
@@ -15,7 +15,6 @@
../common/services/networkmanager.nix
../common/services/containers.nix
../common/services/docker.nix
- ../common/services/lxd.nix
../redhat
];
@@ -125,7 +124,4 @@
# 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 [ ];
-
}
systems/sakhalin/extra.nix
@@ -9,7 +9,6 @@
imports = [
../common/services/containers.nix
../common/services/docker.nix
- ../common/services/lxd.nix
../common/desktop/binfmt.nix # TODO: move to something else than desktop
../common/services/prometheus-exporters-node.nix
];
systems/shikoku/extra.nix
@@ -9,7 +9,6 @@
../common/services/prometheus-exporters-node.nix
../common/services/containers.nix
../common/services/docker.nix
- ../common/services/lxd.nix
../common/services/libvirt.nix
];