diff --git a/flake.nix b/flake.nix index a10d330..7102316 100644 --- a/flake.nix +++ b/flake.nix @@ -35,7 +35,6 @@ homes.modules = with inputs; [ agenix.homeManagerModules.default - stylix.homeManagerModules.stylix niri-flake.homeModules.niri nixcord.homeManagerModules.nixcord ]; diff --git a/modules/home/appearance/base/default.nix b/modules/home/appearance/base/default.nix index ad931b8..2742ecf 100644 --- a/modules/home/appearance/base/default.nix +++ b/modules/home/appearance/base/default.nix @@ -23,17 +23,15 @@ in { }; }; - stylix = - { - iconTheme = { - package = pkgs.kora-icon-theme; - dark = "kora"; - light = "kora-light-panel"; - }; + stylix = { + iconTheme = { + package = pkgs.kora-icon-theme; + dark = "kora"; + light = "kora-light-panel"; + }; - fonts.sizes.terminal = lib.mkIf (is-darwin system) 14; - } - // import "${inputs.self}/stylix.nix" {inherit pkgs;}; + fonts.sizes.terminal = lib.mkIf (is-darwin system) 14; + }; home.packages = with pkgs; [ kora-icon-theme diff --git a/modules/nixos/appearance/base/default.nix b/modules/nixos/appearance/base/default.nix index 780d950..ad4894e 100644 --- a/modules/nixos/appearance/base/default.nix +++ b/modules/nixos/appearance/base/default.nix @@ -2,7 +2,6 @@ lib, config, pkgs, - inputs, ... }: let cfg = config.marleyos.appearance.base; @@ -10,7 +9,42 @@ in { options.marleyos.appearance.base.enable = lib.mkEnableOption "base"; config = lib.mkIf cfg.enable { - stylix = import "${inputs.self}/stylix.nix" {inherit pkgs;}; + 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; diff --git a/wallpaper.png b/modules/nixos/appearance/base/wallpaper.png similarity index 100% rename from wallpaper.png rename to modules/nixos/appearance/base/wallpaper.png diff --git a/stylix.nix b/stylix.nix deleted file mode 100644 index 9f88b28..0000000 --- a/stylix.nix +++ /dev/null @@ -1,36 +0,0 @@ -{pkgs}: { - 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"; - }; -}