diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3412b337..9bbf7a63 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -28,12 +28,6 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; nixpkgs.config.allowUnfree = true; - environment.sessionVariables = { - NIXPKGS_ALLOW_UNFREE = "1"; - QT_QPA_PLATFORMTHEME = "qt5ct"; - QT_FONT_DPI = "125"; - }; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It's perfectly fine and recommended to leave diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix index a49c1591..eac00710 100644 --- a/nixos/home/packages.nix +++ b/nixos/home/packages.nix @@ -69,17 +69,17 @@ firefox # TODO: use programs.firefox spotifywm zeal - libreoffice-fresh # TODO: add spelling stuff + libreoffice-fresh # TODO: add spelling stuff and declarative conf? photoqt - gimp-with-plugins + gimp-with-plugins # TODO: set plugins using nix vlc discord nextcloud-client + jellyfin-media-player + xournalpp # Misc CLI neofetch - qt5.qtwayland - qt6.qtwayland acpi progress alsa-utils diff --git a/nixos/home/theme.nix b/nixos/home/theme.nix index 28d9a84a..9eca4264 100644 --- a/nixos/home/theme.nix +++ b/nixos/home/theme.nix @@ -7,11 +7,6 @@ }; in { - home.packages = with pkgs; [ - plasma5Packages.qtstyleplugin-kvantum - qt5ct - ]; - home.pointerCursor = { name = "Dracula-cursors"; package = pkgs.dracula-theme; @@ -38,14 +33,21 @@ in }; }; + qt = { + enable = true; + platformTheme = "qtct"; + style.name = "Kvantum"; + }; + xresources.extraConfig = builtins.readFile("${dracula-xresources}/Xresources"); - xdg.configFile = { - "../.themes/Dracula".source = "${pkgs.dracula-theme}/share/themes/Dracula"; + home.sessionVariables = { + QT_FONT_DPI = "125"; + }; - "Kvantum/Dracula".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula"; - "Kvantum/Dracula-Solid".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-Solid"; - "Kvantum/Dracula-purple".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple"; - "Kvantum/Dracula-purple-solid".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple-solid"; + xdg.configFile = { + "Kvantum/Dracula/Dracula.kvconfig".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple-solid/Dracula-purple-solid.kvconfig"; + "Kvantum/Dracula/Dracula.svg".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple-solid/Dracula-purple-solid.svg"; + "Kvantum/kvantum.kvconfig".text = "[General]\ntheme=Dracula"; }; }