diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix index b8d4ab7..b175a07 100644 --- a/machines/loki/configuration.nix +++ b/machines/loki/configuration.nix @@ -453,7 +453,7 @@ programs = { sway = { enable = true; - package = pkgs.swayfx; + # package = pkgs.swayfx; wrapperFeatures = { gtk = true; base = true; diff --git a/machines/thor/configuration.nix b/machines/thor/configuration.nix index 93a622a..d4a019e 100644 --- a/machines/thor/configuration.nix +++ b/machines/thor/configuration.nix @@ -18,10 +18,7 @@ desktop = { enable = false; }; - fonts = { - enable = false; - iosevka-aile = false; - }; + fonts.enable = false; gnome.enable = false; klipper.enable = true; lightdm.enable = false; diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix index 45ecc9a..414c96e 100644 --- a/modules/fonts/default.nix +++ b/modules/fonts/default.nix @@ -13,42 +13,36 @@ in { options.eboskma.fonts = { enable = mkEnableOption "activate fonts"; - iosevka-aile = mkOption { - description = "Install Iosevka Aile"; - type = types.bool; - default = true; - }; }; config = mkIf cfg.enable { fonts = { fontDir.enable = true; - packages = - with pkgs; - [ - nerd-fonts.iosevka - nerd-fonts.meslo-lg - nerd-fonts.monaspace - nerd-fonts.noto - nerd-fonts.recursive-mono - corefonts - dejavu_fonts - google-fonts - kochi-substitute - material-icons - monaspace - noto-fonts-emoji - recursive - ttf_bitstream_vera - twitter-color-emoji - ] - ++ lib.optional cfg.iosevka-aile iosevka-aile; + packages = with pkgs; [ + nerd-fonts.iosevka + nerd-fonts.meslo-lg + nerd-fonts.monaspace + nerd-fonts.noto + nerd-fonts.recursive-mono + cantarell-fonts + corefonts + dejavu_fonts + google-fonts + kochi-substitute + material-icons + monaspace + noto-fonts-emoji + recursive + ttf_bitstream_vera + twitter-color-emoji + iosevka-aile + ]; fontconfig = { defaultFonts = { serif = [ "Recursive Sans Casual Static Medium" ]; - sansSerif = [ (if cfg.iosevka-aile then "Iosevka Aile" else "DejaVu Sans") ]; + sansSerif = [ "Cantarell Regular" ]; monospace = [ "Iosevka Nerd Font" ]; emoji = [ "Twitter Color Emoji" ]; }; diff --git a/modules/regreet/default.nix b/modules/regreet/default.nix index 45b5bd3..7a64ca9 100644 --- a/modules/regreet/default.nix +++ b/modules/regreet/default.nix @@ -54,9 +54,9 @@ in }; font = { - name = "Monaspace Neon"; + name = "Cantarell Regular"; size = 16; - package = pkgs.monaspace; + package = pkgs.cantarell-fonts; }; settings = {