From 0965dd312a69aaced5550ec54a05e33d5aa3a001 Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <rafiq@rrv.sh>
Date: Tue, 1 Jul 2025 17:02:27 +0800
Subject: [PATCH] chore(tree-wide): remove snowfall-lib as dependency

---
 flake.nix                                     | 39 ++++---------------
 homes/x86_64-linux/rafiq/cli/multiplexer.nix  | 11 +++++-
 homes/x86_64-linux/rafiq/default.nix          |  6 ++-
 modules/home/default.nix                      | 13 ++++++-
 modules/nixos/default.nix                     |  5 +++
 .../nixos/machine/drives/btrfs/default.nix    | 11 +++++-
 .../nixos/server/web-apps/rrv-sh/default.nix  | 10 ++++-
 .../web-apps/sd-webui-forge/default.nix       | 11 +++++-
 8 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2f2cd6f..d034f8f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,11 @@
 {
-
+  outputs =
+    inputs:
+    inputs.snowfall-lib.mkFlake {
+      inherit inputs;
+      src = ./.;
+      snowfall.namespace = "pantheon";
+    };
   inputs = {
     crane.url = "github:ipetkov/crane";
     rrv-sh.url = "github:rrvsh/rrv.sh";
@@ -62,35 +68,4 @@
     zjstatus.inputs.rust-overlay.follows = "rust-overlay";
     zjstatus.url = "github:dj95/zjstatus";
   };
-
-  outputs =
-    inputs:
-    inputs.snowfall-lib.mkFlake {
-      inherit inputs;
-      src = ./.;
-      snowfall.namespace = "pantheon";
-      overlays = with inputs; [
-        stable-diffusion-webui-nix.overlays.default
-        (_final: prev: {
-          zjstatus = zjstatus.packages.${prev.system}.default;
-        })
-      ];
-      systems.modules.nixos = with inputs; [
-        disko.nixosModules.disko
-        impermanence.nixosModules.impermanence
-        sops-nix.nixosModules.sops
-        stylix.nixosModules.stylix
-        stable-diffusion-webui-nix.nixosModules.default
-        rrv-sh.nixosModules.default
-      ];
-      homes.modules = with inputs; [
-        impermanence.homeManagerModules.impermanence
-        nix-index-database.hmModules.nix-index
-        nvf.homeManagerModules.default
-      ];
-      outputs-builder = channels: {
-        formatter = channels.nixpkgs.nixfmt-rfc-style;
-      };
-    };
-
 }
diff --git a/homes/x86_64-linux/rafiq/cli/multiplexer.nix b/homes/x86_64-linux/rafiq/cli/multiplexer.nix
index 5d50bdc..5d3888e 100644
--- a/homes/x86_64-linux/rafiq/cli/multiplexer.nix
+++ b/homes/x86_64-linux/rafiq/cli/multiplexer.nix
@@ -1,4 +1,9 @@
-{ pkgs, osConfig, ... }:
+{
+  osConfig,
+  inputs,
+  pkgs,
+  ...
+}:
 {
   home.sessionVariables.MULTIPLEXER = "zellij";
   persistDirs = [ "/.cache/zellij" ];
@@ -16,7 +21,9 @@
       layout {
           default_tab_template {
               pane size=1 borderless=true {
-                  plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" {
+                  plugin location="file:${
+                    inputs.zjstatus.packages.${pkgs.stdenv.hostPlatform.system}.default
+                  }/bin/zjstatus.wasm" {
                       format_left   "{mode} ${osConfig.hostname}"
                       format_center "{tabs}"
                       format_right  "{datetime}"
diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index 1045dc2..8427d1a 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -11,7 +11,11 @@ in
 {
   imports =
     (optional osConfig.desktop.enable (import-tree ./desktop))
-    ++ singleton (import-tree ./cli);
+    ++ singleton (import-tree ./cli)
+    ++ [
+      inputs.nix-index-database.hmModules.nix-index
+      inputs.nvf.homeManagerModules.default
+    ];
 
   config = {
     stylix.image = ./desktop/wallpaper.png;
diff --git a/modules/home/default.nix b/modules/home/default.nix
index a211cd5..7049e61 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,9 +1,18 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  inputs,
+  ...
+}:
 let
   inherit (lib) mkOption;
   inherit (lib.types) listOf str;
 in
 {
+  imports = [
+    inputs.impermanence.homeManagerModules.impermanence
+  ];
+
   options = {
     persistDirs = mkOption {
       type = listOf str;
@@ -13,7 +22,7 @@ in
 
   config = {
     # Helper options
-    home.persistence."/persist/home/${config.snowfallorg.user.name}" = {
+    home.persistence."/persist/home/${config.home.username}" = {
       directories = config.persistDirs;
       allowOther = true;
     };
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index fd67601..b849e4e 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,4 +1,5 @@
 {
+  inputs,
   lib,
   config,
   system,
@@ -33,6 +34,10 @@ let
   };
 in
 {
+  imports = [
+    inputs.sops-nix.nixosModules.sops
+    inputs.stylix.nixosModules.stylix
+  ];
   options = {
     hostname = mkStrOption;
     mainUser = {
diff --git a/modules/nixos/machine/drives/btrfs/default.nix b/modules/nixos/machine/drives/btrfs/default.nix
index 4164b78..89923ff 100644
--- a/modules/nixos/machine/drives/btrfs/default.nix
+++ b/modules/nixos/machine/drives/btrfs/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  inputs,
+  ...
+}:
 let
   inherit (lib) mkIf mkEnableOption;
   inherit (lib.pantheon) mkStrOption;
@@ -44,6 +49,10 @@ let
   };
 in
 {
+  imports = [
+    inputs.disko.nixosModules.disko
+    inputs.impermanence.nixosModules.impermanence
+  ];
   options.machine.drives.btrfs = {
     enable = mkEnableOption "";
     drive = mkStrOption;
diff --git a/modules/nixos/server/web-apps/rrv-sh/default.nix b/modules/nixos/server/web-apps/rrv-sh/default.nix
index 7954ba2..25a54bd 100644
--- a/modules/nixos/server/web-apps/rrv-sh/default.nix
+++ b/modules/nixos/server/web-apps/rrv-sh/default.nix
@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  inputs,
+  ...
+}:
 let
   inherit (lib.pantheon.modules) mkWebApp;
   cfg = config.server.web-apps.rrv-sh;
@@ -14,3 +19,6 @@ mkWebApp {
     };
   };
 }
+// {
+  imports = [ inputs.rrv-sh.nixosModules.default ];
+}
diff --git a/modules/nixos/server/web-apps/sd-webui-forge/default.nix b/modules/nixos/server/web-apps/sd-webui-forge/default.nix
index b14dc44..c7f4b04 100644
--- a/modules/nixos/server/web-apps/sd-webui-forge/default.nix
+++ b/modules/nixos/server/web-apps/sd-webui-forge/default.nix
@@ -1,8 +1,12 @@
-{ config, lib, ... }:
+{
+  config,
+  lib,
+  inputs,
+  ...
+}:
 let
   inherit (lib) singleton;
   inherit (lib.pantheon.modules) mkWebApp;
-  cfg = config.server.web-apps.sd-webui-forge;
   upstreamCfg = config.services.sd-webui-forge;
 in
 mkWebApp {
@@ -25,3 +29,6 @@ mkWebApp {
     };
   };
 }
+// {
+  imports = [ inputs.stable-diffusion-webui-nix.nixosModules.default ];
+}