eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-23 03:29:45 +01:00
Code Issues Releases Wiki Activity

i3/sway: support str type for font size

Browse source
This commit is contained in:
DCsunset 2024-08-19 23:58:10 +00:00 committed by Robert Helgesson
parent 7d569851e9
commit 127ccc3eb7
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
4 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/services/window-managers/i3-sway/lib/options.nix
View file

@ -31,7 +31,7 @@ let
}; };
size = mkOption { size = mkOption {
type = types.float; type = types.either types.float types.str;
default = 8.0; default = 8.0;
description = '' description = ''
The font size to use for window titles. The font size to use for window titles.

6
tests/modules/services/window-managers/i3/i3-fonts-deprecated.nix
View file

@ -7,7 +7,10 @@
enable = true; enable = true;
config = { config = {
bars = [{ fonts = [ "FontAwesome" "Iosevka 11.500000" ]; }]; bars = [
{ fonts = [ "FontAwesome" "Iosevka 11.500000" ]; }
{ fonts = [ "FontAwesome" "Iosevka Bold Semi-Condensed 14px" ]; }
];
fonts = [ "DejaVuSansMono" "Terminus Bold Semi-Condensed 13.500000" ]; fonts = [ "DejaVuSansMono" "Terminus Bold Semi-Condensed 13.500000" ];
}; };
}; };
@ -21,5 +24,6 @@
test.asserts.warnings.expected = [ test.asserts.warnings.expected = [
"Specifying i3.config.fonts as a list is deprecated. Use the attrset version instead." "Specifying i3.config.fonts as a list is deprecated. Use the attrset version instead."
"Specifying i3.config.bars[].fonts as a list is deprecated. Use the attrset version instead." "Specifying i3.config.bars[].fonts as a list is deprecated. Use the attrset version instead."
"Specifying i3.config.bars[].fonts as a list is deprecated. Use the attrset version instead."
]; ];
} }

22
tests/modules/services/window-managers/i3/i3-fonts-expected.conf
View file

@ -94,3 +94,25 @@ bar {
} }
} }
bar {
font pango:FontAwesome, Iosevka Bold Semi-Condensed 14px
mode dock
hidden_state hide
position bottom
status_command @i3status@/bin/i3status
i3bar_command @i3@/bin/i3bar
workspace_buttons yes
strip_workspace_numbers no
tray_output primary
colors {
background #000000
statusline #ffffff
separator #666666
focused_workspace #4c7899 #285577 #ffffff
active_workspace #333333 #5f676a #ffffff
inactive_workspace #333333 #222222 #888888
urgent_workspace #2f343a #900000 #ffffff
binding_mode #2f343a #900000 #ffffff
}
}

21
tests/modules/services/window-managers/i3/i3-fonts.nix
View file

@ -7,12 +7,21 @@
enable = true; enable = true;
config = { config = {
bars = [{ bars = [
fonts = { {
names = [ "FontAwesome" "Iosevka" ]; fonts = {
size = 11.5; names = [ "FontAwesome" "Iosevka" ];
}; size = 11.5;
}]; };
}
{
fonts = {
names = [ "FontAwesome" "Iosevka" ];
style = "Bold Semi-Condensed";
size = "14px";
};
}
];
fonts = { fonts = {
names = [ "DejaVuSansMono" "Terminus" ]; names = [ "DejaVuSansMono" "Terminus" ];
style = "Bold Semi-Condensed"; style = "Bold Semi-Condensed";