From 4c0c443048dd178eebe0331c3c07d5a1344a5024 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Wed, 25 Jun 2025 18:35:51 -0500
Subject: [PATCH] fixed hotkeys

---
 modules/home-manager-modules/gnome.nix | 37 +++++++++++---------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/modules/home-manager-modules/gnome.nix b/modules/home-manager-modules/gnome.nix
index 6a01b2b..8c70cf6 100644
--- a/modules/home-manager-modules/gnome.nix
+++ b/modules/home-manager-modules/gnome.nix
@@ -42,9 +42,13 @@
     hotkeys = lib.mkOption {
       type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
         options = {
+          key = lib.mkOption {
+            type = lib.types.strMatching "[a-zA-Z0-9-]+";
+            default = builtins.replaceStrings [" " "/" "_"] ["-" "-" "-"] name;
+          };
           name = lib.mkOption {
-            type = lib.types.strMatching "[a-zA-Z0-9_-]+";
-            default = builtins.replaceStrings [" " "/"] ["_" "-"] name;
+            type = lib.types.str;
+            default = name;
           };
           binding = lib.mkOption {
             type = lib.types.str;
@@ -77,34 +81,25 @@
         (
           lib.mkMerge (
             builtins.map (value: let
-              entry = "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/${value.name}";
+              entry = "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/${value.key}";
             in {
-              "org/gnome/settings-daemon/plugins/media-keys" = {
-                custom-keybindings = [
-                  "${entry}/"
-                ];
+              ${entry} = {
+                binding = value.binding;
+                command = value.command;
+                name = value.name;
               };
 
-              ${entry} = value;
+              "org/gnome/settings-daemon/plugins/media-keys" = {
+                custom-keybindings = [
+                  "/${entry}/"
+                ];
+              };
             })
             (
               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/"
-        #   ];
-        # };
       ];
     };
   };