From 83de2f8264c149e664eb4c41fd349ee35f6fefdd Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Thu, 20 Mar 2025 19:08:56 -0700
Subject: [PATCH] fix: Finally fix homeManager/darwin outputs

I forgot to add new modules to darwin/homeManager outputs oops
---
 flake.nix                                     |  11 +++--
 modules/home/appearance/base/default.nix      |  19 +++++----
 modules/nixos/appearance/base/default.nix     |  38 +-----------------
 stylix.nix                                    |  36 +++++++++++++++++
 .../base/wallpaper.png => wallpaper.png       | Bin
 5 files changed, 57 insertions(+), 47 deletions(-)
 create mode 100644 stylix.nix
 rename modules/nixos/appearance/base/wallpaper.png => wallpaper.png (100%)

diff --git a/flake.nix b/flake.nix
index 6a9e197..a10d330 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,9 @@
       ];
 
       homes.modules = with inputs; [
+        agenix.homeManagerModules.default
+        stylix.homeManagerModules.stylix
+        niri-flake.homeModules.niri
         nixcord.homeManagerModules.nixcord
       ];
 
@@ -73,9 +76,11 @@
 
     agenix = {
       url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.darwin.follows = "darwin";
-      inputs.home-manager.follows = "home-manager";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        darwin.follows = "darwin";
+        home-manager.follows = "home-manager";
+      };
     };
 
     nixgl = {
diff --git a/modules/home/appearance/base/default.nix b/modules/home/appearance/base/default.nix
index 359bd8a..ad931b8 100644
--- a/modules/home/appearance/base/default.nix
+++ b/modules/home/appearance/base/default.nix
@@ -3,6 +3,7 @@
   config,
   pkgs,
   system,
+  inputs,
   ...
 }: let
   inherit (lib.snowfall.system) is-darwin;
@@ -22,15 +23,17 @@ 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;
-    };
+        fonts.sizes.terminal = lib.mkIf (is-darwin system) 14;
+      }
+      // import "${inputs.self}/stylix.nix" {inherit pkgs;};
 
     home.packages = with pkgs; [
       kora-icon-theme
diff --git a/modules/nixos/appearance/base/default.nix b/modules/nixos/appearance/base/default.nix
index ad4894e..780d950 100644
--- a/modules/nixos/appearance/base/default.nix
+++ b/modules/nixos/appearance/base/default.nix
@@ -2,6 +2,7 @@
   lib,
   config,
   pkgs,
+  inputs,
   ...
 }: let
   cfg = config.marleyos.appearance.base;
@@ -9,42 +10,7 @@ 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";
-      };
-    };
+    stylix = import "${inputs.self}/stylix.nix" {inherit pkgs;};
 
     fonts = {
       enableDefaultPackages = true;
diff --git a/stylix.nix b/stylix.nix
new file mode 100644
index 0000000..9f88b28
--- /dev/null
+++ b/stylix.nix
@@ -0,0 +1,36 @@
+{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";
+  };
+}
diff --git a/modules/nixos/appearance/base/wallpaper.png b/wallpaper.png
similarity index 100%
rename from modules/nixos/appearance/base/wallpaper.png
rename to wallpaper.png