From 6f6b6b59e64ee94be095e856e1e6943bbf574349 Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Sat, 8 Feb 2025 15:42:06 -0800
Subject: migration: fcitx5 theme + fix

---
 snowfall/modules/nixos/hardware/keyboard/default.nix | 6 +++---
 snowfall/modules/nixos/suites/desktop/default.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'snowfall/modules/nixos')

diff --git a/snowfall/modules/nixos/hardware/keyboard/default.nix b/snowfall/modules/nixos/hardware/keyboard/default.nix
index a8c478d..0ea2aa6 100644
--- a/snowfall/modules/nixos/hardware/keyboard/default.nix
+++ b/snowfall/modules/nixos/hardware/keyboard/default.nix
@@ -5,7 +5,7 @@ with lib; with lib.${namespace}; let
 in {
   options.${namespace}.hardware.keyboard = with types; {
     enable = mkEnableOption "keyboard hardware tweaks";
-    jp = mkEnableOption "japanese ime support";
+    jp.enable = mkEnableOption "japanese ime support";
   };
 
   config = mkIf cfg.enable {
@@ -29,13 +29,13 @@ in {
       };
     };
 
-    i18n.inputMethod = mkIf cfg.jp {
+    i18n.inputMethod = mkIf cfg.jp.enable {
       enable = true;
       type = "fcitx5";
       fcitx5.addons = with pkgs; [ fcitx5-mozc ];
     };
 
-    environment.variables = mkIf cfg.jp {
+    environment.variables = mkIf cfg.jp.enable {
       # Required for fcitx5 support in kitty
       GLFW_IM_MODULE = "ibus";
     };
diff --git a/snowfall/modules/nixos/suites/desktop/default.nix b/snowfall/modules/nixos/suites/desktop/default.nix
index 1d6e0c2..246f38c 100644
--- a/snowfall/modules/nixos/suites/desktop/default.nix
+++ b/snowfall/modules/nixos/suites/desktop/default.nix
@@ -11,7 +11,7 @@ in {
     cxl = {
       hardware = {
         audio.enable = true;
-        keyboard.jp = true;
+        keyboard.jp.enable = true;
       };
 
       apps = {
-- 
cgit v1.2.3