chore(tree-wide): remove snowfall-lib as dependency

This commit is contained in:
Mohammad Rafiq 2025-07-01 17:02:27 +08:00
parent 5cf347812c
commit 0965dd312a
No known key found for this signature in database
8 changed files with 65 additions and 41 deletions

View file

@ -1,5 +1,11 @@
{ {
outputs =
inputs:
inputs.snowfall-lib.mkFlake {
inherit inputs;
src = ./.;
snowfall.namespace = "pantheon";
};
inputs = { inputs = {
crane.url = "github:ipetkov/crane"; crane.url = "github:ipetkov/crane";
rrv-sh.url = "github:rrvsh/rrv.sh"; rrv-sh.url = "github:rrvsh/rrv.sh";
@ -62,35 +68,4 @@
zjstatus.inputs.rust-overlay.follows = "rust-overlay"; zjstatus.inputs.rust-overlay.follows = "rust-overlay";
zjstatus.url = "github:dj95/zjstatus"; 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;
};
};
} }

View file

@ -1,4 +1,9 @@
{ pkgs, osConfig, ... }: {
osConfig,
inputs,
pkgs,
...
}:
{ {
home.sessionVariables.MULTIPLEXER = "zellij"; home.sessionVariables.MULTIPLEXER = "zellij";
persistDirs = [ "/.cache/zellij" ]; persistDirs = [ "/.cache/zellij" ];
@ -16,7 +21,9 @@
layout { layout {
default_tab_template { default_tab_template {
pane size=1 borderless=true { 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_left "{mode} ${osConfig.hostname}"
format_center "{tabs}" format_center "{tabs}"
format_right "{datetime}" format_right "{datetime}"

View file

@ -11,7 +11,11 @@ in
{ {
imports = imports =
(optional osConfig.desktop.enable (import-tree ./desktop)) (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 = { config = {
stylix.image = ./desktop/wallpaper.png; stylix.image = ./desktop/wallpaper.png;

View file

@ -1,9 +1,18 @@
{ config, lib, ... }: {
config,
lib,
inputs,
...
}:
let let
inherit (lib) mkOption; inherit (lib) mkOption;
inherit (lib.types) listOf str; inherit (lib.types) listOf str;
in in
{ {
imports = [
inputs.impermanence.homeManagerModules.impermanence
];
options = { options = {
persistDirs = mkOption { persistDirs = mkOption {
type = listOf str; type = listOf str;
@ -13,7 +22,7 @@ in
config = { config = {
# Helper options # Helper options
home.persistence."/persist/home/${config.snowfallorg.user.name}" = { home.persistence."/persist/home/${config.home.username}" = {
directories = config.persistDirs; directories = config.persistDirs;
allowOther = true; allowOther = true;
}; };

View file

@ -1,4 +1,5 @@
{ {
inputs,
lib, lib,
config, config,
system, system,
@ -33,6 +34,10 @@ let
}; };
in in
{ {
imports = [
inputs.sops-nix.nixosModules.sops
inputs.stylix.nixosModules.stylix
];
options = { options = {
hostname = mkStrOption; hostname = mkStrOption;
mainUser = { mainUser = {

View file

@ -1,4 +1,9 @@
{ config, lib, ... }: {
config,
lib,
inputs,
...
}:
let let
inherit (lib) mkIf mkEnableOption; inherit (lib) mkIf mkEnableOption;
inherit (lib.pantheon) mkStrOption; inherit (lib.pantheon) mkStrOption;
@ -44,6 +49,10 @@ let
}; };
in in
{ {
imports = [
inputs.disko.nixosModules.disko
inputs.impermanence.nixosModules.impermanence
];
options.machine.drives.btrfs = { options.machine.drives.btrfs = {
enable = mkEnableOption ""; enable = mkEnableOption "";
drive = mkStrOption; drive = mkStrOption;

View file

@ -1,4 +1,9 @@
{ config, lib, ... }: {
config,
lib,
inputs,
...
}:
let let
inherit (lib.pantheon.modules) mkWebApp; inherit (lib.pantheon.modules) mkWebApp;
cfg = config.server.web-apps.rrv-sh; cfg = config.server.web-apps.rrv-sh;
@ -14,3 +19,6 @@ mkWebApp {
}; };
}; };
} }
// {
imports = [ inputs.rrv-sh.nixosModules.default ];
}

View file

@ -1,8 +1,12 @@
{ config, lib, ... }: {
config,
lib,
inputs,
...
}:
let let
inherit (lib) singleton; inherit (lib) singleton;
inherit (lib.pantheon.modules) mkWebApp; inherit (lib.pantheon.modules) mkWebApp;
cfg = config.server.web-apps.sd-webui-forge;
upstreamCfg = config.services.sd-webui-forge; upstreamCfg = config.services.sd-webui-forge;
in in
mkWebApp { mkWebApp {
@ -25,3 +29,6 @@ mkWebApp {
}; };
}; };
} }
// {
imports = [ inputs.stable-diffusion-webui-nix.nixosModules.default ];
}