From 7f9bf9627acfa26600a19fc542becd69070e0820 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 10 Jun 2022 21:37:08 +0200
Subject: [PATCH] ma x.r: disable xmm7360 for now (build fails)

---
 1systems/x/x13/default.nix      | 2 +-
 2configs/hw/network-manager.nix | 2 +-
 2configs/tools/core-gui.nix     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/1systems/x/x13/default.nix b/1systems/x/x13/default.nix
index 7e9f4a6..d652229 100644
--- a/1systems/x/x13/default.nix
+++ b/1systems/x/x13/default.nix
@@ -8,7 +8,7 @@
     <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
     # <stockholm/makefu/2configs/hw/tpm.nix>
     <stockholm/makefu/2configs/hw/ssd.nix>
-    <stockholm/makefu/2configs/hw/xmm7360.nix>
+    # <stockholm/makefu/2configs/hw/xmm7360.nix>
   ];
   boot.zfs.requestEncryptionCredentials = true;
   networking.hostId = "f8b8e0a2";
diff --git a/2configs/hw/network-manager.nix b/2configs/hw/network-manager.nix
index 050787d..5a1018d 100644
--- a/2configs/hw/network-manager.nix
+++ b/2configs/hw/network-manager.nix
@@ -4,7 +4,7 @@
     extraGroups = [ "networkmanager" ];
     packages = with pkgs;[
       networkmanagerapplet
-      gnome3.gnome_keyring gnome3.dconf
+      gnome3.gnome-keyring dconf
     ];
   };
   networking.wireless.enable = lib.mkForce false;
diff --git a/2configs/tools/core-gui.nix b/2configs/tools/core-gui.nix
index 6539326..a00378e 100644
--- a/2configs/tools/core-gui.nix
+++ b/2configs/tools/core-gui.nix
@@ -12,7 +12,7 @@
     evince
     # replacement for mirage:
     sxiv
-    gnome3.dconf
+    dconf
     xdotool
     xorg.xbacklight
     scrot