insects/nix-config
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add bitmap font support

Browse source
This commit is contained in:
insects 2024-08-13 14:55:23 +02:00
parent d7027897fa
commit e5f8a2d975
3 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home/common/desktop/font.nix
View file

@ -9,5 +9,9 @@
family = "Fira Sans"; family = "Fira Sans";
package = pkgs.fira; package = pkgs.fira;
}; };
bitmap = {
family = "Tamzen";
package = pkgs.tamzen;
};
}; };
} }

31
home/common/desktop/waybar.nix
View file

@ -3,20 +3,19 @@
}: { }: {
systemd.user.services.waybar = { systemd.user.services.waybar = {
Unit.StartLimitBurst = 30; Unit.StartLimitBurst = 30;
# this fixes fonts for some reason
Service.Environment = "PATH=${config.home.profileDirectory}/bin";
}; };
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
settings = { settings = {
primary = { primary = {
# exclusive = false;
# passthrough = false;
height = 40; height = 40;
position = "top"; position = "top";
margin-top = 6; margin-top = 10;
margin-left = 6; margin-left = 20;
margin-right = 6; margin-right = 20;
modules-left = [ modules-left = [
"hyprland/workspaces" "hyprland/workspaces"
"hyprland/submap" "hyprland/submap"
@ -41,10 +40,9 @@
inherit (config.lib.stylix.colors) withHashtag; inherit (config.lib.stylix.colors) withHashtag;
in '' in ''
* { * {
font-family: ${config.fontProfiles.regular.family}, ${config.fontProfiles.monospace.family}; font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
font-size: 12pt; font-size: 12pt;
padding: 0; padding: 0;
margin: 0 0.4em;
} }
window#waybar { window#waybar {
@ -52,23 +50,14 @@
border-radius: 0.5em; border-radius: 0.5em;
} }
.modules-left { #workspaces {
margin-left: -0.65em; transition: background-color .5s, color .5s;
}
.modules-right {
margin-right: -0.65em;
}
#workspaces button {
padding-left: 0.4em;
padding-right: 0.4em;
margin-top: 0.15em;
margin-bottom: 0.15em;
} }
#workspaces button.active, #workspaces button.active,
#workspaces button.focused { #workspaces button.focused {
background-color: ${withHashtag.base08}; background-color: ${withHashtag.base05};
color: ${withHashtag.base00};
} }
''; '';
}; };

2
modules/home-manager/fonts.nix
View file

@ -23,6 +23,7 @@ in {
enable = lib.mkEnableOption "Whether to enable font profiles"; enable = lib.mkEnableOption "Whether to enable font profiles";
monospace = mkFontOption "monospace"; monospace = mkFontOption "monospace";
regular = mkFontOption "regular"; regular = mkFontOption "regular";
bitmap = mkFontOption "bitmap";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -30,6 +31,7 @@ in {
home.packages = [ home.packages = [
cfg.monospace.package cfg.monospace.package
cfg.regular.package cfg.regular.package
cfg.bitmap.package
]; ];
}; };
} }