Update disko installer and finalize VM configuration

3 files changed, 37 insertions, 14 deletions

diff --git a/hosts/richese/default.nix b/hosts/richese/default.nix
index 979bd24..2c46971 100644
--- a/hosts/richese/default.nix
+++ b/hosts/richese/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   boot = {
     initrd.kernelModules = [ "zfs" ];
     kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
@@ -16,13 +16,13 @@
     ../common/core
     #../common/optional/db.nix
     #../common/optional/dev.nix
-    #../common/optional/misc.nix
+    ../common/optional/misc.nix
     #../common/optional/multimedia.nix
-    #../common/optional/pipewire.nix
+    ../common/optional/pipewire.nix
     ../common/optional/services/openssh.nix
-    #../common/optional/services/xorg.nix
+    ../common/optional/services/xorg.nix
     ../common/optional/zfs.nix
-    #../common/users/nipsy
+    ../common/users/nipsy
     ../common/users/root
   ];
 
@@ -32,11 +32,26 @@
     nftables.enable = true;
   };
 
-  services.xserver.videoDrivers = [ "vmware" ];
+  services.xserver.videoDrivers = lib.mkForce [ "vmware" "virtualbox" "modesetting" ];
 
   system.stateVersion = "23.11";
 
+  #systemd.user.services = let
+  #  vbox-client = desc: flags: {
+  #    description = "VirtualBox Guest: ${desc}";
+
+  #    wantedBy = [ "graphical-session.target" ];
+  #    requires = [ "dev-vboxguest.device" ];
+  #    after = [ "dev-vboxguest.device" ];
+
+  #    unitConfig.ConditionVirtualization = "oracle";
+
+  #    serviceConfig.ExecStart = "${config.boot.kernelPackages.virtualboxGuestAdditions}/bin/VBoxClient -fv ${flags}";
+  #    };
+  #in {
+  #  virtualbox-resize = vbox-client "Resize" "--vmsvga";
+  #  virtualbox-clipboard = vbox-client "Clipboard" "--clipboard";
+  #};
+
   virtualisation.virtualbox.guest.enable = true;
-  # no longer in unstable apparently
-  #virtualisation.virtualbox.guest.x11 = true;
 }
diff --git a/hosts/richese/disks.nix b/hosts/richese/disks.nix
index 9f05d48..a0c8ed4 100644
--- a/hosts/richese/disks.nix
+++ b/hosts/richese/disks.nix
@@ -46,14 +46,15 @@
         type = "zpool";
         rootFsOptions = {
           acltype = "posixacl";
+          canmount = "off";
+          compression = "on";
           dnodesize = "auto";
-          xattr = "sa";
-          relatime = "on";
-          normalization = "formD";
           encryption = "aes-256-gcm";
           keyformat = "passphrase";
           keylocation = "file:///tmp/data.keyfile";
-          compression = "on";
+          normalization = "formD";
+          relatime = "on";
+          xattr = "sa";
         };
         postCreateHook = ''
           zfs set keylocation="prompt" rpool
@@ -63,6 +64,10 @@
           #autotrim = "on";
         };
         datasets = {
+          "local" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+          };
           "local/root" = {
             type = "zfs_fs";
             options.mountpoint = "legacy";
@@ -76,6 +81,11 @@
             };
             mountpoint = "/nix";
           };
+          "user" = {
+            type = "zfs_fs";
+            options.mountpoint = "none";
+            mountpoint = "/home";
+          };
           "user/home" = {
             type = "zfs_fs";
             options.mountpoint = "legacy";
diff --git a/hosts/richese/hardware-configuration.nix b/hosts/richese/hardware-configuration.nix
index dc9fd42..5b94417 100644
--- a/hosts/richese/hardware-configuration.nix
+++ b/hosts/richese/hardware-configuration.nix
@@ -41,6 +41,4 @@
   swapDevices =
     [ { device = "/dev/disk/by-label/swap"; }
     ];
-
-  virtualisation.virtualbox.guest.enable = true;
 }