fix: global cursor

jz8132543 · Feb 15, 2024 · 49d7c07 · 49d7c07
1 parent a3ead5b
commit 49d7c07
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/home-manager/modules/desktop/apps.nix b/home-manager/modules/desktop/apps.nix
@@ -14,6 +14,7 @@
     # config.nur.repos.xddxdd.wechat-uos
     remmina
     element-desktop
+    rustdesk
   ];
   dconf.settings = {
     "org/virt-manager/virt-manager/connections" = {

diff --git a/home-manager/modules/desktop/gnome.nix b/home-manager/modules/desktop/gnome.nix
@@ -28,6 +28,11 @@ in {
     extensionPkgs
     ++ (with pkgs; [
       blackbox-terminal
+      (catppuccin-kvantum.override
+        {
+          accent = toTitle config.home.catppuccin.accent;
+          variant = toTitle config.home.catppuccin.variant;
+        })
       orchis-theme
     ]);
 
@@ -188,15 +193,15 @@ in {
   };
   qt = {
     enable = true;
-    platformTheme = "gtk";
-    style.name = "adwaita-light";
-    style.package = pkgs.adwaita-qt;
+    #platformTheme = "qtct";
+    style.name = "kvantum";
   };
   home.sessionVariables = {
     QT_STYLE_OVERRIDE = lib.mkDefault "kvantum";
+    XCURSOR_THEME = config.dconf.settings."org/gnome/desktop/interface".cursor-theme;
   };
   xdg.configFile."Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini {}).generate "kvantum.kvconfig" {
-    General.theme = "Orchis-Light-${toTitle config.home.catppuccin.tweak}";
+    General.theme = "Catppuccin-${toTitle config.home.catppuccin.variant}-${toTitle config.home.catppuccin.accent}";
   };
 
   ## Create startwm.sh for XRDP

diff --git a/home-manager/modules/desktop/i18n/i18n.nix b/home-manager/modules/desktop/i18n/i18n.nix
@@ -36,5 +36,7 @@ in {
 
   home.global-persistence.directories = [
     rimeConfig
+    ".config/ibus"
+    ".cache/ibus"
   ];
 }
diff --git a/home-manager/modules/desktop/wayland-dpi.nix b/home-manager/modules/desktop/wayland-dpi.nix
@@ -37,6 +37,7 @@ in {
       SDL_VIDEODRIVER = "wayland";
       QT_STYLE_OVERRIDE = lib.mkForce "gtk";
       _JAVA_AWT_WM_NONREPARENTING = "1";
+      XCURSOR_SIZE = 36 * cfg / default;
     };
   };
 }
diff --git a/nixos/hosts/ams0/default.nix b/nixos/hosts/ams0/default.nix
@@ -14,6 +14,7 @@
       nixosModules.services.proxy
       nixosModules.services.tuic
       nixosModules.services.searx
+      nixosModules.services.rustdesk
       # nixosModules.services.sogo
     ];
   nix.gc.options = lib.mkForce "-d";

diff --git a/nixos/modules/services/rustdesk.nix b/nixos/modules/services/rustdesk.nix
@@ -0,0 +1,7 @@
+{config, ...}: {
+  services.rustdesk-server = {
+    enable = true;
+    openFirewall = true;
+    relayIP = config.networking.fqdn;
+  };
+}