From f8aa299e16fc02bea2f7a4b1f0584ce2b67540ea Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 25 Jun 2025 17:27:18 -0500
Subject: [PATCH] fixed hotkey config

---
 configurations/home-manager/leyla/dconf.nix |  6 -----
 modules/home-manager-modules/gnome.nix      | 30 ++++++++++++++++++---
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/configurations/home-manager/leyla/dconf.nix b/configurations/home-manager/leyla/dconf.nix
index 847977d..0e4a6a7 100644
--- a/configurations/home-manager/leyla/dconf.nix
+++ b/configurations/home-manager/leyla/dconf.nix
@@ -27,12 +27,6 @@
           "show-mounts" = false;
         };
 
-        "org/gnome/settings-daemon/plugins/media-keys" = {
-          custom-keybindings = [
-            "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-          ];
-        };
-
         "org/gnome/shell" = {
           favorite-apps = ["org.gnome.Nautilus.desktop" "firefox.desktop" "codium.desktop" "steam.desktop" "org.gnome.Console.desktop"];
           # app-picker-layout =
diff --git a/modules/home-manager-modules/gnome.nix b/modules/home-manager-modules/gnome.nix
index 531ad86..ace1da7 100644
--- a/modules/home-manager-modules/gnome.nix
+++ b/modules/home-manager-modules/gnome.nix
@@ -12,6 +12,10 @@
     hotkeys = lib.mkOption {
       type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
         options = {
+          name = lib.mkOption {
+            type = lib.types.strMatching "[a-zA-Z0-9_-]+";
+            default = builtins.replaceStrings [" " "/"] ["_" "-"] name;
+          };
           binding = lib.mkOption {
             type = lib.types.str;
           };
@@ -35,13 +39,31 @@
           };
         }
         (
-          builtins.listToAttrs (
-            lib.lists.imap0 (
-              i: value: lib.attrsets.nameValuePair "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom${toString i}" value
+          lib.mkMerge (
+            builtins.map (value: let
+              entry = "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/${value.name}";
+            in {
+              "org/gnome/settings-daemon/plugins/media-keys" = {
+                custom-keybindings = [
+                  "${entry}/"
+                ];
+              };
+
+              ${entry} = value;
+            })
+            (
+              lib.attrsets.mapAttrsToList (_: value: value) config.gnome.hotkeys
             )
-            (lib.attrsets.mapAttrsToList (_: value: value) config.gnome.hotkeys)
           )
         )
+        # (
+        #   builtins.listToAttrs (
+        #     lib.lists.imap0 (
+        #       i: value: lib.attrsets.nameValuePair "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom${toString i}" value
+        #     )
+        #     (lib.attrsets.mapAttrsToList (_: value: value) config.gnome.hotkeys)
+        #   )
+        # )
         #         "org/gnome/settings-daemon/plugins/media-keys" = {
         #   custom-keybindings = [
         #     "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"