From ba8d341512bff9b7c14eb4f5c94b7fad0ce2e9d4 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sat, 21 Feb 2026 16:21:20 +1000 Subject: [PATCH 1/2] migrate to experimental snow.flake schema --- flake.lock | 40 +++++++++------------------------------- flake.nix | 8 +++++--- snow.nix | 30 ++++++++++++++---------------- 3 files changed, 28 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index d2b22c3..e7365fd 100644 --- a/flake.lock +++ b/flake.lock @@ -144,7 +144,6 @@ "cerulean": { "inputs": { "deploy-rs": "deploy-rs", - "home-manager": "home-manager", "microvm": "microvm", "nixpkgs": [ "nixpkgs" @@ -155,15 +154,16 @@ ] }, "locked": { - "lastModified": 1771409623, - "narHash": "sha256-1IhHueuQTVCVrui700IP9DfLXwb3kU2rnEWPSdxQY0k=", - "ref": "refs/heads/main", - "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", - "revCount": 176, + "lastModified": 1771654432, + "narHash": "sha256-F2QSihcnsiz5o2AQADQVRG8ijZqoPDmvIQjbReLu680=", + "ref": "bleeding", + "rev": "fb117bb9ff3f521b53f825201ec618624627cfb2", + "revCount": 183, "type": "git", "url": "https://tearforge.net/cry/cerulean" }, "original": { + "ref": "bleeding", "type": "git", "url": "https://tearforge.net/cry/cerulean" } @@ -455,28 +455,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "cerulean", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs-unstable" @@ -497,7 +475,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_2": { "inputs": { "nixpkgs": [ "zen", @@ -1548,7 +1526,7 @@ "awww": "awww", "cachyos": "cachyos", "cerulean": "cerulean", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "hyprland-git": "hyprland-git", "hyprland-plugins": "hyprland-plugins", "iamb": "iamb", @@ -1856,7 +1834,7 @@ }, "zen": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_10" }, "locked": { diff --git a/flake.nix b/flake.nix index 2cbefbf..2571502 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; cerulean = { - url = "git+https://tearforge.net/cry/cerulean"; + url = "git+https://tearforge.net/cry/cerulean?ref=bleeding"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -70,6 +70,8 @@ extra-experimental-features = "pipe-operators"; }; - outputs = inputs: - import ./snow.nix inputs; + outputs = inputs: let + inherit (inputs.cerulean) snow; + in + snow.flake inputs ./.; } diff --git a/snow.nix b/snow.nix index c927050..f71314c 100644 --- a/snow.nix +++ b/snow.nix @@ -1,22 +1,20 @@ -{cerulean, ...} @ inputs: -cerulean.mkNexus ./. (self: { - nexus = { - args = {inherit inputs;}; - - modules = with inputs; []; - +{ + inputs, + cerulean, + ... +} @ args: { + nodes = { base = inputs.nixpkgs; + homeManager = inputs.home-manager; + + args = {inherit inputs;}; + modules = with inputs; []; groups = { servers = {}; }; - nodes = let - inherit - (self.nexus) - groups - ; - in { + nodes = { nixarawrui = { system = "x86_64-linux"; @@ -30,7 +28,7 @@ cerulean.mkNexus ./. (self: { arcturus = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -110,7 +108,7 @@ cerulean.mkNexus ./. (self: { lyra = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -122,4 +120,4 @@ cerulean.mkNexus ./. (self: { }; }; }; -}) +} -- 2.51.2 From d512a5407497230056881bd0ba6d41984ea60738 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sun, 8 Mar 2026 03:11:23 +1000 Subject: [PATCH 2/2] cerulean v0.2.5-alpha --- flake.lock | 42 ++++++++++++++----- flake.nix | 2 +- groups/unstable-base/default.nix | 9 ---- .../modules/amdgpu-ignore-ctx-privileges.nix | 2 +- nixpkgs.nix | 2 +- snow.nix | 19 ++++----- 6 files changed, 44 insertions(+), 32 deletions(-) delete mode 100644 groups/unstable-base/default.nix diff --git a/flake.lock b/flake.lock index e7365fd..11f517b 100644 --- a/flake.lock +++ b/flake.lock @@ -149,23 +149,24 @@ "nixpkgs" ], "nt": "nt", + "sops-nix": "sops-nix", "systems": [ "systems" ] }, "locked": { - "lastModified": 1771654432, - "narHash": "sha256-F2QSihcnsiz5o2AQADQVRG8ijZqoPDmvIQjbReLu680=", - "ref": "bleeding", - "rev": "fb117bb9ff3f521b53f825201ec618624627cfb2", - "revCount": 183, - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "lastModified": 1772900511, + "narHash": "sha256-JTEO5WzqgrU61EBz2UFQ2jtN8de+RnMC1FnJExJtCpw=", + "owner": "cry128", + "repo": "cerulean", + "rev": "02ded5d4f0d53eaeb68f1b68469926fd21acc6db", + "type": "github" }, "original": { - "ref": "bleeding", - "type": "git", - "url": "https://tearforge.net/cry/cerulean" + "owner": "cry128", + "ref": "v0.2.5-alpha", + "repo": "cerulean", + "type": "github" } }, "crane": { @@ -1603,6 +1604,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": { diff --git a/flake.nix b/flake.nix index 2571502..be16461 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; cerulean = { - url = "git+https://tearforge.net/cry/cerulean?ref=bleeding"; + url = "github:cry128/cerulean/v0.2.5-alpha"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; diff --git a/groups/unstable-base/default.nix b/groups/unstable-base/default.nix deleted file mode 100644 index 9ee1305..0000000 --- a/groups/unstable-base/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - lib, - config, - ... -}: { - nixpkgs.channels.default = { - default = lib.mkForce config.nixpkgs.channels.default.upkgs; - }; -} diff --git a/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix b/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix index 3174fb2..8adf2f0 100644 --- a/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix +++ b/hosts/nixarawrui/modules/amdgpu-ignore-ctx-privileges.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf enabled { - nixpkgs.channels.default = { + nixpkgs.channels = { upkgs.overlays = [ (self: super: { amdgpu-ignore-ctx-privileges = super.fetchpatch { 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; }; diff --git a/snow.nix b/snow.nix index f71314c..50da6a7 100644 --- a/snow.nix +++ b/snow.nix @@ -1,8 +1,4 @@ -{ - inputs, - cerulean, - ... -} @ args: { +{inputs, ...} @ args: { nodes = { base = inputs.nixpkgs; homeManager = inputs.home-manager; @@ -53,9 +49,12 @@ # needed to get interface working qemu.extraArgs = [ - "-monitor" "unix:/var/lib/microvms/home-assistant/monitor.sock,server,nowait" - "-chardev" "socket,id=serial1,path=/var/lib/microvms/home-assistant/serial.sock,server=on,wait=off" - "-serial" "chardev:serial1" + "-monitor" + "unix:/var/lib/microvms/home-assistant/monitor.sock,server,nowait" + "-chardev" + "socket,id=serial1,path=/var/lib/microvms/home-assistant/serial.sock,server=on,wait=off" + "-serial" + "chardev:serial1" ]; # memory cannot be 2GB so i doubled it and used 4GB: @@ -101,7 +100,7 @@ deploy.ssh = { host = "10.16.1.163"; port = 2222; - user = "foxora"; + publicKeys = []; }; }; @@ -115,7 +114,7 @@ deploy.ssh = { host = "10.16.1.58"; port = 2222; - user = "foxora"; + publicKeys = []; }; }; }; -- 2.51.2