Unified font size

This commit is contained in:
Filippo Berto 2021-08-24 10:28:07 +02:00
parent e17323dde8
commit 75d48026fe
5 changed files with 16 additions and 14 deletions

View file

@ -33,14 +33,19 @@ in
primary-background = color.tAlphaRgba (v: float.round (255 * opacity)) black; primary-background = color.tAlphaRgba (v: float.round (255 * opacity)) black;
}; };
font = { font = {
normal = { package = pkgs.cantarell-fonts; name = "Cantarell"; }; normal = {
name = "Cantarell";
package = pkgs.cantarell-fonts;
size = 10;
};
monospace = { monospace = {
name = "FuraCode Nerd Font Mono";
package = ( package = (
pkgs.nerdfonts.override { pkgs.nerdfonts.override {
fonts = [ "FiraCode" ]; fonts = [ "FiraCode" ];
} }
); );
name = "FuraCode Nerd Font Mono"; size = 10;
}; };
}; };
opacity = 0.9; opacity = 0.9;
@ -174,7 +179,7 @@ in
# ./modules/joystickwake.nix # ./modules/joystickwake.nix
./modules/jq.nix ./modules/jq.nix
./modules/kakoune.nix ./modules/kakoune.nix
./modules/keepassxc.nix # ./modules/keepassxc.nix
./modules/keychain.nix ./modules/keychain.nix
# ./modules/kitty.nix # ./modules/kitty.nix
./modules/lf.nix ./modules/lf.nix

View file

@ -13,7 +13,7 @@ in
scrolling.history = 3000; scrolling.history = 3000;
font = { font = {
normal.family = pkgs.rice.font.monospace.name; normal.family = pkgs.rice.font.monospace.name;
size = 9.0; size = pkgs.rice.font.monospace.size;
}; };
background_opacity = pkgs.rice.opacity; background_opacity = pkgs.rice.opacity;
mouse = { mouse = {

View file

@ -1,12 +1,8 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
gtk = { gtk = with pkgs.rice; {
enable = true; enable = true;
font = { font = font.normal;
package = pkgs.cantarell-fonts;
name = "Cantarell";
size = 9;
};
iconTheme = { iconTheme = {
package = pkgs.qogir-icon-theme; package = pkgs.qogir-icon-theme;
name = "Qogir-dark"; name = "Qogir-dark";

View file

@ -10,4 +10,5 @@
Install = { WantedBy = [ "graphical-session.target" ]; }; Install = { WantedBy = [ "graphical-session.target" ]; };
Service = { ExecStart = "${pkgs.keepassxc}/bin/keepassxc"; }; Service = { ExecStart = "${pkgs.keepassxc}/bin/keepassxc"; };
};} };
}

View file

@ -61,9 +61,9 @@ let
bottom.size = 0; bottom.size = 0;
}; };
font = [ font = [
"${pkgs.rice.font.monospace.name}:size=9;2" "${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2"
"Material Design Icons:size=9;2" "Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2"
"NotoEmoji Nerd Font Mono:size=9;0" "NotoEmoji Nerd Font Mono:size=${toString pkgs.rice.font.monospace.size};0"
]; ];
wm-restack = "bspwm"; wm-restack = "bspwm";
}; };