status-bar: Reflect actual current keybindings

.nix/default.nix

@@ -68,6 +68,8 @@ flake-utils.lib.eachSystem [
   };
   cargo = rustToolchainToml;
   rustc = rustToolchainToml;
+  cargoMSRV = msrvToolchain;
+  rustcMSRV = msrvToolchain;
 
   buildInputs = [
     # in order to run tests
@@ -163,6 +165,7 @@ flake-utils.lib.eachSystem [
     license = [licenses.mit];
   };
 in rec {
+  packages.default = packages.zellij-native;
   # crate2nix - better incremental builds, but uses ifd
   packages.zellij = crate2nixPkgs.callPackage ./crate2nix.nix {
     inherit
@@ -177,7 +180,7 @@ in rec {
     nativeBuildInputs = nativeBuildInputs ++ defaultPlugins;
   };
 
-  packages.zellij-msrv = crate2nixMsrvPkgs.callPackage ./crate2nix.nix {
+  packages.zellij-crate-msrv = crate2nixMsrvPkgs.callPackage ./crate2nix.nix {
     inherit
       name
       src
@@ -204,7 +207,25 @@ in rec {
       ;
     nativeBuildInputs = nativeBuildInputs ++ defaultPlugins;
   };
-  packages.default = packages.zellij;
+  # native nixpkgs support - msrv
+  packages.zellij-msrv =
+    (pkgs.makeRustPlatform {
+      cargo = cargoMSRV;
+      rustc = rustcMSRV;
+    })
+    .buildRustPackage {
+      inherit
+        src
+        name
+        cargoLock
+        buildInputs
+        postInstall
+        patchPhase
+        desktopItems
+        meta
+        ;
+      nativeBuildInputs = nativeBuildInputs ++ defaultPlugins;
+    };
 
   packages.plugins-compact = plugins.compact-bar;
   packages.plugins-status-bar = plugins.status-bar;

.nix/plugins.nix

@@ -10,7 +10,6 @@
   ignoreSource = [
     ".git"
     ".github"
-    "assets"
     "docs"
     "example"
     "target"

Makefile.toml

@@ -18,18 +18,9 @@ dependencies = [
     "clippy",
 ]
 
-# Patching the default flows to skip testing of wasm32-wasi targets
-[tasks.pre-test]
-condition = { env = { "CARGO_MAKE_CRATE_TARGET_TRIPLE" = "wasm32-wasi" } }
-env = { "SKIP_TEST" = true }
-
 [tasks.test]
-condition = { env_false = ["SKIP_TEST"] }
-dependencies = ["pre-test"]
-args = ["test", "--", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
-
-[tasks.post-test]
-env = { "SKIP_TEST" = false }
+dependencies = ["get-host-triple"]
+args = ["test", "--target", "${CARGO_HOST_TRIPLE}", "--", "@@split(CARGO_MAKE_TASK_ARGS,;)"]
 
 # Running Zellij using the development data directory
 [tasks.run]
@@ -125,6 +116,25 @@ env = { "CARGO_MAKE_WORKSPACE_INCLUDE_MEMBERS" = [
 ] }
 run_task = { name = "build", fork = true }
 
+[tasks.get-host-triple]
+script_runner = "@duckscript"
+script = '''
+output = exec rustc -v -V
+lines = split ${output.stdout} \n
+triple = set ""
+for line in ${lines}
+    if starts_with ${line} "host:" && not is_empty ${line}
+        bits = split ${line} " "
+        triple = array_get ${bits} 1
+        triple = set ${triple}
+    end
+end
+
+if not is_empty ${triple}
+    set_env CARGO_HOST_TRIPLE "${triple}"
+end
+'''
+
 [tasks.wasm-opt-plugins]
 dependencies = ["build-plugins-release"]
 script_runner = "@duckscript"

default-plugins/status-bar/Cargo.toml

@@ -15,3 +15,6 @@ serde_json = "1.0"
 thiserror = "1.0.30"
 zellij-tile = { path = "../../zellij-tile" }
 zellij-tile-utils = { path = "../../zellij-tile-utils" }
+
+[dev-dependencies]
+regex = "1"