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

70
flake/nixos.nix
View file

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