Fachschaft/nixConfig
6
2
Fork 2
Code Issues 10 Pull requests 2 Projects Wiki Activity

Compare commits

base: Fachschaft:511243fcbf47cf6d8b790751a9b80b3f521436a8
Branches Tags
Fachschaft:main
..
compare: Fachschaft:45d0ef262f23da15ed3caeb090641a3bad52018d
Branches Tags
Fachschaft:main

1 commit
511243fcbf ... 45d0ef262f

Author SHA1 Message Date
Gonne
45d0ef262f Differentiate hardware and vms in roles 2023-12-21 12:11:20 +01:00
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/machines/ghatanothoa/configuration.nix
View file

@ -3,6 +3,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/jitsi.nix ../../modules/jitsi.nix
../../roles ../../roles
../../roles/vm.nix
./network.nix ./network.nix
]; ];

20
nixos/roles/default.nix
View file

@ -1,21 +1,15 @@
{ {
pkgs, pkgs,
lib, lib,
vm ? true,
... ...
}: { }: {
imports = imports = [
[ ./admins.nix
./admins.nix ./nix_keys.nix
./nix_keys.nix ./prometheusNodeExporter.nix
./prometheusNodeExporter.nix ../modules/impermanence.nix
../modules/impermanence.nix ];
]
++ (
if vm
then [./vm.nix]
else [./hardware.nix]
);
nix = { nix = {
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes