ooks/ooknet
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(flake): no import =

Browse source
This commit is contained in:
ooks-io 2024-05-26 15:56:21 +12:00
parent 016c6ec3a6
commit e888ebe69c
2 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
flake.nix
View file

@ -3,7 +3,7 @@
description = "a nix configuration written by an orangutan";
outputs = { flake-parts, nixpkgs, self, ... } @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: {
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [
"x86_64-linux"
@ -12,13 +12,14 @@
imports = [
./flake/pkgs
./flake/nixos.nix
];
flake = {
nixosConfigurations = import ./flake/nixos.nix {inherit self inputs nixpkgs;};
};
# flake = {
# nixosConfigurations = import ./flake/nixos.nix {inherit self inputs nixpkgs;};
# };
});
};
# External inputs we depend on
inputs = {

70
flake/nixos.nix
View file

@ -1,7 +1,7 @@
{ inputs, nixpkgs, self, ... }:
{ inputs, self, ... }:
let
inherit (nixpkgs.lib) nixosSystem;
inherit (inputs.nixpkgs.lib) nixosSystem;
hm = inputs.home-manager.nixosModules.home-manager;
@ -20,39 +20,41 @@ let
in
{
ooksdesk = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
"${hosts}/ooksdesk"
hm
base
gaming
workstation
];
};
ookst480s = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
"${hosts}/ookst480s"
hm
base
flake.nixosConfigurations = {
ooksdesk = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
"${hosts}/ooksdesk"
hm
base
gaming
workstation
];
};
ookst480s = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
"${hosts}/ookst480s"
hm
base
workstation
];
};
ooksmedia = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
"${hosts}/ooksmedia"
hm
base
workstation
];
};
ooksmedia = nixosSystem {
inherit specialArgs;
system = "x86_64-linux";
modules = [
"${hosts}/ooksmedia"
hm
base
gaming
workstation
media-server
];
gaming
workstation
media-server
];
};
};
}