From 8158d2508378ff4711cb73e45050dfa14cec00be Mon Sep 17 00:00:00 2001
From: magnouvean <c6af1d08-d039-472f-b890-6eaf2e96e961@anonaddy.me>
Date: Fri, 29 Mar 2024 20:26:04 +0100
Subject: [PATCH] Undo merging of latest trunk

---
 modules/files.nix   | 8 ++++----
 modules/hotkeys.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/files.nix b/modules/files.nix
index 6f5bf36a..2e1bdbd3 100644
--- a/modules/files.nix
+++ b/modules/files.nix
@@ -7,7 +7,7 @@ let
 
   # Helper function to prepend the appropriate path prefix (e.g. XDG_CONFIG_HOME) to file
   prependPath = prefix: attrset:
-    lib.mapAttrs'
+    lib.attrsets.mapAttrs'
       (path: config: { name = "${prefix}/${path}"; value = config; })
       attrset;
   plasmaCfg = config.programs.plasma;
@@ -34,8 +34,8 @@ let
     );
   fileSettingsModify =
     (name: value: (if (!isFinalValue value) then
-      (lib.nameValuePair name (lib.mapAttrs' fileSettingsModify value)) else
-      (lib.nameValuePair "${name}${calculateKeyMarking value}" value.value)));
+      (lib.attrsets.nameValuePair name (lib.attrsets.mapAttrs' fileSettingsModify value)) else
+      (lib.attrsets.nameValuePair "${name}${calculateKeyMarking value}" value.value)));
 
 
   fileSettingsType = with lib.types; attrsOf (attrsOf (attrsOf advancedSettingsType));
@@ -43,7 +43,7 @@ let
   ##############################################################################
   # Generate a script that will use write_config.py to update all
   # settings.
-  script = pkgs.writeScript "plasma-config" (writeConfig (lib.mapAttrs' fileSettingsModify cfg));
+  script = pkgs.writeScript "plasma-config" (writeConfig (lib.attrsets.mapAttrs' fileSettingsModify cfg));
 
   ##############################################################################
   # Generate a script that will remove all the current config files.
diff --git a/modules/hotkeys.nix b/modules/hotkeys.nix
index d8f4b4aa..98c4a3d3 100644
--- a/modules/hotkeys.nix
+++ b/modules/hotkeys.nix
@@ -93,7 +93,7 @@ in
 
       programs.plasma.configFile."kglobalshortcutsrc"."${group.desktop}" = {
         _k_friendly_name.value = group.description;
-      } // lib.mapAttrs
+      } // lib.attrsets.mapAttrs
         (_: command:
           let
             keys = command.keys ++ lib.optionals (command.key != "") [ command.key ];