diff --git a/user/kirill/modules/style.nix b/user/kirill/modules/style.nix index 5065abd..0d3cfb4 100644 --- a/user/kirill/modules/style.nix +++ b/user/kirill/modules/style.nix @@ -1,4 +1,18 @@ -{ pkgs, config, lib, ... }: { +{ pkgs, config, lib, ... }: let + pixeloid = pkgs.stdenvNoCC.mkDerivation { + name = "Pixeloid"; + dontUnpack = true; + + src = pkgs.fetchurl { + url = "https://lair.moe/static/font/Pixeloid/otf/Sans.otf"; + hash = "sha256-GTf2BnhH0Pzc3Bbevmd+mA6t8lZFMUxX9wkSqWicuSc="; + }; + + installPhase = '' + install -Dm644 "$src" "$out/share/fonts/opentype/Sans.otf" + ''; + }; +in { stylix = { enable = true; overlays.enable = false; @@ -41,6 +55,11 @@ package = (pkgs.google-fonts.override { fonts = [ "Gabriela" ]; }); }; + sansSerif = { + name = "Pixeloid Sans"; + package = pixeloid; + }; + emoji = { package = pkgs.noto-fonts-monochrome-emoji; name = "Noto Emoji"; diff --git a/user/kirill/modules/waybar.nix b/user/kirill/modules/waybar.nix index 463f7eb..fe94d28 100644 --- a/user/kirill/modules/waybar.nix +++ b/user/kirill/modules/waybar.nix @@ -1,11 +1,15 @@ { osConfig, config, pkgs, lib, ... }: { home.packages = with pkgs; [ + #Fonts font-awesome nerd-fonts.symbols-only - playerctl - cava + monocraft + + #packages pulsemixer wifitui + playerctl + cava ]; programs.waybar = { @@ -51,7 +55,7 @@ }; pulseaudio = { - format = "{icon} {volume}%"; + format = "{icon} {volume}%"; format-icons = { headphone = "󰋋"; hands-free = ""; @@ -184,6 +188,7 @@ background: transparent; color: ${colors.base05}; border-radius: ${radius}; + font-family: "Symbols Nerd Font Mono", "Monocraft", "Font Awesome 7 Free"; font-weight: bold; font-size: .85em;