reorganise code: os modules in flake.nix
Some checks failed
/ build-all (push) Failing after 57s

This commit is contained in:
ant 2026-03-10 21:36:23 +01:00
parent 38751363d4
commit 632061ac61
5 changed files with 45 additions and 53 deletions

View file

@ -23,14 +23,13 @@
pkgs = inputs.nixpkgs.legacyPackages.${system};
pkgs-unstable = inputs.unstable.legacyPackages.${system};
nixgl = inputs.nixgl.packages.${system};
osConfig = name: nixpkgs.lib.nixosSystem {
sshKeys = (import ./sshKeys.nix);
osConfig = modules: nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs;
};
modules = [
./os/${name}/configuration.nix
];
inherit modules;
};
homeConfig = modules: inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;
@ -92,10 +91,46 @@
./home/moon.nix
];
nixosConfigurations.basado = osConfig "basado";
nixosConfigurations.moon = osConfig "moon";
nixosConfigurations.hs = osConfig "hs";
nixosConfigurations.ks = osConfig "ks";
nixosConfigurations.basado = osConfig [
./os/basado/configuration.nix
./os/basado/hardware-configuration.nix
./os/common.nix
./os/common-graphics.nix
(import ./os/remote-disk-unlock.nix ["igb"] (with sshKeys; [moon]))
./os/builder.nix
./os/kdeconnect-ports.nix
(import ./os/swapfile.nix 64)
./os/ccache.nix
];
nixosConfigurations.moon = osConfig [
./os/moon/configuration.nix
./os/moon/hardware-configuration.nix
./os/common.nix
./os/common-graphics.nix
./os/kdeconnect-ports.nix
];
nixosConfigurations.hs = osConfig [
./os/hs/configuration.nix
./os/hs/hardware-configuration.nix
./os/hs/syncthing.nix
./os/hs/disks.nix
./os/hs/backup.nix
./os/common.nix
./os/forgejo.nix
(import ./os/remote-disk-unlock.nix ["r8169"] (with sshKeys; [moon basado]))
./os/builder.nix
./os/ccache.nix
(import ./os/swapfile.nix 64)
];
nixosConfigurations.ks = osConfig [
./os/ks/configuration.nix
./os/ks/hardware-configuration.nix
./os/common.nix
./os/3proxy.nix
];
build-all = pkgs.runCommand "build-all" {
buildInputs =