diff --git a/modules/base/default.nix b/modules/base/default.nix index 0e415e3..91409b4 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -3,6 +3,7 @@ ../options ./nix.nix + ./stylix ./home.nix ]; diff --git a/modules/base/stylix/default.nix b/modules/base/stylix/default.nix new file mode 100644 index 0000000..46a7cb3 --- /dev/null +++ b/modules/base/stylix/default.nix @@ -0,0 +1,21 @@ +{pkgs, ...}: { + stylix = { + enable = true; + + base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; + override = {slug = "rose-pine";}; + + image = ./wallpaper.png; + + fonts = { + monospace = { + package = pkgs.maple-mono-NF; + name = "Maple Mono"; + }; + + sizes = { + terminal = 11; + }; + }; + }; +} diff --git a/snowflake/modules/nixos/appearance/base/wallpaper.png b/modules/base/stylix/wallpaper.png similarity index 100% rename from snowflake/modules/nixos/appearance/base/wallpaper.png rename to modules/base/stylix/wallpaper.png diff --git a/modules/darwin/base/default.nix b/modules/darwin/base/default.nix index 0c7cc4a..3085991 100644 --- a/modules/darwin/base/default.nix +++ b/modules/darwin/base/default.nix @@ -2,5 +2,6 @@ imports = [ ./home.nix ./nix.nix + ./stylix.nix ]; } diff --git a/modules/darwin/base/stylix.nix b/modules/darwin/base/stylix.nix new file mode 100644 index 0000000..9300849 --- /dev/null +++ b/modules/darwin/base/stylix.nix @@ -0,0 +1,3 @@ +{inputs, ...}: { + imports = [inputs.stylix.darwinModules.stylix]; +} diff --git a/modules/nixos/base/default.nix b/modules/nixos/base/default.nix index 30ba7d0..cbb281a 100644 --- a/modules/nixos/base/default.nix +++ b/modules/nixos/base/default.nix @@ -2,10 +2,12 @@ imports = [ ./boot.nix ./drivers.nix + ./fonts.nix ./home.nix ./i18n.nix ./networking.nix ./nix.nix + ./stylix.nix ./users.nix ]; } diff --git a/modules/nixos/base/fonts.nix b/modules/nixos/base/fonts.nix new file mode 100644 index 0000000..bae9b4d --- /dev/null +++ b/modules/nixos/base/fonts.nix @@ -0,0 +1,10 @@ +{pkgs, ...}: { + fonts = { + enableDefaultPackages = true; + + packages = with pkgs; [ + corefonts + noto-fonts + ]; + }; +} diff --git a/modules/nixos/base/stylix.nix b/modules/nixos/base/stylix.nix new file mode 100644 index 0000000..7b1776a --- /dev/null +++ b/modules/nixos/base/stylix.nix @@ -0,0 +1,33 @@ +{ + inputs, + pkgs, + ... +}: { + imports = [inputs.stylix.nixosModules.stylix]; + + config = { + stylix = { + enable = true; + + fonts = { + serif = { + package = pkgs.eb-garamond; + name = "EB Garamond"; + }; + sansSerif = { + package = pkgs.dm-sans; + name = "DeepMind Sans"; + }; + emoji = { + package = pkgs.whatsapp-emoji-font; + name = "Apple Color Emoji"; + }; + }; + + cursor = { + package = pkgs.rose-pine-cursor; + name = "BreezeX-RosePine-Linux"; + }; + }; + }; +} diff --git a/snowflake/modules/nixos/appearance/base/default.nix b/snowflake/modules/nixos/appearance/base/default.nix deleted file mode 100644 index ad4894e..0000000 --- a/snowflake/modules/nixos/appearance/base/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: let - cfg = config.marleyos.appearance.base; -in { - options.marleyos.appearance.base.enable = lib.mkEnableOption "base"; - - config = lib.mkIf cfg.enable { - stylix = { - enable = true; - - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; - override = {slug = "rose-pine";}; - - image = ./wallpaper.png; - - fonts = { - serif = { - package = pkgs.eb-garamond; - name = "EB Garamond"; - }; - sansSerif = { - package = pkgs.dm-sans; - name = "DeepMind Sans"; - }; - monospace = { - package = pkgs.maple-mono-NF; - name = "Maple Mono"; - }; - emoji = { - package = pkgs.whatsapp-emoji-font; - name = "Apple Color Emoji"; - }; - - sizes = { - terminal = 11; - }; - }; - - cursor = { - package = pkgs.rose-pine-cursor; - name = "BreezeX-RosePine-Linux"; - }; - }; - - fonts = { - enableDefaultPackages = true; - - packages = with pkgs; [ - corefonts - noto-fonts - ]; - }; - }; -}