feat: support incus

misumisumi · May 12, 2024 · b80acb5 · b80acb5
1 parent 9b0d17b
commit b80acb5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/apps/virtualisation/incus/default.nix b/apps/virtualisation/incus/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [ lxd-to-incus ];
+  virtualisation = {
+    incus = {
+      enable = true;
+      startTimeout = 300;
+    };
+  };
+}
diff --git a/apps/virtualisation/lxd/default.nix b/apps/virtualisation/lxd/default.nix
@@ -1,11 +1,6 @@
-{ inputs, pkgs, ... }: {
-
-  system.activationScripts.virtiofs.text = ''
-    mkdir -p /usr/lib/qemu
-    ln -sf ${pkgs.virtiofsd}/bin/virtiofsd /usr/lib/qemu/virtiofsd
-  '';
+{
   virtualisation = {
-    lxc.enable = true;
+    lxc.lxcfs.enable = true;
     lxd = {
       enable = true;
       recommendedSysctlSettings = true;

diff --git a/machines/stacia/virtualisation.nix b/machines/stacia/virtualisation.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ../../apps/virtualisation/incus
     ../../apps/virtualisation/libvirt
     ../../apps/virtualisation/lxd
     ../../apps/virtualisation/podman

diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix
@@ -60,6 +60,16 @@ in
   };
 
   config = {
+    # Place the virtiofsd directory in an FHS compliant location
+    system.activationScripts.virtiofs.text =
+      let
+        check_virtualisation = with config.virtualisation; lxc.enable || lxd.enable || incus.enable || libvirtd.enable;
+      in
+      optionalString check_virtualisation ''
+        mkdir -p /usr/lib/qemu
+        ln -sf ${pkgs.virtiofsd}/bin/virtiofsd /usr/lib/qemu/virtiofsd
+      '';
+
     systemd.tmpfiles.rules =
       mapAttrsToList tmpfileEntry cfg.sharedMemoryFiles;
 

diff --git a/system/user/default.nix b/system/user/default.nix
@@ -15,7 +15,7 @@
   users.users.${user} = {
     isNormalUser = true;
     shell = pkgs.zsh;
-    extraGroups = [ "wheel" "uucp" "kvm" "input" "audio" "video" "scanner" "lp" "lxd" ];
+    extraGroups = [ "wheel" "uucp" "kvm" "input" "audio" "video" "scanner" "lp" "lxd" "incus-admin" ];
     useDefaultShell = true;
     subUidRanges = [
       # Using rootless container