From b1ebe0ae829e8ee78b7f3a586af8a3b5c36ca346 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 10 Nov 2024 11:12:20 +0800
Subject: [PATCH] nixos/pantheon: Get rid of bamf

This is not needed with the latest gala and dock.
---
 nixos/modules/services/desktops/bamf.nix                 | 2 +-
 nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 -
 nixos/tests/pantheon.nix                                 | 2 +-
 pkgs/desktops/pantheon/apps/elementary-files/default.nix | 2 --
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix
index d9c46e94d9e0..dd09a94737a2 100644
--- a/nixos/modules/services/desktops/bamf.nix
+++ b/nixos/modules/services/desktops/bamf.nix
@@ -2,7 +2,7 @@
 { config, lib, pkgs, ... }:
 {
   meta = with lib; {
-    maintainers = with lib.maintainers; [ ] ++ lib.teams.pantheon.members;
+    maintainers = with lib.maintainers; [ ];
   };
 
   ###### interface
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index 445a45598f43..01afa5c1debf 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -132,7 +132,6 @@ in
       hardware.bluetooth.enable = mkDefault true;
       security.polkit.enable = true;
       services.accounts-daemon.enable = true;
-      services.bamf.enable = true;
       services.colord.enable = mkDefault true;
       services.fwupd.enable = mkDefault true;
       # TODO: Enable once #177946 is resolved
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 8ff20296c482..0f2a7af401c6 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -60,7 +60,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
             machine.wait_until_succeeds(f"pgrep -f {i}")
         for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock"]:
             machine.wait_for_window(i)
-        for i in ["bamfdaemon.service", "io.elementary.files.xdg-desktop-portal.service"]:
+        for i in ["io.elementary.files.xdg-desktop-portal.service"]:
             machine.wait_for_unit(i, "${user.name}")
 
     with subtest("Check if various environment variables are set"):
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index fec9fba9bebd..6783c8cc4f4b 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -15,7 +15,6 @@
 , libportal-gtk3
 , granite
 , pango
-, bamf
 , sqlite
 , zeitgeist
 , libcloudproviders
@@ -47,7 +46,6 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    bamf
     glib
     granite
     gtk3