diff --git a/home.nix b/home.nix index a463c8e..d1cd57b 100644 --- a/home.nix +++ b/home.nix @@ -33,14 +33,19 @@ in primary-background = color.tAlphaRgba (v: float.round (255 * opacity)) black; }; font = { - normal = { package = pkgs.cantarell-fonts; name = "Cantarell"; }; + normal = { + name = "Cantarell"; + package = pkgs.cantarell-fonts; + size = 10; + }; monospace = { + name = "FuraCode Nerd Font Mono"; package = ( pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; } ); - name = "FuraCode Nerd Font Mono"; + size = 10; }; }; opacity = 0.9; @@ -174,7 +179,7 @@ in # ./modules/joystickwake.nix ./modules/jq.nix ./modules/kakoune.nix - ./modules/keepassxc.nix + # ./modules/keepassxc.nix ./modules/keychain.nix # ./modules/kitty.nix ./modules/lf.nix diff --git a/modules/alacritty.nix b/modules/alacritty.nix index ac2b890..f48b933 100644 --- a/modules/alacritty.nix +++ b/modules/alacritty.nix @@ -13,7 +13,7 @@ in scrolling.history = 3000; font = { normal.family = pkgs.rice.font.monospace.name; - size = 9.0; + size = pkgs.rice.font.monospace.size; }; background_opacity = pkgs.rice.opacity; mouse = { diff --git a/modules/gtk_theme.nix b/modules/gtk_theme.nix index 01d9416..596b718 100644 --- a/modules/gtk_theme.nix +++ b/modules/gtk_theme.nix @@ -1,12 +1,8 @@ { pkgs, ... }: { - gtk = { + gtk = with pkgs.rice; { enable = true; - font = { - package = pkgs.cantarell-fonts; - name = "Cantarell"; - size = 9; - }; + font = font.normal; iconTheme = { package = pkgs.qogir-icon-theme; name = "Qogir-dark"; diff --git a/modules/keepassxc.nix b/modules/keepassxc.nix index 5feaa95..7d2f75b 100644 --- a/modules/keepassxc.nix +++ b/modules/keepassxc.nix @@ -10,4 +10,5 @@ Install = { WantedBy = [ "graphical-session.target" ]; }; Service = { ExecStart = "${pkgs.keepassxc}/bin/keepassxc"; }; - };} + }; +} diff --git a/modules/polybar.nix b/modules/polybar.nix index 563b9c5..5f7b232 100644 --- a/modules/polybar.nix +++ b/modules/polybar.nix @@ -61,9 +61,9 @@ let bottom.size = 0; }; font = [ - "${pkgs.rice.font.monospace.name}:size=9;2" - "Material Design Icons:size=9;2" - "NotoEmoji Nerd Font Mono:size=9;0" + "${pkgs.rice.font.monospace.name}:size=${toString pkgs.rice.font.monospace.size};2" + "Material Design Icons:size=${toString pkgs.rice.font.monospace.size};2" + "NotoEmoji Nerd Font Mono:size=${toString pkgs.rice.font.monospace.size};0" ]; wm-restack = "bspwm"; };