From d2429fa721072f60db877d17486afcc7050b22cf Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Mon, 16 Dec 2024 16:00:17 +0100
Subject: [PATCH] New input method syntax

---
 modules/fcitx5.nix   | 17 ++++++++---------
 modules/graphics.nix |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/fcitx5.nix b/modules/fcitx5.nix
index bb1c4c0..519ade4 100644
--- a/modules/fcitx5.nix
+++ b/modules/fcitx5.nix
@@ -6,15 +6,14 @@ in {
     enable = mkEnableOption "Enables fcitx5 input method engine and mozc en anthy methods";
   };
   config = mkIf cfg.enable {
-    i18n = {
-      inputMethod = {
-        enabled = "fcitx5";
-        fcitx5 = {
-          addons = with pkgs; [
-            fcitx5-mozc
-            fcitx5-anthy
-          ];
-        };
+    i18n.inputMethod = {
+      enable = true;
+      type = "fcitx5";
+      fcitx5 = {
+        settings.addons = with pkgs; [
+          fcitx5-mozc
+          fcitx5-anthy
+        ];
       };
     };
   };
diff --git a/modules/graphics.nix b/modules/graphics.nix
index 0d350bc..2e93111 100644
--- a/modules/graphics.nix
+++ b/modules/graphics.nix
@@ -11,9 +11,9 @@ in {
   };
   config = {
     hardware = {
-      opengl = {
+      graphics = {
         enable = true;
-        driSupport32Bit = true;
+        enable32Bit = true;
       };
       nvidia = mkIf cfg.nvidia.enable {
         package = config.boot.kernelPackages.nvidiaPackages.stable;