From 5e9549dba1be00a63bb751a9ac9a1a02d2ce4667 Mon Sep 17 00:00:00 2001
From: Evan Callicoat <evan.callicoat@autodesk.com>
Date: Thu, 13 Jan 2022 15:55:44 -0600
Subject: [PATCH 1/3] Fix APT layouts (#2299) by apsu

Remove outdated and little used APTx, and update APT to current version in author's repo, as well as rowstagger angle mod variant.
---
 src/js/layouts.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/js/layouts.js b/src/js/layouts.js
index 7e408ca4d..9b7b7d70d 100644
--- a/src/js/layouts.js
+++ b/src/js/layouts.js
@@ -542,21 +542,21 @@ const layouts = {
         keymapShowTopRow: false,
         keys: [
             "`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "-_", "=+",
-            "qQ", "cC", "dD", "lL", "xX", "zZ", "yY", "oO", "uU", ";:", "[{", "]}", "\\|",
-            "rR", "sS", "tT", "hH", "kK", "pP", "nN", "eE", "iI", "aA", "/?",
-            "\\|", "wW", "gG", "bB", "mM", "vV", "jJ", "fF", "'\"", ",<", ".>",
+            "wW", "gG", "dD", "fF", "bB", "qQ", "lL", "uU", "oO", "yY", "[{", "]}", "\\|",
+            "rR", "sS", "tT", "hH", "kK", "jJ", "nN", "eE", "aA", "iI", ";:",
+            "\\|", "xX", "cC", "mM", "pP", "vV", "zZ", ",<", ".>", "'\"", "/?",
             " "
-        ]
+        ],
     },
-    APTx: {
+    APT_angle: {
         keymapShowTopRow: false,
         keys: [
             "`~", "1!", "2@", "3#", "4$", "5%", "6^", "7&", "8*", "9(", "0)", "-_", "=+",
-            "qQ", "cC", "dD", "wW", "xX", "zZ", "pP", "oO", "uU", ";:", "[{", "]}", "\\|",
-            "rR", "sS", "tT", "nN", "vV", "yY", "hH", "eE", "iI", "aA", "/?",
-            "\\|", "lL", "gG", "bB", "mM", "jJ", "kK", "fF", "'\"", ",<", ".>",
+            "wW", "gG", "dD", "fF", "bB", "qQ", "lL", "uU", "oO", "yY", "[{", "]}", "\\|",
+            "rR", "sS", "tT", "hH", "kK", "jJ", "nN", "eE", "aA", "iI", ";:",
+            "\\|", "cC", "mM", "pP", "vV", "xX", "zZ", ",<", ".>", "'\"", "/?",
             " "
-        ]
+        ],
     },
     thai_kedmanee: {
         keymapShowTopRow: true,

From 69a0509a666a6996c2ea545fedd1ea4e7e4403e6 Mon Sep 17 00:00:00 2001
From: Teddi <83455454+teddinotteddy@users.noreply.github.com>
Date: Thu, 13 Jan 2022 16:02:04 -0600
Subject: [PATCH 2/3] Add Ducky Frozen Llama Theme (#2292) by teddinotteddy

* Add Ducky Frozen Llama Theme

* Add Frozen Llama Theme to _list.json
---
 static/themes/_list.json       |  5 +++++
 static/themes/frozen_llama.css | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 static/themes/frozen_llama.css

diff --git a/static/themes/_list.json b/static/themes/_list.json
index 7924c1116..5aeeb9992 100644
--- a/static/themes/_list.json
+++ b/static/themes/_list.json
@@ -664,4 +664,9 @@
      "bgColor" : "#fff2d5",
      "mainColor":"#332800"
    }
+  ,{
+     "name": "frozen_llama",
+     "bgColor" : "#9bf2ea",
+     "textColor":"#ffffff"
+   }
 ]
diff --git a/static/themes/frozen_llama.css b/static/themes/frozen_llama.css
new file mode 100644
index 000000000..d7fd3d13e
--- /dev/null
+++ b/static/themes/frozen_llama.css
@@ -0,0 +1,11 @@
+:root {
+    --bg-color: #9bf2ea;
+    --main-color: #6d44a6;
+    --caret-color: #ffffff;
+    --sub-color: #b690fd;
+    --text-color: #ffffff;
+    --error-color: #e42629;
+    --error-extra-color: #e42629;
+    --colorful-error-color: #e42629;
+    --colorful-error-extra-color: #e42629;
+}

From b07639ce724f328ceccf13ec07b847654e17e04d Mon Sep 17 00:00:00 2001
From: Daniel Krikun <krikun.daniel@gmail.com>
Date: Fri, 14 Jan 2022 00:02:36 +0200
Subject: [PATCH 3/3] Expand bash dictionary (#2293) by dkrikun

---
 static/languages/code_bash.json | 101 ++++++++++++++++++++++++++++++--
 1 file changed, 97 insertions(+), 4 deletions(-)

diff --git a/static/languages/code_bash.json b/static/languages/code_bash.json
index 3952f448c..343b249b2 100644
--- a/static/languages/code_bash.json
+++ b/static/languages/code_bash.json
@@ -130,16 +130,13 @@
     "pushd",
     "print",
     "printf",
-    "pwd",
     "read",
     "readarray",
     "readonly",
     "return",
-    "select",
     "set",
     "shopt",
     "chsh",
-    "time",
     "trap",
     "type",
     "ulimit",
@@ -230,6 +227,102 @@
     "mkinitcpio",
     "pacmd",
     "free",
-    "node"
+    "node",
+    "cat",
+    "tar",
+    "cp",
+    "dd",
+    "df",
+    "du",
+    "chmod",
+    "chown",
+    "chgrp",
+    "install",
+    "mkdir",
+    "mkfifo",
+    "mktemp",
+    "mknod",
+    "mv",
+    "ls",
+    "ln",
+    "rm",
+    "cut",
+    "grep",
+    "sed",
+    "awk",
+    "perl",
+    "comm",
+    "diff",
+    "patch",
+    "sort",
+    "tr",
+    "echo",
+    "env",
+    "cd",
+    "pwd",
+    "readlink",
+    "which",
+    "sh",
+    "bash",
+    "stat",
+    "unlink",
+    "uname",
+    "whoami",
+    "hostname",
+    "ifconfig",
+    "uptime",
+    "test",
+    "wc",
+    "basename",
+    "date",
+    "paste",
+    "join",
+    "find",
+    "uniq",
+    "yes",
+    "mount",
+    "fdisk",
+    "more",
+    "less",
+    "man",
+    "kill",
+    "dmesg",
+    "lsblk",
+    "lscpu",
+    "lsusb",
+    "eject",
+    "findmnt",
+    "umount",
+    "su",
+    "sudo",
+    "rfkill",
+    "poweroff",
+    "xxd",
+    "vi",
+    "touch",
+    "addgroup",
+    "adduser",
+    "blkid",
+    "chattr",
+    "chpasswd",
+    "expr",
+    "nice",
+    "modprobe",
+    "printf",
+    "printenv",
+    "realpath",
+    "seq",
+    "unzip",
+    "true",
+    "false",
+    "sysctl",
+    "egrep",
+    "pgrep",
+    "killall",
+    "head",
+    "tail",
+    "git",
+    "svn",
+    "zip"
   ]
 }