diff --git a/machines/persephone.nix b/machines/persephone.nix index 792b5b8..8d00e21 100644 --- a/machines/persephone.nix +++ b/machines/persephone.nix @@ -200,35 +200,7 @@ in trusted-public-keys = [ "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ]; }; - # FONTS - fonts.fontconfig = { - enable = true; - antialias = true; - hinting = { - enable = true; - style = "slight"; - }; - subpixel = { - rgba = "rgb"; - lcdfilter = "default"; - }; - defaultFonts = { - serif = [ - "SF Pro" - "DejaVu Serif" - ]; - sansSerif = [ - "SF Pro" - "DejaVu Sans" - ]; - monospace = [ - "Iosevka Cavalier" - "DejaVu Sans Mono" - ]; - emoji = [ "Noto Color Emoji" ]; - }; - }; - + fonts.fontconfig.enable = true; fonts.packages = with pkgs; [ apple-fonts.sf-pro noto-fonts-cjk-sans diff --git a/profiles/desktop.linux.nix b/profiles/desktop.linux.nix index 6593449..6030dbc 100644 --- a/profiles/desktop.linux.nix +++ b/profiles/desktop.linux.nix @@ -15,7 +15,7 @@ in { environment = { inherit sessionVariables systemPackages; - + etc = { "1password/custom_allowed_browsers" = { text = '' @@ -27,6 +27,33 @@ in }; }; + fonts.fontconfig = { + antialias = true; + hinting = { + enable = true; + style = "slight"; + }; + subpixel = { + rgba = "rgb"; + lcdfilter = "default"; + }; + defaultFonts = { + serif = [ + "SF Pro" + "DejaVu Serif" + ]; + sansSerif = [ + "SF Pro" + "DejaVu Sans" + ]; + monospace = [ + "Iosevka Cavalier" + "DejaVu Sans Mono" + ]; + emoji = [ "Noto Color Emoji" ]; + }; + }; + hardware.bluetooth = { settings = { General.Experimental = true;