Undo merging of latest trunk

nix-community · Mar 29, 2024 · 8158d25 · 8158d25
1 parent 5542659
commit 8158d25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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,16 +34,16 @@ 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));
 
   ##############################################################################
   # 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
@@ -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 ];