From 9cfbdd2f5a72be8f6633b16c4c4b4302b8ffa3ef Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sat, 21 Feb 2026 16:33:06 +1000 Subject: [PATCH] use experimental snow.flake schema --- flake.lock | 18 ++++++------------ flake.nix | 1 - groups/cryos/default.nix | 16 ---------------- nixpkgs.nix | 36 ++++++++++++++++++++++++++++-------- snow.nix | 25 ++++++++++--------------- 5 files changed, 44 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index fc073a7..c2f4558 100644 --- a/flake.lock +++ b/flake.lock @@ -3,9 +3,6 @@ "cerulean": { "inputs": { "deploy-rs": "deploy-rs", - "home-manager": [ - "home-manager" - ], "microvm": "microvm", "nixpkgs": [ "nixpkgs" @@ -18,17 +15,14 @@ ] }, "locked": { - "lastModified": 1771399468, - "narHash": "sha256-Nppe/RD8/zJZ9e1vhX/Ma1fKZ+rMbp8ZFPMflTLGbk8=", - "ref": "refs/heads/main", - "rev": "870bbb1f3738736ea248c171685bffdb242e294a", - "revCount": 172, - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "lastModified": 1771650297, + "narHash": "sha256-7A952ZrngNdgSJWPLvKdVyGCXn1WtuBUMG4JoRTSCso=", + "path": "/home/me/cry/mk/cerulean", + "type": "path" }, "original": { - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "path": "/home/me/cry/mk/cerulean", + "type": "path" } }, "deploy-rs": { diff --git a/flake.nix b/flake.nix index 7bcc07a..2b50529 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,6 @@ nt.follows = "nt"; systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; - home-manager.follows = "home-manager"; }; }; diff --git a/groups/cryos/default.nix b/groups/cryos/default.nix index 82699d6..60e3cf3 100644 --- a/groups/cryos/default.nix +++ b/groups/cryos/default.nix @@ -7,22 +7,6 @@ ./programs.nix ]; - nixpkgs.config.allowUnfreePredicate = let - whitelist = with pkgs; - map lib.getName [ - discord - steam - steamcmd - steam-unwrapped - - winbox - - obsidian - gitkraken - ]; - in - pkg: builtins.elem (lib.getName pkg) whitelist; - boot.loader = { efi = { canTouchEfiVariables = true; diff --git a/nixpkgs.nix b/nixpkgs.nix index aa60157..fcd5db4 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -4,15 +4,11 @@ system, ... } @ args: { - nixpkgs.channels = rec { - default = pkgs; - # nixpkgs (stable branch) - pkgs = { - inherit system; - source = inputs.nixpkgs; + nixpkgs.channels = { + default = { overlays = [ inputs.dobutterfliescry-net.overlays.default - (import ./overlays/default.nix args) + (import ./overlays args) ]; config = { # allowUnfree = false; @@ -29,13 +25,37 @@ ]; }; }; + + # nixpkgs (stable branch) + # pkgs = { + # inherit system; + # source = inputs.nixpkgs; + # overlays = [ + # inputs.dobutterfliescry-net.overlays.default + # (import ./overlays args) + # ]; + # config = { + # # allowUnfree = false; + # allowBroken = false; + # allowUnfreePredicate = pkg: + # builtins.elem (lib.getName pkg) [ + # "discord" + # "steam" + # "steamcmd" + # "steam-unwrapped" + + # "obsidian" + # "gitkraken" + # ]; + # }; + # }; # nixpkgs-unstable upkgs = { inherit system; source = inputs.nixpkgs-unstable; overlays = [ inputs.dobutterfliescry-net.overlays.default - (import ./overlays/default.nix args) + (import ./overlays args) ]; config = { allowUnfree = false; diff --git a/snow.nix b/snow.nix index 0f70031..7b2e878 100644 --- a/snow.nix +++ b/snow.nix @@ -1,8 +1,8 @@ -{cerulean, ...} @ inputs: -cerulean.mkNexus ./. (self: { - nexus = { +{inputs, ...} @ args: { + nodes = { base = inputs.nixpkgs; args = {inherit inputs;}; + homeManager = inputs.home-manager; groups = { # wait.. that's too cold... @@ -14,16 +14,11 @@ cerulean.mkNexus ./. (self: { server = {}; }; - nodes = let - inherit - (self.nexus) - groups - ; - in { + nodes = { # my laptop <3 :3 lolcathost = { system = "x86_64-linux"; - groups = [groups.cryos.cryde]; + groups = groups: [groups.cryos.cryde]; # modules = with inputs; [ # grub2-themes.nixosModules.default # nix-flatpak.nixosModules.nix-flatpak @@ -33,7 +28,7 @@ cerulean.mkNexus ./. (self: { # i be on my puter frfr myputer = { system = "x86_64-linux"; - groups = [groups.cryos.cryde]; + groups = groups: [groups.cryos.cryde]; # modules = with inputs; [ # grub2-themes.nixosModules.default # nix-flatpak.nixosModules.nix-flatpak @@ -43,7 +38,7 @@ cerulean.mkNexus ./. (self: { # courtesy of aurora <3 butterfly = { system = "x86_64-linux"; - groups = [groups.server]; + groups = groups: [groups.server]; deploy.ssh = { host = "dobutterfliescry.net"; user = "cry"; @@ -54,7 +49,7 @@ cerulean.mkNexus ./. (self: { # pls dont sue me im broke hyrule = { system = "x86_64-linux"; - groups = [groups.server]; + groups = groups: [groups.server]; deploy.ssh = { host = "hyrule.dobutterfliescry.net"; user = "cry"; @@ -64,7 +59,7 @@ cerulean.mkNexus ./. (self: { # call me a statistician the way she spreads in my sheets matcha = { system = "x86_64-linux"; - groups = [groups.server]; + groups = groups: [groups.server]; deploy = { remoteBuild = true; ssh = { @@ -75,4 +70,4 @@ cerulean.mkNexus ./. (self: { }; }; }; -}) +}