From 89641acf2f37ae537089af3e619ac97397bdbcf4 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 5 Jun 2024 21:58:37 -0600
Subject: [PATCH] Fix ordering of keyboard shortcuts so that you can use AI on
 linux (#12714)

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json | 24 ++++++++++++------------
 script/linux                      |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index c29beb4ffe1acd8d6bdb172aecf3a14353a1e84a..f3832fae6f26f19aa78c8491dda164c677a6dc5f 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -204,18 +204,6 @@
       "alt-m": "assistant::ToggleModelSelector"
     }
   },
-  {
-    "context": "ConversationEditor > Editor",
-    "bindings": {
-      "ctrl-enter": "assistant::Assist",
-      "ctrl-s": "workspace::Save",
-      "ctrl->": "assistant::QuoteSelection",
-      "shift-enter": "assistant::Split",
-      "ctrl-r": "assistant::CycleMessageRole",
-      "enter": "assistant::ConfirmCommand",
-      "alt-enter": "editor::Newline"
-    }
-  },
   {
     "context": "PromptLibrary",
     "bindings": {
@@ -556,6 +544,18 @@
       "ctrl-enter": "assistant::InlineAssist"
     }
   },
+  {
+    "context": "ConversationEditor > Editor",
+    "bindings": {
+      "ctrl-enter": "assistant::Assist",
+      "ctrl-s": "workspace::Save",
+      "ctrl->": "assistant::QuoteSelection",
+      "shift-enter": "assistant::Split",
+      "ctrl-r": "assistant::CycleMessageRole",
+      "enter": "assistant::ConfirmCommand",
+      "alt-enter": "editor::Newline"
+    }
+  },
   {
     "context": "ProjectSearchBar && !in_replace",
     "bindings": {
diff --git a/script/linux b/script/linux
index 6cae39c0881e4b055bf168c0f7ac408fc818127d..7257d2688c34d8b0a75ad1142dd2b0e679ace329 100755
--- a/script/linux
+++ b/script/linux
@@ -23,6 +23,7 @@ if [[ -n $apt ]]; then
     libzstd-dev
     libvulkan1
     libgit2-dev
+    make
   )
   $maysudo "$apt" install -y "${deps[@]}"
   exit 0