From afa35e6c4a892e37e191f3900249bd9c1ec2424e Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Thu, 15 Feb 2024 17:09:03 -0500 Subject: [PATCH] formatted jeeves-jr (#98) --- systems/jeeves-jr/configuration.nix | 15 +++++++++------ systems/jeeves-jr/default.nix | 2 +- systems/jeeves-jr/hardware.nix | 16 ++++++++++------ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/systems/jeeves-jr/configuration.nix b/systems/jeeves-jr/configuration.nix index 4c70c26..e145892 100644 --- a/systems/jeeves-jr/configuration.nix +++ b/systems/jeeves-jr/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{pkgs, ...}: { time.timeZone = "America/New_York"; console.keyMap = "us"; networking = { @@ -7,7 +7,7 @@ }; boot = { - zfs.extraPools = [ "Main" ]; + zfs.extraPools = ["Main"]; filesystem = "zfs"; useSystemdBoot = true; }; @@ -21,7 +21,7 @@ daemon."settings" = { experimental = true; data-root = "/var/lib/docker"; - exec-opts = [ "native.cgroupdriver=systemd" ]; + exec-opts = ["native.cgroupdriver=systemd"]; log-opts = { max-size = "10m"; max-file = "5"; @@ -36,7 +36,7 @@ }; environment = { - systemPackages = with pkgs; [ docker-compose ]; + systemPackages = with pkgs; [docker-compose]; etc = { # Creates /etc/lynis/custom.prf "lynis/custom.prf" = { @@ -59,8 +59,11 @@ services = { nfs.server.enable = true; - openssh.ports = [ 352 ]; + + openssh.ports = [352]; + smartd.enable = true; + sysstat.enable = true; usbguard = { @@ -77,7 +80,7 @@ zerotierone = { enable = true; - joinNetworks = [ "e4da7455b2ae64ca" ]; + joinNetworks = ["e4da7455b2ae64ca"]; }; }; diff --git a/systems/jeeves-jr/default.nix b/systems/jeeves-jr/default.nix index 5044dd4..8bcd542 100644 --- a/systems/jeeves-jr/default.nix +++ b/systems/jeeves-jr/default.nix @@ -1 +1 @@ -{ ... }: { users = [ "alice" "dennis" "richie" ]; } +{...}: {users = ["alice" "dennis" "richie"];} diff --git a/systems/jeeves-jr/hardware.nix b/systems/jeeves-jr/hardware.nix index 37d31ba..a9ea4f5 100644 --- a/systems/jeeves-jr/hardware.nix +++ b/systems/jeeves-jr/hardware.nix @@ -1,5 +1,9 @@ -{ config, lib, modulesPath, ... }: { + config, + lib, + modulesPath, + ... +}: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -7,13 +11,13 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; networking.useDHCP = lib.mkDefault true; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - swapDevices = [{ device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed"; }]; + swapDevices = [{device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed";}]; boot = { - kernelModules = [ "kvm-amd" ]; - extraModulePackages = [ ]; + kernelModules = ["kvm-amd"]; + extraModulePackages = []; initrd = { - kernelModules = [ ]; - availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + kernelModules = []; + availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"]; }; };