feat(home): add canary keyboard layout

yunfachi · Dec 16, 2023 · 5570ab7 · 5570ab7
1 parent c857540
commit 5570ab7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
@@ -27,7 +27,11 @@ in {
         ) (config.yunfachi.monitors);
 
         input = {
-          kb_layout = "us,ru";
+          kb_layout = "${
+            if config.yunfachi.canary.enable
+            then "canary"
+            else "us"
+          },ru";
           kb_options = "grp:win_space_toggle";
           follow_mouse = 1;
         };

diff --git a/nixos/canary.nix b/nixos/canary.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs-yunfachi,
+  ...
+}: let
+  cfg = config.hm.yunfachi.canary;
+in {
+  config = lib.mkIf cfg.enable {
+    services.xserver = {
+      enable = true;
+      xkb = {
+        extraLayouts.canary = {
+          symbolsFile = pkgs-yunfachi.canary + "/share/X11/xkb/symbols/canary";
+          description = "Canary keyboard layout";
+          languages = ["eng"];
+        };
+        layout = "canary,ru";
+      };
+    };
+    console.useXkbConfig = true;
+  };
+}
diff --git a/options/home/hardware.nix b/options/home/hardware.nix
@@ -8,6 +8,7 @@
   cfg = config.yunfachi;
 in {
   options.yunfachi = {
+    canary.enable = lib.mkEnableOption "canary" // {default = type == "desktop";};
     monitors = mkOption {
       type = types.listOf (types.submodule {
         options = {