diff --git a/home/asakiyuki/configuration.nix b/home/asakiyuki/configuration.nix index 6cca440..a801f7e 100644 --- a/home/asakiyuki/configuration.nix +++ b/home/asakiyuki/configuration.nix @@ -19,6 +19,7 @@ in imports = [ ./modules/programs.nix ./modules/files.nix + ./modules/env.nix ../../modules/features/home/theme.nix diff --git a/home/asakiyuki/modules/env.nix b/home/asakiyuki/modules/env.nix index 31d7eb7..5a2010e 100644 --- a/home/asakiyuki/modules/env.nix +++ b/home/asakiyuki/modules/env.nix @@ -1,5 +1,5 @@ { ... }: { home.sessionVariables = { - QT_QPA_PLATFORMTHEME = "qt6ct"; + QML_IMPORT_PATH = "/run/current-system/sw/lib/qt-6/qml"; }; } \ No newline at end of file diff --git a/home/asakiyuki/modules/files.nix b/home/asakiyuki/modules/files.nix index 189fdb1..441b05b 100644 --- a/home/asakiyuki/modules/files.nix +++ b/home/asakiyuki/modules/files.nix @@ -1,8 +1,8 @@ { pkgs, osconfig, ... }: { home.file = { - ".config/qt5ct/colors/Catppuccin-Mocha.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/Catppuccin-Mocha.conf"; - ".config/qt6ct/colors/Catppuccin-Mocha.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/Catppuccin-Mocha.conf"; + ".config/qt5ct/colors/Catppuccin-Mocha.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt5ct/colors/catppuccin-mocha-sapphire.conf"; + ".config/qt6ct/colors/Catppuccin-Mocha.conf".source = "${pkgs.catppuccin-qt5ct}/share/qt6ct/colors/catppuccin-mocha-sapphire.conf"; }; xdg.configFile = { diff --git a/modules/features/system/packages.nix b/modules/features/system/packages.nix index 1a8805b..f557e2f 100644 --- a/modules/features/system/packages.nix +++ b/modules/features/system/packages.nix @@ -23,10 +23,10 @@ lxqt.pavucontrol-qt nwg-look - (pkgs.catppuccin-kde.override { - flavour = [ "mocha" ]; - accents = [ "sapphire" ]; - }) + # (pkgs.catppuccin-kde.override { + # flavour = [ "mocha" ]; + # accents = [ "sapphire" ]; + # }) (pkgs.catppuccin-gtk.override { variant = "mocha"; @@ -42,7 +42,6 @@ kate qt5compat qtdeclarative - libsForQt5.qt5.qtgraphicaleffects qtimageformats qtsvg qtmultimedia