hosts: migrate to nilla

This commit is contained in:
Nikodem Rabuliński 2025-03-23 22:46:55 +01:00
parent c523ebe44b
commit ba23a8d7f5
Signed by: nrabulinski
SSH key fingerprint: SHA256:AZZVyfKStaCo8sbJB+3Rr/CRrlym1oEgw7vMnynJeR8
19 changed files with 78 additions and 205 deletions

View file

@ -1,11 +1,11 @@
{
config,
self,
inputs,
...
}:
let
inputs = builtins.mapAttrs (_: input: input.result) config.inputs;
in
{
imports = [
includes = [
./kazuki
./hijiri-vm
./hijiri
@ -16,20 +16,20 @@
./youko
];
builders =
config.configBuilders =
let
sharedOptions = {
_file = ./default.nix;
settei.sane-defaults.allSshKeys = config.assets.sshKeys.user;
settei.flake-qol.inputs = inputs // {
settei = self;
settei = inputs.self;
};
};
baseNixos = inputs.nixpkgs.lib.nixosSystem {
modules = [
self.nixosModules.combined
inputs.self.nixosModules.combined
sharedOptions
];
specialArgs.configurationName = "base";
@ -37,7 +37,7 @@
baseDarwin = inputs.darwin.lib.darwinSystem {
modules = [
self.darwinModules.combined
inputs.self.darwinModules.combined
sharedOptions
];
specialArgs.configurationName = "base";
@ -49,7 +49,7 @@
baseNixos.extendModules {
modules = [
module
config.__extraHostConfigs.${name} or { }
config.extraHostConfigs.${name} or { }
];
specialArgs.configurationName = name;
};
@ -60,7 +60,7 @@
eval = baseDarwin._module.args.extendModules {
modules = [
module
config.__extraHostConfigs.${name} or { }
config.extraHostConfigs.${name} or { }
];
specialArgs.configurationName = name;
};

View file

@ -1,5 +1,5 @@
{
configurations.nixos.hijiri-vm =
config.configurations.nixos.hijiri-vm =
{
modulesPath,
lib,

View file

@ -1,5 +1,5 @@
{
configurations.darwin.hijiri =
config.configurations.darwin.hijiri =
{
config,
pkgs,

View file

@ -1,6 +1,6 @@
{ lib, ... }:
{
configurations.nixos =
config.configurations.nixos =
let
mkInstaller =
system:

View file

@ -1,5 +1,5 @@
{
configurations.nixos.kazuki =
config.configurations.nixos.kazuki =
{
modulesPath,
...

View file

@ -1,5 +1,5 @@
{
configurations.darwin.kogata =
config.configurations.darwin.kogata =
{ pkgs, ... }:
{
nixpkgs.system = "aarch64-darwin";

View file

@ -1,5 +1,5 @@
{
configurations.nixos.ude =
config.configurations.nixos.ude =
{
config,
modulesPath,

View file

@ -1,5 +1,5 @@
{
configurations.nixos.youko =
config.configurations.nixos.youko =
{
config,
lib,