From ae7994f09eb10c6bb3a26cfbad9b9b6ec7ad9dde Mon Sep 17 00:00:00 2001
From: Mark Nipper <nipsy@bitgnome.net>
Date: Mon, 15 Apr 2024 23:57:01 -0700
Subject: Update disko installer and finalize VM configuration

---
 hosts/richese/default.nix | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

(limited to 'hosts/richese/default.nix')

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;
 }
-- 
cgit v1.2.3