diff options
| -rw-r--r-- | hosts/aptos/default.nix | 3 | ||||
| -rw-r--r-- | modules/system/default.nix | 1 | ||||
| -rw-r--r-- | modules/system/fonts/default.nix | 42 | ||||
| -rw-r--r-- | profiles/workstation.nix | 31 |
4 files changed, 31 insertions, 46 deletions
diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix index 5b0e40e..49d4c14 100644 --- a/hosts/aptos/default.nix +++ b/hosts/aptos/default.nix @@ -9,9 +9,6 @@ "${self}/profiles/laptop.nix" ]; - # install and configure the fonts - my.systems.fonts.enable = true; - # install and configure sway my.programs.sway.enable = true; diff --git a/modules/system/default.nix b/modules/system/default.nix index 22ba97e..46cefbd 100644 --- a/modules/system/default.nix +++ b/modules/system/default.nix @@ -6,7 +6,6 @@ ./btrfs ./console ./documentation - ./fonts ./nix ./packages ./security diff --git a/modules/system/fonts/default.nix b/modules/system/fonts/default.nix deleted file mode 100644 index 55e4020..0000000 --- a/modules/system/fonts/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ pkgs, config, lib, ... }: -let - cfg = config.my.systems.fonts; -in -{ - options.my.systems.fonts = with lib; { - enable = mkEnableOption "fonts configuration"; - }; - - config = lib.mkIf cfg.enable { - fonts = { - enableDefaultFonts = true; - fontDir.enable = true; - fontconfig = { - enable = true; - defaultFonts = { - serif = [ "Bitstream Vera Serif" ]; - sansSerif = [ "Bitstream Vera Sans" ]; - monospace = [ "Bitstream Vera Sans Mono" ]; - }; - }; - fonts = with pkgs; [ - dejavu_fonts - ttf_bitstream_vera - - font-awesome_5 - - noto-fonts - noto-fonts-cjk # Chinese, Japanese, Korean - noto-fonts-emoji - noto-fonts-emoji - noto-fonts-extra - - cantarell-fonts - - source-code-pro - source-sans-pro - source-serif-pro - ]; - }; - }; -} diff --git a/profiles/workstation.nix b/profiles/workstation.nix index fc888d3..2c7ee02 100644 --- a/profiles/workstation.nix +++ b/profiles/workstation.nix @@ -42,6 +42,37 @@ hardware.pulseaudio.enable = false; + fonts = { + enableDefaultFonts = true; + fontDir.enable = true; + fontconfig = { + enable = true; + defaultFonts = { + serif = [ "Bitstream Vera Serif" ]; + sansSerif = [ "Bitstream Vera Sans" ]; + monospace = [ "Bitstream Vera Sans Mono" ]; + }; + }; + fonts = with pkgs; [ + dejavu_fonts + ttf_bitstream_vera + + font-awesome_5 + + noto-fonts + noto-fonts-cjk # Chinese, Japanese, Korean + noto-fonts-emoji + noto-fonts-emoji + noto-fonts-extra + + cantarell-fonts + + source-code-pro + source-sans-pro + source-serif-pro + ]; + }; + # Misc packages useful on a workstation environment.systemPackages = with pkgs; [ # sound related |