From edaa8588b6eb0beeb37f79ab16eae7c88fa4e433 Mon Sep 17 00:00:00 2001
From: Christoph Urlacher <christoph.urlacher@protonmail.com>
Date: Sun, 22 Sep 2024 20:37:47 +0200
Subject: [PATCH] Nixos: Update options soon to be deprecated

---
 home/christoph/default.nix   | 19 ++++++-------------
 system/nixinator/default.nix | 25 +++++++++++++++----------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 1672c73e..6c8e7a18 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -388,6 +388,7 @@ rec {
       protonmail-bridge
       thunderbird # TODO: Email module
       # xwaylandvideobridge # NOTE: Doesn't work
+      AusweisApp2
 
       # Office
       wacomtablet # For xournalpp/krita
@@ -402,19 +403,6 @@ rec {
       # TODO: Module, I need to add python packages from multiple modules to the same interpreter
       python312
 
-      AusweisApp2
-
-      # Games
-      # NOTE: Does not run with wayland
-      # (retroarch.override {
-      #   cores = with libretro; [
-      #     desmume
-      #     melonds
-      #   ];
-      # })
-      # melonDS # NOTE: Doesn't work - No QT platform plugin for wayland
-      desmume
-
       # Use NixCommunity binary cache
       cachix
 
@@ -826,6 +814,11 @@ rec {
     };
   };
 
+  # Fix Discord rich presence for Flatpak
+  systemd.user.tmpfiles.rules = [
+    "L %t/discord-ipc-0 - - - - app/com.discordapp.Discord/discord-ipc-0"
+  ];
+
   # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";
 }
diff --git a/system/nixinator/default.nix b/system/nixinator/default.nix
index fe2cbb60..a4af136c 100644
--- a/system/nixinator/default.nix
+++ b/system/nixinator/default.nix
@@ -101,18 +101,23 @@
     # videoDrivers = ["amdgpu"];
   };
 
-  # NOTE: This has been relocated here from the default config, because it forces en-US keyboard layout
+  # NOTE: This has been relocated here from the default config, because it forces en-US keyboard layout.
   #       The laptop needs de-DE...
   # Chinese Input
-  i18n.inputMethod.enabled = "fcitx5";
-  i18n.inputMethod.fcitx5 = {
-    waylandFrontend = true;
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
 
-    addons = with pkgs; [
-      fcitx5-gtk
-      libsForQt5.fcitx5-qt
-      fcitx5-chinese-addons
-      fcitx5-configtool # TODO: Remove this and set config through HomeManager
-    ];
+    fcitx5 = {
+      waylandFrontend = true;
+
+      addons = with pkgs; [
+        fcitx5-gtk
+        libsForQt5.fcitx5-qt # QT5
+        kdePackages.fcitx5-qt # QT6
+        fcitx5-chinese-addons
+        fcitx5-configtool # TODO: Remove this and set config through HomeManager
+      ];
+    };
   };
 }