From 4bf1b55911db1a5b5898a14c3de776cbf39900a6 Mon Sep 17 00:00:00 2001 From: Reid Date: Sun, 1 Jun 2025 17:37:53 -0700 Subject: [PATCH] new uptime-kuma service, new drive --- default.nix | 2 +- hosts/nixos-server-reid/hardware.nix | 18 +++++++---- hosts/nixos-server-reid/webapps/default.nix | 5 ++++ modules/services/uptime.nix | 33 +++++++++++++++++++++ 4 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 modules/services/uptime.nix diff --git a/default.nix b/default.nix index b0dcf7f..244da23 100755 --- a/default.nix +++ b/default.nix @@ -46,7 +46,7 @@ in { }; }; - system.stateVersion = mkDefault "23.11"; + system.stateVersion = mkDefault "25.11"; system.configurationRevision = with inputs; mkIf (self ? rev) self.rev; boot = { diff --git a/hosts/nixos-server-reid/hardware.nix b/hosts/nixos-server-reid/hardware.nix index 9d69a64..bfaaec9 100755 --- a/hosts/nixos-server-reid/hardware.nix +++ b/hosts/nixos-server-reid/hardware.nix @@ -4,9 +4,6 @@ imports = [ inputs.hardware.nixosModules.common-pc-ssd inputs.hardware.nixosModules.common-pc - # uses mkDefault to set to a patched kernel, - # but it conflicts with one of our mkDefault settings - #inputs.hardware.nixosModules.raspberry-pi-4 (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -14,7 +11,10 @@ # use better power management for a device that's always on powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + # i have a couple others i don't noramlly include, such as: + # uas (uasp, scsi over usb), usbcore (needed(???) for the drive at boot) + # pcie_brcmstb (required for pcie), reset-raspberrypi (needed for vl805 firmware to load) + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "pcie_brcmstb" "reset-raspberrypi" "uas" "usbcore" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; @@ -23,8 +23,16 @@ boot.loader.grub.enable = false; boot.loader.generic-extlinux-compatible.enable = true; + # needed for initial framebuffer logs to appear on raspberry pi + # i think. this fixes it but idk if they are all required + boot.kernelParams = [ + "8250.nr_uarts=1" + "cma=128M" + "console=tty0" + ]; + fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; + { device = "/dev/disk/by-uuid/04542424-6899-4b94-9414-fffa569f2c03"; fsType = "ext4"; options = [ "noatime" "nodiratime" "discard" ]; }; diff --git a/hosts/nixos-server-reid/webapps/default.nix b/hosts/nixos-server-reid/webapps/default.nix index 56beee5..6828e6a 100755 --- a/hosts/nixos-server-reid/webapps/default.nix +++ b/hosts/nixos-server-reid/webapps/default.nix @@ -35,6 +35,11 @@ in { enable = true; domain = "amdl.reidlab.pink"; }; + + uptime = { + enable = true; + domain = "status.reidlab.pink"; + }; }; }; diff --git a/modules/services/uptime.nix b/modules/services/uptime.nix new file mode 100644 index 0000000..54d0a81 --- /dev/null +++ b/modules/services/uptime.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, options, ... }: + +with lib; +let + cfg = config.modules.services.uptime; +in { + options.modules.services.uptime = { + enable = mkEnableOption "enable uptime kuma, a self-hosted uptime website"; + port = mkOption { + type = types.int; + default = 3002; + }; + domain = mkOption { + type = types.str; + default = "status.reidlab.pink"; + }; + }; + + config = mkIf cfg.enable { + services.uptime-kuma = { + enable = true; + settings.PORT = toString cfg.port; + }; + + services.nginx.virtualHosts."${cfg.domain}" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString cfg.port}"; + }; + }; + }; +}