Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma wbob.r: split config and hardware

Browse Source
This commit is contained in:
makefu 2021-03-12 20:11:43 +01:00
parent 1ceb7c79fe
commit b30e99dfb2
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 30 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
makefu/1systems/wbob/config.nix
View File

@ -1,14 +1,15 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
rootdisk = "/dev/disk/by-id/ata-TS256GMTS800_C613840115";
datadisk = "/dev/disk/by-id/ata-HGST_HTS721010A9E630_JR10006PH3A02F";
user = config.makefu.gui.user; user = config.makefu.gui.user;
primaryIP = "192.168.8.11"; primaryIP = "192.168.8.11";
in { in {
imports = imports =
[ # Include the results of the hardware scan. [
<stockholm/makefu> <stockholm/makefu>
# Include the results of the hardware scan.
./nuc
<stockholm/makefu/2configs/home-manager> <stockholm/makefu/2configs/home-manager>
<stockholm/makefu/2configs/support-nixos.nix> <stockholm/makefu/2configs/support-nixos.nix>
<stockholm/makefu/2configs/zsh-user.nix> <stockholm/makefu/2configs/zsh-user.nix>
@ -37,13 +38,13 @@ in {
# Sensors # Sensors
# <stockholm/makefu/2configs/stats/client.nix> # <stockholm/makefu/2configs/stats/client.nix>
<stockholm/makefu/2configs/stats/collectd-client.nix> # <stockholm/makefu/2configs/stats/collectd-client.nix>
<stockholm/makefu/2configs/stats/telegraf> <stockholm/makefu/2configs/stats/telegraf>
<stockholm/makefu/2configs/stats/telegraf/airsensor.nix> <stockholm/makefu/2configs/stats/telegraf/airsensor.nix>
<stockholm/makefu/2configs/stats/telegraf/europastats.nix> <stockholm/makefu/2configs/stats/telegraf/europastats.nix>
<stockholm/makefu/2configs/stats/external/aralast.nix> <stockholm/makefu/2configs/stats/external/aralast.nix>
<stockholm/makefu/2configs/stats/arafetch.nix> <stockholm/makefu/2configs/stats/arafetch.nix>
<stockholm/makefu/2configs/hw/mceusb.nix> # <stockholm/makefu/2configs/hw/mceusb.nix>
# <stockholm/makefu/2configs/stats/telegraf/bamstats.nix> # <stockholm/makefu/2configs/stats/telegraf/bamstats.nix>
{ environment.systemPackages = [ pkgs.vlc ]; } { environment.systemPackages = [ pkgs.vlc ]; }
@ -94,44 +95,6 @@ in {
build.host = config.krebs.hosts.wbob; build.host = config.krebs.hosts.wbob;
}; };
swapDevices = [ { device = "/var/swap"; } ];
services.collectd.extraConfig = lib.mkAfter ''
#LoadPlugin ping
# does not work because it requires privileges
#<Plugin "ping">
# Host "google.de"
# Host "heise.de"
#</Plugin>
LoadPlugin curl
<Plugin curl>
Interval 300
TotalTime true
NamelookupTime true
ConnectTime true
<Page "google">
MeasureResponseTime true
MeasureResponseCode true
URL "https://google.de"
</Page>
<Page "webde">
MeasureResponseTime true
MeasureResponseCode true
URL "http://web.de"
</Page>
</Plugin>
#LoadPlugin netlink
#<Plugin "netlink">
# Interface "enp0s25"
# Interface "wlp2s0"
# IgnoreSelected false
#</Plugin>
'';
networking.firewall.allowedUDPPorts = [ 655 ]; networking.firewall.allowedUDPPorts = [ 655 ];
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
655 655
@ -146,7 +109,7 @@ in {
# Port = 1655 # Port = 1655
# ''; # '';
#}; #};
boot.kernelPackages = pkgs.linuxPackages_latest;
# rt2870.bin wifi card, part of linux-unfree # rt2870.bin wifi card, part of linux-unfree
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -156,24 +119,5 @@ in {
address = "10.8.8.11"; address = "10.8.8.11";
prefixLength = 24; prefixLength = 24;
}]; }];
# nuc hardware # nuc hardware
boot.loader.grub.device = rootdisk;
hardware.cpu.intel.updateMicrocode = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [
"kvm-intel" "snd-seq" "snd-rawmidi"
];
fileSystems = {
"/" = {
device = rootdisk + "-part1";
fsType = "ext4";
};
"/data" = {
device = datadisk + "-part1";
fsType = "ext4";
};
};
} }

23
makefu/1systems/wbob/nuc/default.nix Normal file
View File

@ -0,0 +1,23 @@
let
rootdisk = "/dev/disk/by-id/ata-TS256GMTS800_C613840115";
datadisk = "/dev/disk/by-id/ata-HGST_HTS721010A9E630_JR10006PH3A02F";
in {
boot.loader.grub.device = rootdisk;
hardware.cpu.intel.updateMicrocode = true;
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [
"kvm-intel" "snd-seq" "snd-rawmidi"
];
fileSystems = {
"/" = {
device = rootdisk + "-part1";
fsType = "ext4";
};
"/data" = {
device = datadisk + "-part1";
fsType = "ext4";
};
};
swapDevices = [ { device = "/var/swap"; } ];
}