migrate to experimental snow.flake schema #4

Open
cry wants to merge 2 commits from cry/flake-foxora:bleeding into main
6 changed files with 60 additions and 70 deletions

70
flake.lock generated
View file

@ -144,28 +144,29 @@
"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": 1772900511,
"narHash": "sha256-JTEO5WzqgrU61EBz2UFQ2jtN8de+RnMC1FnJExJtCpw=",
"owner": "cry128",
"repo": "cerulean",
"rev": "02ded5d4f0d53eaeb68f1b68469926fd21acc6db",
"type": "github"
},
"original": {
"type": "git",
"url": "https://tearforge.net/cry/cerulean"
"owner": "cry128",
"ref": "v0.2.5-alpha",
"repo": "cerulean",
"type": "github"
}
},
"crane": {
@ -455,28 +456,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 +476,7 @@
"type": "github"
}
},
"home-manager_3": {
"home-manager_2": {
"inputs": {
"nixpkgs": [
"zen",
@ -1548,7 +1527,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",
@ -1625,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": {
@ -1856,7 +1856,7 @@
},
"zen": {
"inputs": {
"home-manager": "home-manager_3",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_10"
},
"locked": {

View file

@ -15,7 +15,7 @@
};
cerulean = {
url = "git+https://tearforge.net/cry/cerulean";
url = "github:cry128/cerulean/v0.2.5-alpha";
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 ./.;
}

View file

@ -1,9 +0,0 @@
{
lib,
config,
...
}: {
nixpkgs.channels.default = {
default = lib.mkForce config.nixpkgs.channels.default.upkgs;
};
}

View file

@ -12,7 +12,7 @@ in {
};
config = lib.mkIf enabled {
nixpkgs.channels.default = {
nixpkgs.channels = {
upkgs.overlays = [
(self: super: {
amdgpu-ignore-ctx-privileges = super.fetchpatch {

View file

@ -1,6 +1,6 @@
{inputs, ...} @ args: {
nixpkgs.channels = {
default = {
base = {
overlays = [(import ./overlays.nix args)];
config.allowUnfree = true;
};

View file

@ -1,22 +1,16 @@
{cerulean, ...} @ inputs:
cerulean.mkNexus ./. (self: {
nexus = {
args = {inherit inputs;};
modules = with inputs; [];
{inputs, ...} @ 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 +24,7 @@ cerulean.mkNexus ./. (self: {
arcturus = {
system = "x86_64-linux";
groups = [
groups = groups: [
groups.servers
];
@ -55,9 +49,12 @@ cerulean.mkNexus ./. (self: {
# 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:
@ -103,23 +100,23 @@ cerulean.mkNexus ./. (self: {
deploy.ssh = {
host = "10.16.1.163";
port = 2222;
user = "foxora";
publicKeys = [];
};
};
lyra = {
system = "x86_64-linux";
groups = [
groups = groups: [
groups.servers
];
deploy.ssh = {
host = "10.16.1.58";
port = 2222;
user = "foxora";
publicKeys = [];
};
};
};
};
})
}