server7: hydra-dev, zfs support, fixed dhcp id

This commit is contained in:
Ehmry - 2020-03-26 06:00:45 +01:00
parent 840a3eedd7
commit ba13bda063
2 changed files with 26 additions and 17 deletions

View File

@ -6,7 +6,7 @@ in {
<nixpkgs/nixos/modules/profiles/minimal.nix>
../../lib
../../lib/default-gateway.nix
../../lib/yggdrasil.nix
./borgbackup.nix
./containers
./hardware-configuration.nix
./hydra.nix
@ -84,12 +84,13 @@ in {
networking = {
firewall.enable = false;
hostName = "server7";
hostId = "454fe12c";
useDHCP = false;
bridges.br0.interfaces = [ "enp2s0f0" ];
interfaces = {
br0 = {
useDHCP = true;
preferTempAddress = false;
tempAddress = "disabled";
ipv4.addresses = [{
address = "172.22.99.245";
prefixLength = 24;
@ -107,7 +108,14 @@ in {
boot.kernel.sysctl."net.bridge.bridge-nf-call-iptables" = 0;
boot.kernel.sysctl."net.bridge.bridge-nf-call-ip6tables" = 0;
environment.systemPackages = with pkgs; [ tmux htop vim gitMinimal nixfmt ];
environment.systemPackages = with pkgs; [
tmux
htop
vim
gitMinimal
nixfmt
zfsStable
];
services.collectd.extraConfig = ''
LoadPlugin sensors

View File

@ -4,27 +4,28 @@
{ config, lib, pkgs, ... }:
{
imports =
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];
imports = [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> ];
boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "ehci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.supportedFilesystems = [ "zfs" ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/f14628ce-0f13-4544-9197-0ddda291f48f";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/f14628ce-0f13-4544-9197-0ddda291f48f";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/9812-00B2";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/9812-00B2";
fsType = "vfat";
};
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 20;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
nix.maxJobs = lib.mkDefault 10;
nix.buildCores = lib.mkDefault 40;
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
}