diff --git a/home-manager/default.nix b/home-manager/default.nix index 88dcb75..02be09a 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -18,7 +18,9 @@ in services.gnome-keyring.enable = true; + # e.g. for 1password nixpkgs.config.allowUnfree = true; + home.packages = with pkgs; [ httpie wdisplays @@ -67,11 +69,6 @@ in foot wofi - fira-code - dejavu_fonts - roboto - roboto-slab - prusa-slicer htop diff --git a/modules/fonts.nix b/modules/fonts.nix index 5d6d8f0..b458726 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,7 +1,28 @@ -{ - fonts.fontconfig.defaultFonts = { - monospace = [ "Fira Code" "Source Code Pro For Powerline" "Roboto Mono" "DejaVu Sans Mono" ]; - sansSerif = [ "Roboto Regular" "DejaVu Sans" ]; - serif = [ "Roboto Slab Regular" "DejaVu Serif" ]; +{ pkgs, ... }: { + fonts = { + fontconfig = { + enable = true; + antialias = true; + cache32Bit = true; + defaultFonts = { + monospace = [ "Fira Code" "Source Code Pro" "Roboto Mono" "DejaVu Sans Mono" ]; + sansSerif = [ "Roboto Regular" "DejaVu Sans" ]; + serif = [ "Roboto Slab Regular" "DejaVu Serif" ]; + }; + }; + enableDefaultFonts = true; + fontDir.enable = true; + fonts = with pkgs; [ + dejavu_fonts + fira-code + google-fonts + inconsolata + iosevka + liberation_ttf + nerdfonts + roboto + source-code-pro + ubuntu_font_family + ]; }; }