From e086b08f45c2e923a4e65a1462ea3dd9dd7c253b Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Tue, 2 Jan 2024 03:36:10 -0800 Subject: [PATCH 1/2] Fix qml themes --- modules/theme/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/theme/default.nix b/modules/theme/default.nix index 817b53b..6aacd0e 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -1,4 +1,4 @@ -{ self, config, pkgs, ... }: { +{ self, lib, config, pkgs, ... }: { environment.systemPackages = with pkgs; [ qt5ct breeze-qt5 @@ -6,8 +6,16 @@ breeze-icons ]; - environment.variables = { + environment.variables = let + qmlPackages = with pkgs; [ + plasma5Packages.qqc2-desktop-style + plasma5Packages.kirigami2 + ]; + + qtVersion = pkgs.qt515.qtbase.version; + in { "QT_QPA_PLATFORMTHEME" = "qt5ct"; + "QML2_IMPORT_PATH" = "${lib.concatStringsSep ":" (builtins.map (p: "${p}/lib/qt-${qtVersion}/qml") qmlPackages)}"; }; home-manager.users.${config.main-user} = { From 238d939d8e8bf9b75ee48f1dd4d70edde1eeb1c6 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Sun, 14 Jan 2024 03:30:27 -0800 Subject: [PATCH 2/2] Disable fcitx5 clipboard --- modules/user/modules/fcitx5/classicui.conf | 14 +++++++++++--- modules/user/modules/fcitx5/config | 6 ++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/user/modules/fcitx5/classicui.conf b/modules/user/modules/fcitx5/classicui.conf index 7bc5e4e..803246e 100644 --- a/modules/user/modules/fcitx5/classicui.conf +++ b/modules/user/modules/fcitx5/classicui.conf @@ -1,7 +1,5 @@ # Vertical Candidate List Vertical Candidate List=False -# Use Per Screen DPI -PerScreenDPI=True # Use mouse wheel to go to prev or next page WheelForPaging=True # Font @@ -19,9 +17,19 @@ PreferTextIcon=False # Show Layout Name In Icon ShowLayoutNameInIcon=True # Use input method language to display text -UseInputMethodLangaugeToDisplayText=True +UseInputMethodLanguageToDisplayText=True # Theme Theme=plasma +# Dark Theme +DarkTheme=plasma +# Follow system light/dark color scheme +UseDarkTheme=False +# Follow system accent color if it is supported by theme and desktop +UseAccentColor=True +# Use Per Screen DPI on X11 +PerScreenDPI=True # Force font DPI on Wayland ForceWaylandDPI=0 +# Enable fractional scale under Wayland +EnableFractionalScale=True diff --git a/modules/user/modules/fcitx5/config b/modules/user/modules/fcitx5/config index 77fa7e6..8d0f2fd 100644 --- a/modules/user/modules/fcitx5/config +++ b/modules/user/modules/fcitx5/config @@ -59,4 +59,10 @@ EnabledAddons= DisabledAddons= # Preload input method to be used by default PreloadInputMethod=True +# Allow input method in the password field +AllowInputMethodForPassword=False +# Show preedit text when typing password +ShowPreeditForPassword=False +# Interval of saving user data in minutes +AutoSavePeriod=30