From 7dc322c1ebe049dde356386ff46809c13bcfbff9 Mon Sep 17 00:00:00 2001
From: Robin Stumm <dermetfan@users.noreply.github.com>
Date: Fri, 3 Jul 2020 22:43:18 +0200
Subject: [PATCH] kakoune: support user modes in keyMappings

kakoune: support user modes in keyMappings

User modes are declared automatically.

PR #1286
---
 modules/programs/kakoune.nix | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/modules/programs/kakoune.nix b/modules/programs/kakoune.nix
index aca5a1ad..d2fd8eb1 100644
--- a/modules/programs/kakoune.nix
+++ b/modules/programs/kakoune.nix
@@ -97,16 +97,7 @@ let
   keyMapping = types.submodule {
     options = {
       mode = mkOption {
-        type = types.enum [
-          "insert"
-          "normal"
-          "prompt"
-          "menu"
-          "user"
-          "goto"
-          "view"
-          "object"
-        ];
+        type = types.str;
         example = "user";
         description = ''
           The mode in which the mapping takes effect.
@@ -543,6 +534,21 @@ let
         }"
       ];
 
+    userModeString = mode:
+      optionalString (!builtins.elem mode [
+        "insert"
+        "normal"
+        "prompt"
+        "menu"
+        "user"
+        "goto"
+        "view"
+        "object"
+      ]) "try %{declare-user-mode ${mode}}";
+
+    userModeStrings = map userModeString
+      (lists.unique (map (km: km.mode) cfg.config.keyMappings));
+
     keyMappingString = km:
       concatStringsSep " " [
         "map global"
@@ -592,7 +598,8 @@ let
         ++ [ "# UI options" ]
         ++ optional (ui != null) "set-option global ui_options ${uiOptions}"
 
-        ++ [ "# Key mappings" ] ++ map keyMappingString keyMappings
+        ++ [ "# User modes" ] ++ userModeStrings ++ [ "# Key mappings" ]
+        ++ map keyMappingString keyMappings
 
         ++ [ "# Hooks" ] ++ map hookString hooks);
   in pkgs.writeText "kakrc"