From 297d23253e813b2edb4e409a089797a11180876a Mon Sep 17 00:00:00 2001
From: Malte Tammena <malte.tammena@pm.me>
Date: Fri, 28 Jan 2022 15:22:35 +0100
Subject: [PATCH] Fix update breakage

pkgs.gnome3.dconf -> pkgs.dconf
pkgs.multimc -> pkgs.polymc
---
 build-secrets/{multimc-client-id => polymc-client-id} | 0
 flake.nix                                             | 2 +-
 hosts/helix-texta.nix                                 | 2 +-
 hosts/murex-pecten.nix                                | 2 +-
 secrets/secrets.yaml                                  | 6 +++---
 users/malte/home.nix                                  | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename build-secrets/{multimc-client-id => polymc-client-id} (100%)

diff --git a/build-secrets/multimc-client-id b/build-secrets/polymc-client-id
similarity index 100%
rename from build-secrets/multimc-client-id
rename to build-secrets/polymc-client-id
diff --git a/flake.nix b/flake.nix
index f3a39eb..6621693 100644
--- a/flake.nix
+++ b/flake.nix
@@ -330,7 +330,7 @@
 
               # Extract build secrets
               echo Extracting build secrets..
-              ${sops}/bin/sops --extract '["multimc-client-id"]' -d secrets/secrets.yaml > build-secrets/multimc-client-id
+              ${sops}/bin/sops --extract '["polymc-client-id"]' -d secrets/secrets.yaml > build-secrets/polymc-client-id
 
               sudo ${nixos-rebuild}/bin/nixos-rebuild $1 --flake .
             '')
diff --git a/hosts/helix-texta.nix b/hosts/helix-texta.nix
index 48d7fb3..f63d93e 100644
--- a/hosts/helix-texta.nix
+++ b/hosts/helix-texta.nix
@@ -181,7 +181,7 @@ in {
   };
 
   programs.sway.enable = true;
-  services.dbus.packages = [ pkgs.gnome3.dconf ];
+  services.dbus.packages = [ pkgs.dconf ];
   services.udev.packages = with pkgs; [ yubikey-personalization chrysalis ];
 
   environment.systemPackages = with pkgs; [
diff --git a/hosts/murex-pecten.nix b/hosts/murex-pecten.nix
index 97cc90e..1b7acf4 100644
--- a/hosts/murex-pecten.nix
+++ b/hosts/murex-pecten.nix
@@ -134,7 +134,7 @@
   programs.steam.enable = true;
   programs.corectrl.enable = true;
 
-  services.dbus.packages = with pkgs; [ gnome3.dconf openrgb ];
+  services.dbus.packages = with pkgs; [ dconf openrgb ];
   services.udev.packages = with pkgs; [
     yubikey-personalization
     chrysalis
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 5df4c66..372c48e 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -1,4 +1,4 @@
-multimc-client-id: ENC[AES256_GCM,data:vhWJAskjraQaTCHQ107B9OONq3A9+bLSqu8v+SuTpZiepuFb,iv:N9KP2eejmoj66jm/mDBKbemep8TjSbNsFlqGFDGm2wU=,tag:goh+CK4/D5XnUzOXPtvDQw==,type:str]
+polymc-client-id: ENC[AES256_GCM,data:YQlN9OCvA1i1yJjTN5JilQuqA0b45jAtwXXFZ7YB6+SlpiK9,iv:6vZomHgRx0STRIFAGLzRrgEOR9gqQ9zXRa7XT+wMVow=,tag:iwHB2rumloy5WpHsPlu+ag==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -23,8 +23,8 @@ sops:
             V0dhd1VVSEVhKzMxMm9HWmxreTBtaVkKNWmpFSnirfyFLf0kbdBlGKQjlVHEXGq4
             xgfkbN6lGqP9SQlZCyfBHl4u4fn2e2zjENmnPak+erOqZDFHurWNZA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2021-12-04T13:01:24Z"
-    mac: ENC[AES256_GCM,data:sTnsFVYBgFRmSFvyi0y7lBTqvXKUbuCG4RFhkTXrXGkAAPhfm87Z7s3JjxlrzWX21qMhKz7YANX5DHktjGoR5dgX+2cXyh/HXTRGFjoRJ86He/p2+biq2Rs8DeJOcT0a2tRbqlDZTraq9vdtaqIC4lub40YLH+r45+rZsMSemLM=,iv:JBXxfoQg6HA3uXeU1owr/SlbguAjfKFA4VgN8pXzFTI=,tag:vtx0Ex76kKUUyjxSz74ZBA==,type:str]
+    lastmodified: "2022-01-28T09:36:02Z"
+    mac: ENC[AES256_GCM,data:ZT+GaiK2j2cStD0ol2L4cDhF0NrupyPNAR4eYmVcEqsvLdkvCsTEVZKImU5Wma8JB2gS+quir77bu6iVQp6c3YpZldKPv4kgs/aGTB9YGe97wI224kCidOsQYkOVqHY2gtqsrWP7Uz0I3z/Pfp08SfrwDvzKNvf5zlwgKQwRMcY=,iv:3psfk+mRtl1u2T6UcbMWyqvYZkaf2FMIICajNtT5glA=,tag:cCFcksRfQMqAv3yAjicnCQ==,type:str]
     pgp:
         - created_at: "2021-12-04T09:26:22Z"
           enc: |
diff --git a/users/malte/home.nix b/users/malte/home.nix
index b0b6ce9..edf78cf 100644
--- a/users/malte/home.nix
+++ b/users/malte/home.nix
@@ -63,8 +63,8 @@ in {
           "rustc"
           "rustfmt"
         ])
-        (multimc.override {
-          msaClientID = builtins.readFile ../../build-secrets/multimc-client-id;
+        (polymc.override {
+          msaClientID = builtins.readFile ../../build-secrets/polymc-client-id;
         })
         jq
         cargo-readme