From 6b509b7b41e6d6b75dc152c7cf627dfc3addfcf2 Mon Sep 17 00:00:00 2001 From: _cry64 Date: Sat, 21 Feb 2026 16:21:20 +1000 Subject: [PATCH] migrate to experimental snow.flake schema --- flake.lock | 40 +++++++++------------------------------- flake.nix | 8 +++++--- snow.nix | 46 ++++++++++++++++++++++++++++++---------------- 3 files changed, 44 insertions(+), 50 deletions(-) diff --git a/flake.lock b/flake.lock index ddf7975..b761f4a 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 0be6e6b..a1ff88d 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 ]; @@ -53,6 +51,7 @@ cerulean.mkNexus ./. (self: { microvm = { hypervisor = "qemu"; +<<<<<<< Updated upstream # needed to get interface working qemu.extraArgs = [ "-monitor" "unix:/var/lib/microvms/home-assistant/monitor.sock,server,nowait" @@ -60,6 +59,21 @@ cerulean.mkNexus ./. (self: { "-serial" "chardev:serial1" ]; +======= +<<<<<<< Updated upstream +======= + # 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" + ]; + +>>>>>>> Stashed changes +>>>>>>> Stashed changes # memory cannot be 2GB so i doubled it and used 4GB: # https://github.com/microvm-nix/microvm.nix/issues/171 # TODO: can be fixed by turning off acpi in qemu @@ -110,7 +124,7 @@ cerulean.mkNexus ./. (self: { lyra = { system = "x86_64-linux"; - groups = [ + groups = groups: [ groups.servers ]; @@ -122,4 +136,4 @@ cerulean.mkNexus ./. (self: { }; }; }; -}) +}