diff --git a/modules/theme/default.nix b/modules/theme/default.nix index 6aacd0e..817b53b 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -1,4 +1,4 @@ -{ self, lib, config, pkgs, ... }: { +{ self, config, pkgs, ... }: { environment.systemPackages = with pkgs; [ qt5ct breeze-qt5 @@ -6,16 +6,8 @@ breeze-icons ]; - environment.variables = let - qmlPackages = with pkgs; [ - plasma5Packages.qqc2-desktop-style - plasma5Packages.kirigami2 - ]; - - qtVersion = pkgs.qt515.qtbase.version; - in { + environment.variables = { "QT_QPA_PLATFORMTHEME" = "qt5ct"; - "QML2_IMPORT_PATH" = "${lib.concatStringsSep ":" (builtins.map (p: "${p}/lib/qt-${qtVersion}/qml") qmlPackages)}"; }; home-manager.users.${config.main-user} = { diff --git a/modules/user/modules/fcitx5/classicui.conf b/modules/user/modules/fcitx5/classicui.conf index 803246e..7bc5e4e 100644 --- a/modules/user/modules/fcitx5/classicui.conf +++ b/modules/user/modules/fcitx5/classicui.conf @@ -1,5 +1,7 @@ # 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 @@ -17,19 +19,9 @@ PreferTextIcon=False # Show Layout Name In Icon ShowLayoutNameInIcon=True # Use input method language to display text -UseInputMethodLanguageToDisplayText=True +UseInputMethodLangaugeToDisplayText=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 8d0f2fd..77fa7e6 100644 --- a/modules/user/modules/fcitx5/config +++ b/modules/user/modules/fcitx5/config @@ -59,10 +59,4 @@ 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