palo/nixos-config
palo/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reformat

Browse source
This commit is contained in:
Ingolf Wagner 2019-12-24 12:50:10 +13:00
parent ac196a752c
commit a8c7fc1718
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
3 changed files with 25 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
configs/porani/hardware-configuration.nix
View file

@ -2,38 +2,35 @@
imports = [ imports = [
<nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
{ {
boot.initrd.availableKernelModules =
[ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# grub configuration boot.initrd.availableKernelModules =
# ------------------ [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.loader.grub = { boot.initrd.kernelModules = [ "dm-snapshot" ];
device = "/dev/sda"; boot.kernelModules = [ "kvm-intel" ];
enable = true; boot.extraModulePackages = [ ];
version = 2;
};
# lvm volume group # grub configuration
# ---------------- # ------------------
boot.initrd.luks.devices = [{ boot.loader.grub = {
name = "vg"; device = "/dev/sda";
device = "/dev/sda2"; enable = true;
preLVM = true; version = 2;
}]; };
# lvm volume group
# ----------------
boot.initrd.luks.devices = [{
name = "vg";
device = "/dev/sda2";
preLVM = true;
}];
} }
# automount # automount
# --------- # ---------
(let (let mediaUUID = "3d106f56-89e5-400d-9d6b-1dd957919548";
mediaUUID = "3d106f56-89e5-400d-9d6b-1dd957919548"; in {
in
{
fileSystems."/media" = { fileSystems."/media" = {
#device = "/dev/disk/by-uuid/162c2f9e-8baa-4433-99fd-bb7e7b69472f";
device = "/dev/disk/by-uuid/${mediaUUID}"; device = "/dev/disk/by-uuid/${mediaUUID}";
fsType = "ext4"; fsType = "ext4";
options = [ options = [
@ -47,14 +44,12 @@
options = "nofail,noauto"; options = "nofail,noauto";
type = "ext4"; type = "ext4";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
#what = "/dev/disk/by-uuid/162c2f9e-8baa-4433-99fd-bb7e7b69472f";
what = "/dev/disk/by-uuid/${mediaUUID}"; what = "/dev/disk/by-uuid/${mediaUUID}";
where = "/media"; where = "/media";
}]; }];
}) })
]; ];
# NTFS support # NTFS support
# ------------ # ------------
environment.systemPackages = [ pkgs.ntfs3g ]; environment.systemPackages = [ pkgs.ntfs3g ];

1
configs/workhorse/jenkins.nix
View file

@ -227,7 +227,6 @@ in {
"ssh://gogs@git.ingolf-wagner.de:443/palo/LineagoOS-build.git" "ssh://gogs@git.ingolf-wagner.de:443/palo/LineagoOS-build.git"
"git@github.com:mrVanDalo/LineagoOS-build.git") "git@github.com:mrVanDalo/LineagoOS-build.git")
]; ];
}; };
}; };

2
configs/workhorse/prometheus.nix
View file

@ -13,7 +13,7 @@
services.prometheus = { services.prometheus = {
enable = true; enable = true;
# keep data for 30 days # keep data for 30 days
extraFlags = "--storage.tsdb.retention.time=30d" extraFlags = "--storage.tsdb.retention.time=30d";
scrapeConfigs = [ scrapeConfigs = [
{ {
job_name = "nginx"; job_name = "nginx";