diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix index b825895..3034c54 100644 --- a/hosts/dunamis/configuration.nix +++ b/hosts/dunamis/configuration.nix @@ -18,7 +18,7 @@ locale.ukrainian.enable = true; module.stylix = { enable = true; - theme = "nord"; + theme = "helios"; }; opentabletdriver.enable = false; qmk-vial.enable = true; diff --git a/modules/home/desktop/niri/default.nix b/modules/home/desktop/niri/default.nix index 34e677c..c158fb3 100644 --- a/modules/home/desktop/niri/default.nix +++ b/modules/home/desktop/niri/default.nix @@ -256,7 +256,7 @@ in { } { timeout = 601; - on-timeout = "${pkgs.niri}/bin/niri msg action power-off-monitors"; + on-timeout = getExe pkgs.niri + " msg action power-off-monitors"; } ]; }; @@ -715,8 +715,8 @@ in { }; }; "tray" = { - icon-size = 24; - spacing = 2; + icon-size = 16; + spacing = 4; }; "clock" = { interval = 1; @@ -770,7 +770,7 @@ in { format = "{volume}% {icon}"; format-muted = "󰖁"; format-icons = ["󰕿" "󰖀" "󰕾"]; - on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; + on-click = getExe pkgs.pwvucontrol; on-click-right = "wpctl set-mute @DEFAULT_SINK@ toggle"; }; "custom/notification" = { @@ -972,7 +972,10 @@ in { if config.stylix.polarity == "dark" then "Papirus-Dark" else "Papirus-Light"; - package = pkgs.papirus-nord; + package = + if osConfig.module.stylix.theme == "nord" + then pkgs.papirus-nord + else pkgs.papirus-icon-theme; }; }; qt = { diff --git a/modules/nixos/system/misc/default.nix b/modules/nixos/system/misc/default.nix index e30d259..1637305 100644 --- a/modules/nixos/system/misc/default.nix +++ b/modules/nixos/system/misc/default.nix @@ -3,6 +3,6 @@ ./locale.nix ./opentabletdriver.nix ./qmk-vial.nix - ./stylix.nix + ./stylix ]; } diff --git a/modules/nixos/system/misc/stylix.nix b/modules/nixos/system/misc/stylix/default.nix similarity index 74% rename from modules/nixos/system/misc/stylix.nix rename to modules/nixos/system/misc/stylix/default.nix index e07f46d..428e7e8 100644 --- a/modules/nixos/system/misc/stylix.nix +++ b/modules/nixos/system/misc/stylix/default.nix @@ -12,8 +12,6 @@ cfg = config.module.stylix; - cursorSize = 32; - iosevkaPackage = if stateVersion == "24.11" then pkgs.nerdfonts.override {fonts = ["Iosevka"];} @@ -22,6 +20,14 @@ if stateVersion == "24.11" then pkgs.nerdfonts.override {fonts = ["Iosevka Term"];} else pkgs.nerd-fonts.iosevka-term; + mesloLgPackage = + if stateVersion == "24.11" + then pkgs.nerdfonts.override {fonts = ["MesloLG"];} + else pkgs.nerd-fonts.meslo-lg; + jetBrainsMonoPackage = + if stateVersion == "24.11" + then pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];} + else pkgs.nerd-fonts.jetbrains-mono; themes = { nord = { @@ -46,6 +52,7 @@ cursor = { package = pkgs.nordzy-cursor-theme; name = "Nordzy-cursors"; + size = 32; }; }; @@ -71,6 +78,33 @@ cursor = { package = pkgs.nordzy-cursor-theme; name = "Nordzy-cursors-white"; + size = 32; + }; + }; + + helios = { + polarity = "dark"; + scheme = "${pkgs.base16-schemes}/share/themes/helios.yaml"; + wallpaper = builtins.fetchurl { + url = "https://w.wallhaven.cc/full/we/wallhaven-wejkzx.jpg"; + name = "wallhaven-wejkzx.jpg"; + sha256 = "sha256:145q483q1yvs4pndh2r57gfvbd9jc15sry9qz31avqxyrn8ama52"; + }; + + serif = { + package = jetBrainsMonoPackage; + name = "JetBrainsMono Nerd Font Propo"; + }; + + monospace = { + package = jetBrainsMonoPackage; + name = "JetBrainsMono Nerd Font Mono"; + }; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; }; }; }; @@ -131,8 +165,7 @@ in { } // optionalAttrs cfg.useCursor { cursor = { - inherit (themes.${cfg.theme}.cursor) package name; - size = cursorSize; + inherit (themes.${cfg.theme}.cursor) package name size; }; }; };