From 4a4be84a33adcadaea9725d3b50b848af37d0770 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Mon, 9 Jun 2025 19:47:55 +0200 Subject: [PATCH 1/2] Use stylix's NixOs module --- modules/core/default.nix | 1 + modules/core/stylix.nix | 11 +++++++++++ modules/home/stylix.nix | 9 ++------- 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 modules/core/stylix.nix diff --git a/modules/core/default.nix b/modules/core/default.nix index 849878a..d7aa66f 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -18,6 +18,7 @@ ++ [(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 new file mode 100644 index 0000000..1f55985 --- /dev/null +++ b/modules/core/stylix.nix @@ -0,0 +1,11 @@ +{ + inputs, + pkgs, + ... +}: { + imports = [inputs.stylix.nixosModules.stylix]; + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + }; +} diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index 388c757..bcaf145 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -1,13 +1,11 @@ { - 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"]; @@ -22,10 +20,7 @@ name = "JetBrainsMono Nerd Font"; }; - emoji = { - package = pkgs.noto-fonts-emoji; - name = "Noto Color Emoji"; - }; + emoji = config.stylix.fonts.monospace; }; cursor = { From fdd286c19f1542e87299323d3deafd6a8c4fa659 Mon Sep 17 00:00:00 2001 From: Pedro Rey Anca Date: Mon, 9 Jun 2025 19:48:12 +0200 Subject: [PATCH 2/2] Remove unused theming variables --- modules/home/hyprland/variables.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 6e4f740..7d28466 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -17,8 +17,6 @@ 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"; @@ -26,7 +24,6 @@ XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland"; - GTK_THEME = "Dracula"; }; wayland.windowManager.hyprland.systemd.variables = ["--all"];