From c24e20652664f18b8a38d53891f10bd58d23ec48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hilmar=20G=C3=BAstafsson?= <LiHRaM@users.noreply.github.com>
Date: Fri, 26 Mar 2021 16:28:59 +0100
Subject: [PATCH 1/3] feat(keybindings): add binding for opening config

---
 src/Feature/Configuration/Feature_Configuration.re | 14 ++++++++++++++
 .../Configuration/Feature_Configuration.rei        |  5 ++++-
 src/Model/State.re                                 |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/Feature/Configuration/Feature_Configuration.re b/src/Feature/Configuration/Feature_Configuration.re
index 87ba2880a2..12f8bf184a 100644
--- a/src/Feature/Configuration/Feature_Configuration.re
+++ b/src/Feature/Configuration/Feature_Configuration.re
@@ -333,8 +333,22 @@ module Commands = {
     );
 };
 
+module Keybindings = {
+  open Feature_Input.Schema;
+
+  let command = Commands.openConfigurationFile.id;
+
+  let openConfigOnMac =
+    bind(~key="<D-,>", ~condition="IsMac" |> WhenExpr.parse, ~command);
+
+  let openConfigOnOther =
+    bind(~key="<C-,>", ~condition="!IsMac" |> WhenExpr.parse, ~command);
+};
+
 // CONTRIBUTIONS
 
 module Contributions = {
   let commands = Commands.[openConfigurationFile, reload];
+
+  let keybindings = Keybindings.[openConfigOnMac, openConfigOnOther];
 };
diff --git a/src/Feature/Configuration/Feature_Configuration.rei b/src/Feature/Configuration/Feature_Configuration.rei
index 5cab83eb8e..b41f490164 100644
--- a/src/Feature/Configuration/Feature_Configuration.rei
+++ b/src/Feature/Configuration/Feature_Configuration.rei
@@ -74,6 +74,9 @@ module GlobalConfiguration = GlobalConfiguration;
 
 // CONTRIBUTIONS
 
-module Contributions: {let commands: list(Oni_Core.Command.t(msg));};
+module Contributions: {
+  let commands: list(Oni_Core.Command.t(msg));
+  let keybindings: list(Feature_Input.Schema.keybinding);
+};
 
 module Testing: {let transform: ConfigurationTransformer.t => msg;};
diff --git a/src/Model/State.re b/src/Model/State.re
index b0a193918e..eeec5c38ef 100644
--- a/src/Model/State.re
+++ b/src/Model/State.re
@@ -31,6 +31,7 @@ let defaultKeyBindings =
     ),
   ]
   @ Feature_SideBar.Contributions.keybindings
+  @ Feature_Configuration.Contributions.keybindings
   @ Feature_Input.Schema.[
       bind(
         ~key="<C-TAB>",

From e04ca3aa4026c09125bc4445301bdb48ed295e36 Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Thu, 1 Apr 2021 16:38:22 -0700
Subject: [PATCH 2/3] Fix condition: IsMac -> isMac

---
 src/Feature/Configuration/Feature_Configuration.re | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Feature/Configuration/Feature_Configuration.re b/src/Feature/Configuration/Feature_Configuration.re
index 12f8bf184a..8a1ba7aa6c 100644
--- a/src/Feature/Configuration/Feature_Configuration.re
+++ b/src/Feature/Configuration/Feature_Configuration.re
@@ -339,10 +339,10 @@ module Keybindings = {
   let command = Commands.openConfigurationFile.id;
 
   let openConfigOnMac =
-    bind(~key="<D-,>", ~condition="IsMac" |> WhenExpr.parse, ~command);
+    bind(~key="<D-,>", ~condition="isMac" |> WhenExpr.parse, ~command);
 
   let openConfigOnOther =
-    bind(~key="<C-,>", ~condition="!IsMac" |> WhenExpr.parse, ~command);
+    bind(~key="<C-,>", ~condition="!isMac" |> WhenExpr.parse, ~command);
 };
 
 // CONTRIBUTIONS

From 09bb49ae4d28cccbb2ea1451285f85418e2e2a1b Mon Sep 17 00:00:00 2001
From: Bryan Phelps <bryphe@outrunlabs.com>
Date: Thu, 1 Apr 2021 16:39:23 -0700
Subject: [PATCH 3/3] Add CHANGES entry

---
 CHANGES_CURRENT.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES_CURRENT.md b/CHANGES_CURRENT.md
index 5bec8bae0d..eff11bbfdc 100644
--- a/CHANGES_CURRENT.md
+++ b/CHANGES_CURRENT.md
@@ -1,6 +1,7 @@
 ### Features 
 
 - #3284 - Definition: Add 'editor.action.revealDefinitionAside' command (fixes #3261)
+- #3352 - Keybindings: Add default keybinding for open configuration (related #1423, thanks @LiHRaM !)
 
 ### Bug Fixes