From ef6b72db81fa6c352b0ff3210f2c7c3165e8559c Mon Sep 17 00:00:00 2001
From: Nathan McCarty <nathan@mccarty.io>
Date: Sun, 14 May 2023 18:56:23 -0400
Subject: [PATCH] Remove custom sommelier package

---
 flake.nix                      |  1 -
 machines/levitation/home.nix   | 12 +-----------
 packages/sommelier/default.nix | 29 -----------------------------
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 packages/sommelier/default.nix

diff --git a/flake.nix b/flake.nix
index 5c619f6..858068b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -249,7 +249,6 @@
           };
           swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
           layman = pkgs.callPackage ./packages/layman/default.nix { };
-          sommelier = pkgs.callPackage ./packages/sommelier/default.nix { };
         };
       });
 }
diff --git a/machines/levitation/home.nix b/machines/levitation/home.nix
index d4a19c1..f59da67 100644
--- a/machines/levitation/home.nix
+++ b/machines/levitation/home.nix
@@ -15,17 +15,7 @@
     };
   };
 
-  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;
-    })
-  ];
+  home.packages = with pkgs; [ gammastep fido2luks ];
 
   # Sway outputs
   wayland.windowManager.sway.config = {
diff --git a/packages/sommelier/default.nix b/packages/sommelier/default.nix
deleted file mode 100644
index 9b156bc..0000000
--- a/packages/sommelier/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ 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;
-  };
-}