flake.nix

@@ -249,6 +249,7 @@
           };
           swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
           layman = pkgs.callPackage ./packages/layman/default.nix { };
+          sommelier = pkgs.callPackage ./packages/sommelier/default.nix { };
         };
       });
 }

machines/levitation/home.nix

@@ -15,7 +15,17 @@
     };
   };
 
-  home.packages = with pkgs; [ gammastep fido2luks ];
+  home.packages = with pkgs; [
+    gammastep
+    fido2luks
+    (pkgs.makeDesktopItem rec {
+      name = "VMWare Workstation (Wrapped)";
+      exec = "${
+          inputs.self.packages.${pkgs.system}.sommelier
+        }/bin/sommelier -X --scale 1 vmware";
+      desktopName = name;
+    })
+  ];
 
   # Sway outputs
   wayland.windowManager.sway.config = {

packages/layman/default.nix

@@ -1,6 +1,5 @@
 { pkgs, lib, pythonPkgs ? pkgs.python311Packages }:
 let
-  vals = builtins.fromJSON (builtins.readFile ../../sources/layman.json);
   inherit pythonPkgs;
   f = { buildPythonPackage, i3ipc, setproctitle, tomli, setuptools }:
     buildPythonPackage rec {
@@ -10,8 +9,8 @@ let
       src = pkgs.fetchFromGitHub {
         owner = "frap129";
         repo = "layman";
-        rev = vals.rev;
+        rev = "c827811d71461d9190c3f5d0d00d339d74ff3407";
-        hash = vals.hash;
+        hash = "sha256-Z8gliSEZgFtOtCZf51J79SqMTHOEd2zwtv0tFiXWn8k=";
       };
       nativeBuildInputs = [ setuptools ];
       propagatedBuildInputs = [ i3ipc setproctitle tomli ];

packages/sommelier/default.nix

@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner
+, libxkbcommon, mesa, pixman, xorg, wayland, gtest }:
+
+stdenv.mkDerivation {
+  pname = "sommelier";
+  version = "104.0";
+
+  src = fetchFromGitHub {
+    owner = "akvadrako";
+    repo = "sommelier";
+    rev = "31a42a2f8c649ae82a3239284bced7ef39a569ef";
+    sha256 = "sha256-ZTvH4mn7eK2e/1u6FVVpR7aaeAQ+JxSa4nhXWLxSfvo=";
+  };
+
+  nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ];
+  buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ];
+
+  doCheck = true;
+  nativeCheckInputs = [ gtest ];
+
+  meta = with lib; {
+    homepage =
+      "https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/main/vm_tools/sommelier/";
+    description = "Nested Wayland compositor with support for X11 forwarding";
+    maintainers = with maintainers; [ qyliss ];
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+  };
+}

packages/swayimg/default.nix

@@ -2,18 +2,15 @@
 , makeDesktopItem, wayland, wayland-protocols, json_c, libxkbcommon, fontconfig
 , giflib, libjpeg, libjxl, libpng, librsvg, libwebp, libheif, libtiff, libexif
 , bash-completion, ... }:
-let
+
-  vals = builtins.fromJSON (builtins.readFile ../../sources/swayimg.json);
+stdenv.mkDerivation rec {
-  version = vals.version;
-  url = vals.url;
-  hash = vals.hash;
-in stdenv.mkDerivation rec {
   pname = "swayimg";
-  inherit version;
+  version = "1.11";
 
   src = fetchurl {
-    inherit url;
+    url =
-    inherit hash;
+      "https://github.com/artemsen/swayimg/archive/refs/tags/v${version}.tar.gz";
+    hash = "sha256-t4U0F8rzySgZUQdkTfMbqAqQb8PsyhgNsoQau/rCdzY=";
     name = "${pname}-${version}.tar.gz";
   };
 

sources/layman.json

@@ -1,4 +0,0 @@
-{
-  "rev": "c827811d71461d9190c3f5d0d00d339d74ff3407",
-  "hash": "sha256-Z8gliSEZgFtOtCZf51J79SqMTHOEd2zwtv0tFiXWn8k="
-}

sources/swayimg.json

@@ -1,5 +0,0 @@
-{
-  "version": "1.11",
-  "url": "https://github.com/artemsen/swayimg/archive/refs/tags/v1.11.tar.gz",
-  "hash": "sha256-t4U0F8rzySgZUQdkTfMbqAqQb8PsyhgNsoQau/rCdzY="
-}

sources/update-sources.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -eou pipefail
-
-DIRECTORY=$(realpath "$(dirname "$0")")
-
-# Update swayimg
-SWAYIMG_VERSION=$(curl https://api.github.com/repos/artemsen/swayimg/tags | jq -r ".[0].name" | tr -d "v")
-SWAYIMG_URL="https://github.com/artemsen/swayimg/archive/refs/tags/v$SWAYIMG_VERSION.tar.gz"
-SWAYIMG_HASH=$(nix-prefetch fetchurl --url "$SWAYIMG_URL" -s)
-jq --null-input \
-    --arg version "$SWAYIMG_VERSION" \
-    --arg url "$SWAYIMG_URL" \
-    --arg hash "$SWAYIMG_HASH" \
-    '{"version": $version, "url": $url, "hash": $hash}' \
-    > $DIRECTORY/swayimg.json
-echo "swayimg now at $SWAYIMG_VERSION"
-
-# Update layman
-LAYMAN_BRANCH=$(curl https://api.github.com/repos/frap129/layman | jq -r '.default_branch')
-LAYMAN_REV=$(curl https://api.github.com/repos/frap129/layman/git/refs/heads/$LAYMAN_BRANCH | \
-                jq -r '.object.sha')
-LAYMAN_HASH=$(nix-prefetch fetchFromGitHub --owner frap129 --repo layman --rev $LAYMAN_REV)
-jq --null-input \
-    --arg rev "$LAYMAN_REV" \
-    --arg hash "$LAYMAN_HASH" \
-    '{"rev": $rev, "hash": $hash}' \
-    > $DIRECTORY/layman.json
-echo "layman now at $LAYMAN_REV"

update.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -eou pipefail
-
-DIRECTORY=$(realpath "$(dirname "$0")")
-
-# Update our sources first
-$DIRECTORY/sources/update-sources.sh
-
-# Then update the flake
-nix flake update
-
-# Make sure we still build our systems
-nix build .#nixosConfigurations.oracles.config.system.build.toplevel
-nix build .#nixosConfigurations.matrix.config.system.build.toplevel
-nix build .#nixosConfigurations.tounge.config.system.build.toplevel
-nix build .#nixosConfigurations.perception.config.system.build.toplevel
-nix build .#nixosConfigurations.fusion.config.system.build.toplevel
-
-# Collect garbage
-nix-collect-garbage