Compare commits

..

No commits in common. "main" and "v0.2.3-alpha" have entirely different histories.

5 changed files with 52 additions and 66 deletions

View file

@ -54,7 +54,6 @@
base = null; base = null;
modules = []; modules = [];
args = Terminal {}; args = Terminal {};
homeManager = null;
groups = Terminal {}; groups = Terminal {};
nodes = Terminal {}; nodes = Terminal {};
@ -193,17 +192,12 @@ in {
... ...
}: let }: let
nixosDecl = let nixosDecl = let
homeManager =
if node.homeManager != null
then node.homeManager
else nexus.homeManager;
userArgs = nexus.args // node.args; userArgs = nexus.args // node.args;
ceruleanArgs = { ceruleanArgs = {
inherit root base; inherit root base;
inherit (node) system; inherit (node) system;
_cerulean = { _cerulean = {
inherit inputs userArgs ceruleanArgs homeManager; inherit inputs userArgs ceruleanArgs;
specialArgs = userArgs // ceruleanArgs; specialArgs = userArgs // ceruleanArgs;
}; };
}; };
@ -225,9 +219,9 @@ in {
self.nixosModules.default self.nixosModules.default
(findImport (root + "/hosts/${nodeName}")) (findImport (root + "/hosts/${nodeName}"))
inputs.home-manager.nixosModules.default
# inputs.microvm.nixosModules.microvm # inputs.microvm.nixosModules.microvm
] ]
++ (homeManager.nixosModules.default or [])
++ (getGroupModules root nodeName node) ++ (getGroupModules root nodeName node)
++ node.modules ++ node.modules
++ nexus.modules; ++ nexus.modules;

View file

@ -38,8 +38,6 @@ in rec {
modules = []; modules = [];
args = Terminal {}; args = Terminal {};
homeManager = null;
base = null; base = null;
deploy = { deploy = {

View file

@ -17,18 +17,14 @@
_cerulean, _cerulean,
... ...
} @ args: { } @ args: {
imports = imports = [
[ # user configuration
# user configuration (import (root + "/nixpkgs.nix"))
(import (root + "/nixpkgs.nix")) # options declarations
# options declarations (import ./nixpkgs.nix (args // {contextName = "hosts";}))
(import ./nixpkgs.nix (args // {contextName = "hosts";}))
] ./home-manager.nix
++ ( ];
if _cerulean.homeManager != null
then [./home-manager.nix]
else []
);
environment.systemPackages = with _cerulean.inputs; [ environment.systemPackages = with _cerulean.inputs; [
deploy-rs.packages.${system}.default deploy-rs.packages.${system}.default

81
flake.lock generated
View file

@ -3,9 +3,7 @@
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
@ -60,27 +58,6 @@
"type": "github" "type": "github"
} }
}, },
"microvm": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1771365290,
"narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=",
"owner": "microvm-nix",
"repo": "microvm.nix",
"rev": "789c90b164b55b4379e7a94af8b9c01489024c18",
"type": "github"
},
"original": {
"owner": "microvm-nix",
"repo": "microvm.nix",
"type": "github"
}
},
"nix-github-actions": { "nix-github-actions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -128,6 +105,38 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1743014863,
"narHash": "sha256-jAIUqsiN2r3hCuHji80U7NNEafpIMBXiwKlSrjWMlpg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bd3bac8bfb542dbde7ffffb6987a1a1f9d41699f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1768305791,
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1768323494, "lastModified": 1768323494,
"narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=", "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=",
@ -143,7 +152,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1767313136, "lastModified": 1767313136,
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
@ -162,7 +171,7 @@
"nt": { "nt": {
"inputs": { "inputs": {
"nix-unit": "nix-unit", "nix-unit": "nix-unit",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
@ -182,28 +191,12 @@
"root": { "root": {
"inputs": { "inputs": {
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"microvm": "microvm", "nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable",
"nt": "nt", "nt": "nt",
"systems": "systems_3" "systems": "systems_3"
} }
}, },
"spectrum": {
"flake": false,
"locked": {
"lastModified": 1759482047,
"narHash": "sha256-H1wiXRQHxxPyMMlP39ce3ROKCwI5/tUn36P8x6dFiiQ=",
"ref": "refs/heads/main",
"rev": "c5d5786d3dc938af0b279c542d1e43bce381b4b9",
"revCount": 996,
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
},
"original": {
"type": "git",
"url": "https://spectrum-os.org/git/spectrum"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View file

@ -23,6 +23,11 @@
nt.url = "github:cry128/nt"; nt.url = "github:cry128/nt";
home-manager = {
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
deploy-rs = { deploy-rs = {
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";