diff --git a/modules/core/default.nix b/modules/core/default.nix index d7aa66f..849878a 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -18,7 +18,6 @@ ++ [(import ./services.nix)] ++ [(import ./gaming.nix)] ++ [(import ./system.nix)] - ++ [(import ./stylix.nix)] ++ [(import ./user.nix)] ++ [(import ./wayland.nix)] ++ [(import ./virtualisation.nix)]; diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix deleted file mode 100644 index 1f55985..0000000 --- a/modules/core/stylix.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - inputs, - pkgs, - ... -}: { - imports = [inputs.stylix.nixosModules.stylix]; - stylix = { - enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; - }; -} diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 7d28466..6e4f740 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -17,6 +17,8 @@ QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_QPA_PLATFORM = "wayland"; + QT_QPA_PLATFORMTHEME = "qt5ct"; + QT_STYLE_OVERRIDE = "kvantum"; MOZ_ENABLE_WAYLAND = "1"; MOZ_USE_XINPUT2 = "1"; WLR_BACKEND = "vulkan"; @@ -24,6 +26,7 @@ XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland"; + GTK_THEME = "Dracula"; }; wayland.windowManager.hyprland.systemd.variables = ["--all"]; diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index bcaf145..388c757 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -1,11 +1,13 @@ { + inputs, config, pkgs, ... }: { + imports = [inputs.stylix.homeModules.stylix]; + stylix = { enable = true; - autoEnable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; targets = { librewolf.profileNames = ["pedro"]; @@ -20,7 +22,10 @@ name = "JetBrainsMono Nerd Font"; }; - emoji = config.stylix.fonts.monospace; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; }; cursor = {