about summary refs log tree commit diff stats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/by-name/ho/home-manager/module.nix2
-rw-r--r--modules/by-name/ri/river/module.nix18
-rw-r--r--modules/home.legacy/wms/river/default.nix3
-rw-r--r--modules/home.legacy/wms/river/res/moonlander.ron4
4 files changed, 26 insertions, 1 deletions
diff --git a/modules/by-name/ho/home-manager/module.nix b/modules/by-name/ho/home-manager/module.nix
index d8b48c1c..f5304170 100644
--- a/modules/by-name/ho/home-manager/module.nix
+++ b/modules/by-name/ho/home-manager/module.nix
@@ -10,6 +10,7 @@
   # TODO: Integrate these <2024-05-22>
   river_init_lesser,
   shell_library,
+  qmk_firmware,
   # external deps
   user_js,
   # modules
@@ -43,6 +44,7 @@ in {
           # bins
           river_init_lesser
           shell_library
+          qmk_firmware
           # external deps
           user_js
           # modules
diff --git a/modules/by-name/ri/river/module.nix b/modules/by-name/ri/river/module.nix
new file mode 100644
index 00000000..6b9b044a
--- /dev/null
+++ b/modules/by-name/ri/river/module.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  lib,
+  qmk_firmware,
+  system,
+  ...
+}: let
+  cfg = config.soispha.programs.river;
+in {
+  options.soispha.programs.river = {
+    enable = lib.mkEnableOption "river";
+  };
+
+  config = lib.mkIf cfg.enable {
+    # TODO: Migrate complete river module <2024-12-30>
+    services.udev.packages = [qmk_firmware.packages.${system}.qmk_firmware];
+  };
+}
diff --git a/modules/home.legacy/wms/river/default.nix b/modules/home.legacy/wms/river/default.nix
index 274b9223..9463e94e 100644
--- a/modules/home.legacy/wms/river/default.nix
+++ b/modules/home.legacy/wms/river/default.nix
@@ -4,6 +4,7 @@
   river_init_lesser,
   nixosConfig,
   system,
+  qmk_firmware,
   ...
 }: let
   inherit (nixosConfig.networking) hostName;
@@ -61,6 +62,8 @@ in {
       keepPath = true;
       dependencies = builtins.attrValues {
         river_init_lesser = river_init_lesser.packages.${system}.default;
+        inherit (qmk_firmware.packages.${system}) qmk_unicode_type;
+
         inherit
           (pkgs)
           dash
diff --git a/modules/home.legacy/wms/river/res/moonlander.ron b/modules/home.legacy/wms/river/res/moonlander.ron
index 77ffa5c4..4051635f 100644
--- a/modules/home.legacy/wms/river/res/moonlander.ron
+++ b/modules/home.legacy/wms/river/res/moonlander.ron
@@ -40,13 +40,15 @@ RiverctlCommandArray(
     RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "W", mods: "Alt+Control+Super+Shift", command: "send-to-previous-tags",command_args: None,),
     //RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "X", mods: "Alt+Control+Super+Shift", command: "spawn",               command_args: "bemenu-run",),
     //RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Y", mods: "Alt+Control+Super+Shift", command: "spawn",               command_args: "bemenu-run",),
-    //RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Z", mods: "Alt+Control+Super+Shift", command: "spawn",               command_args: "bemenu-run",),
 
 
     // Toggle all tags
     RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "0", mods: "Alt+Control+Super+Shift", command: "set-focused-tags",    command_args: "4294967295"),
     RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "0", mods: "Alt+Control+Shift",       command: "set-view-tags",       command_args: "4294967295"),
 
+    // Support Unicode input
+    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Z", mods: "Alt+Control+Super+Shift", command: "spawn",               command_args: "qmk-unicode-type",),
+
     // Mouse
     RiverctlCommand( map_mode: MapMouse,    mode: ["normal"],           key: "BTN_LEFT",                mods: "Super",          command: "move-view",           command_args: None,),
     RiverctlCommand( map_mode: MapMouse,    mode: ["normal"],           key: "BTN_RIGHT",               mods: "Super",          command: "resize-view",         command_args: None,),