From 3159a7bec783f6a47b05c620c4550355729298f9 Mon Sep 17 00:00:00 2001 From: "Jeffrey C. Ollie" Date: Wed, 15 Jan 2025 20:37:31 -0600 Subject: [PATCH] nix: add x11 xfce vm --- flake.nix | 2 ++ nix/vm/common-xfce.nix | 18 ++++++++++++++++++ nix/vm/create-xfce.nix | 12 ++++++++++++ nix/vm/x11-xfce.nix | 7 +++++++ 4 files changed, 39 insertions(+) create mode 100644 nix/vm/common-xfce.nix create mode 100644 nix/vm/create-xfce.nix create mode 100644 nix/vm/x11-xfce.nix diff --git a/flake.nix b/flake.nix index d787c0609..3256c7c15 100644 --- a/flake.nix +++ b/flake.nix @@ -85,6 +85,7 @@ x11-cinnamon = runVM ./nix/vm/x11-cinnamon.nix; x11-gnome = runVM ./nix/vm/x11-gnome.nix; x11-plasma6 = runVM ./nix/vm/x11-plasma6.nix; + x11-xfce = runVM ./nix/vm/x11-xfce.nix; }; } # Our supported systems are the same supported systems as the Zig binaries. @@ -104,6 +105,7 @@ create-cinnamon-vm = import ./nix/vm/create-cinnamon.nix; create-gnome-vm = import ./nix/vm/create-gnome.nix; create-plasma6-vm = import ./nix/vm/create-plasma6.nix; + create-xfce-vm = import ./nix/vm/create-xfce.nix; }; nixConfig = { diff --git a/nix/vm/common-xfce.nix b/nix/vm/common-xfce.nix new file mode 100644 index 000000000..12a20d8d8 --- /dev/null +++ b/nix/vm/common-xfce.nix @@ -0,0 +1,18 @@ +{...}: { + imports = [ + ./common.nix + ]; + + services.xserver = { + displayManager = { + lightdm = { + enable = true; + }; + }; + desktopManager = { + xfce = { + enable = true; + }; + }; + }; +} diff --git a/nix/vm/create-xfce.nix b/nix/vm/create-xfce.nix new file mode 100644 index 000000000..d1789472d --- /dev/null +++ b/nix/vm/create-xfce.nix @@ -0,0 +1,12 @@ +{ + system, + nixpkgs, + overlay, + module, + uid ? 1000, + gid ? 1000, +}: +import ./create.nix { + inherit system nixpkgs overlay module uid gid; + common = ./common-xfce.nix; +} diff --git a/nix/vm/x11-xfce.nix b/nix/vm/x11-xfce.nix new file mode 100644 index 000000000..71eb87f2f --- /dev/null +++ b/nix/vm/x11-xfce.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ./common-xfce.nix + ]; + + services.displayManager.defaultSession = "xfce"; +}