ant/nix-system
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

51
flake.nix
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 =

15
os/basado/configuration.nix
View file

@ -1,20 +1,5 @@
{ config, pkgs, ... }:
let sshKeys = with (import ../../sshKeys.nix); [
moon
];
in
{
imports = [
./hardware-configuration.nix
../common.nix
../common-graphics.nix
(import ../remote-disk-unlock.nix ["igb"] sshKeys)
../builder.nix
../kdeconnect-ports.nix
(import ../swapfile.nix 64)
../ccache.nix
];
boot.loader = {
grub = {
enable = true;

22
os/hs/configuration.nix
View file

@ -1,28 +1,10 @@
{ config, pkgs, ... }:
let
sshKeys = with (import ../../sshKeys.nix); [
basado
moon
allegro
hs
];
sshKeys = import ../../sshKeys.nix;
domain = "antoinev.freeboxos.fr";
utils = import ../utils.nix;
in {
imports = [
./hardware-configuration.nix
./syncthing.nix
./disks.nix
./backup.nix
../common.nix
../forgejo.nix
(import ../remote-disk-unlock.nix ["r8169"] sshKeys)
../builder.nix
../ccache.nix
(import ../swapfile.nix 64)
];
boot = {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
@ -49,7 +31,7 @@ in {
"wheel"
"jellyfin"
];
openssh.authorizedKeys.keys = sshKeys;
openssh.authorizedKeys.keys = (with sshKeys; [ basado moon allegro hs ]);
};
security.sudo.wheelNeedsPassword = false;

3
os/ks/configuration.nix
View file

@ -6,9 +6,6 @@ let
sshKeys = (import ../../sshKeys.nix);
in {
imports = [
./hardware-configuration.nix
../common.nix
../3proxy.nix
inputs.simple-nixos-mailserver.nixosModule
];

7
os/moon/configuration.nix
View file

@ -1,12 +1,5 @@
{ config, pkgs, ... }:
{
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
../common.nix
../common-graphics.nix
../kdeconnect-ports.nix
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;