From 656a359f6099b3a86df9a87a1f7ee88aa22107f1 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sat, 7 Mar 2026 13:45:31 +1000 Subject: [PATCH 1/3] use cerulean snowflakes standard --- flake.lock | 74 ++++++++++++++++++++++++++---------------------------- flake.nix | 5 ++-- snow.nix | 18 +++++-------- 3 files changed, 45 insertions(+), 52 deletions(-) diff --git a/flake.lock b/flake.lock index 3b5e897..4f1e1c5 100644 --- a/flake.lock +++ b/flake.lock @@ -146,29 +146,28 @@ "cerulean": { "inputs": { "deploy-rs": "deploy-rs", - "home-manager": "home-manager", "microvm": "microvm", "nixpkgs": [ "nixpkgs" ], "nt": "nt", + "sops-nix": "sops-nix", "systems": [ "systems" ] }, "locked": { - "lastModified": 1771409623, - "narHash": "sha256-1IhHueuQTVCVrui700IP9DfLXwb3kU2rnEWPSdxQY0k=", - "ref": "refs/heads/main", - "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", - "revCount": 176, - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "lastModified": 1772852754, + "narHash": "sha256-rYmaW2+zmFXM7Mp+B/fsBkzbAoeApj04F1fSmiS3mXU=", + "owner": "cry128", + "repo": "cerulean", + "rev": "ef5bc338566670380ceec75eb692697c9e81fb7e", + "type": "github" }, "original": { - "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "owner": "cry128", + "repo": "cerulean", + "type": "github" } }, "crane": { @@ -484,7 +483,6 @@ "home-manager": { "inputs": { "nixpkgs": [ - "cerulean", "nixpkgs" ] }, @@ -525,27 +523,6 @@ } }, "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772633058, - "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { "inputs": { "nixpkgs": [ "zen", @@ -1056,11 +1033,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1772742184, - "narHash": "sha256-zGnRxJQZ8wZTwvSxF4SAGoefbta15/W032tK22uIF2E=", + "lastModified": 1771365290, + "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "a257ca90febb686c75826918f9f8876d74f875eb", + "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "type": "github" }, "original": { @@ -1488,7 +1465,7 @@ "cachyos": "cachyos", "cerulean": "cerulean", "fenix": "fenix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", "hyprland-git": "hyprland-git", "hyprland-plugins": "hyprland-plugins", @@ -1604,6 +1581,27 @@ "type": "github" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "cerulean", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "spectrum": { "flake": false, "locked": { @@ -1835,7 +1833,7 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs-unstable" ] diff --git a/flake.nix b/flake.nix index 757fed7..4f838b5 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; cerulean = { - url = "git+https://tearforge.net/cry/cerulean?rev=d5211287bd3cb96078f2053488d67d557848a8f2"; + url = "github:cry128/cerulean"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -101,5 +101,6 @@ extra-experimental-features = "pipe-operators"; }; - outputs = inputs: import ./snow.nix inputs; + outputs = {cerulean, ...} @ inputs: + cerulean.snow.flake inputs ./.; } diff --git a/snow.nix b/snow.nix index 8a63ff9..f54f5dc 100644 --- a/snow.nix +++ b/snow.nix @@ -1,6 +1,5 @@ -{cerulean, ...} @ inputs: -cerulean.mkNexus ./. (self: { - nexus = { +{inputs, ...}: { + nodes = { args = {inherit inputs;}; modules = with inputs; []; @@ -12,12 +11,7 @@ cerulean.mkNexus ./. (self: { servers = {}; }; - nodes = let - inherit - (self.nexus) - groups - ; - in { + nodes = { nixarawrui = { system = "x86_64-linux"; @@ -33,7 +27,7 @@ cerulean.mkNexus ./. (self: { arcturus = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -120,7 +114,7 @@ cerulean.mkNexus ./. (self: { lyra = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -132,4 +126,4 @@ cerulean.mkNexus ./. (self: { }; }; }; -}) +} -- 2.51.2 From 8bef5b623328405bb038a2e076a3105a7c750960 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Tue, 17 Mar 2026 20:59:21 +1000 Subject: [PATCH 2/3] upgrade to cerulean/v0.2.6-alpha --- flake.lock | 64 ++++++++++++++++++++---------------------------------- flake.nix | 7 ++++-- 2 files changed, 28 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 4f1e1c5..5360f45 100644 --- a/flake.lock +++ b/flake.lock @@ -157,15 +157,16 @@ ] }, "locked": { - "lastModified": 1772852754, - "narHash": "sha256-rYmaW2+zmFXM7Mp+B/fsBkzbAoeApj04F1fSmiS3mXU=", + "lastModified": 1773744164, + "narHash": "sha256-dGupwWUL9YPvC0/m4maCRD9psomWhFr/JAsGnC9toQM=", "owner": "cry128", "repo": "cerulean", - "rev": "ef5bc338566670380ceec75eb692697c9e81fb7e", + "rev": "e7fdbf416ccb3e7e6bf30042e4aacd065983ddad", "type": "github" }, "original": { "owner": "cry128", + "ref": "v0.2.6-alpha", "repo": "cerulean", "type": "github" } @@ -212,11 +213,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1770019181, + "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "type": "github" }, "original": { @@ -522,27 +523,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -1033,11 +1013,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1771365290, - "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", + "lastModified": 1773018425, + "narHash": "sha256-fpgZBmZpKoEXEowBK/6m8g9FcOLWQ4UxhXHqCw2CpSM=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", + "rev": "25ebda3c558e923720c965832dc9a04f559a055c", "type": "github" }, "original": { @@ -1406,11 +1386,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770975056, - "narHash": "sha256-ZXTz/P3zUbbM6lNXzt91u8EwfNqhXpYMu8+wvFZqQHE=", + "lastModified": 1773738366, + "narHash": "sha256-oH22HyNHEdCoCQo734sQCHUr6C0jmGQJMZ13dsgEHkk=", "owner": "cry128", "repo": "nt", - "rev": "f42dcdd49a7921a7f433512e83d5f93696632412", + "rev": "f32c3a726a3d608d30aaaa1df2301c1eaf5ef8f4", "type": "github" }, "original": { @@ -1589,11 +1569,11 @@ ] }, "locked": { - "lastModified": 1772495394, - "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "lastModified": 1773096132, + "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", "type": "github" }, "original": { @@ -1605,11 +1585,11 @@ "spectrum": { "flake": false, "locked": { - "lastModified": 1759482047, - "narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=", + "lastModified": 1772189877, + "narHash": "sha256-i1p90Rgssb//aNiTDFq46ZG/fk3LmyRLChtp/9lddyA=", "ref": "refs/heads/main", - "rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9", - "revCount": 996, + "rev": "fe39e122d898f66e89ffa17d4f4209989ccb5358", + "revCount": 1255, "type": "git", "url": "https://spectrum-os.org/git/spectrum" }, @@ -1833,7 +1813,9 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs-unstable" ] diff --git a/flake.nix b/flake.nix index 4f838b5..d50ddc3 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; cerulean = { - url = "github:cry128/cerulean"; + url = "github:cry128/cerulean/v0.2.6-alpha"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -59,7 +59,10 @@ zen = { url = "github:0xc000022070/zen-browser-flake"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs = { + nixpkgs.follows = "nixpkgs-unstable"; + home-manager.follows = "home-manager"; + }; }; iamb = { -- 2.51.2 From b2f0a2f199c1786271ce536e896660ecccb589f9 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Tue, 17 Mar 2026 20:59:33 +1000 Subject: [PATCH 3/3] rename nixpkgs.channels.default -> nixpkgs.channels.base --- nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixpkgs.nix b/nixpkgs.nix index 1470160..5bedfeb 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,6 +1,6 @@ {inputs, ...} @ args: { nixpkgs.channels = { - default = { + base = { overlays = [(import ./overlays.nix args)]; config.allowUnfree = true; }; -- 2.51.2