From 23de88be3fd492caefe553860f861a12404f208b Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sat, 15 Feb 2025 20:05:45 +0100 Subject: [PATCH 1/2] journalwatch config --- modules/journalwatch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/journalwatch.nix b/modules/journalwatch.nix index 9c74786..43b002b 100644 --- a/modules/journalwatch.nix +++ b/modules/journalwatch.nix @@ -219,7 +219,7 @@ in # 1.1.1.1 - my-username 28/Sep/2023:21:11:48 +0000 "GET /ocs/v2.php" 304 # 1.1.1.1 - 28/Sep/2023:21:13:10 +0000 "GET /ocs/v2.php" 304 # - [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - .* \S+ \+0000 "(DELETE|GET|HEAD|MKCOL|MOVE|OPTIONS|PATCH|POST|PROPPATCH|PROPFIND|PUT|REPORT|SEARCH) (/index\.php|/status\.php|/public\.php|/remote\.php|/ocs/(v1|v2)\.php)" [2-5][0-2][0-9] + [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - .* \S+ \+0000 "(COPY|DELETE|GET|HEAD|MKCOL|MOVE|OPTIONS|PATCH|POST|PROPPATCH|PROPFIND|PUT|REPORT|SEARCH) (/index\.php|/status\.php|/public\.php|/remote\.php|/ocs/(v1|v2)\.php)" [2-5][0-2][0-9] [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+ - .* \S+ \+0000 "(GET|HEAD) (/ocm|/ocs)-provider/index\.php" 200 # crond: USER www-data pid\s+[0-9]+ cmd php -f /var/www/html/cron\.php From 5a89a33c6ec452e9a003541ee48430c6928ffefc Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sat, 15 Feb 2025 20:55:57 +0100 Subject: [PATCH 2/2] refactor todo --- TODO.md | 3 +++ hosts/yodaTab/configuration.nix | 9 --------- modules/initrd-contact-info.nix | 15 +++++++-------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/TODO.md b/TODO.md index ef539c0..4a57c63 100644 --- a/TODO.md +++ b/TODO.md @@ -2,6 +2,9 @@ This document contains ideas about possible extensions or improvements of my NixOS configuration. Many more TODOs can be found as comments inside other files of this repository. +- Motivation behind bare bones systemd-based initrd: https://github.com/NixOS/nixpkgs/pull/164943 + - `boot.initrd.systemd.enable = true;` + * Monthly BTRFS scrub * Drives @yodaNas, @yodaHedgehog reach about 45°C * Control case fan speed by drive temp diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix index 1e9e79b..78de2f9 100644 --- a/hosts/yodaTab/configuration.nix +++ b/hosts/yodaTab/configuration.nix @@ -59,15 +59,6 @@ #yoda.btrfsMounts = yoda.btrfsFileSystems; fileSystems."/mnt/512gb".options = [ "noatime" "commit=60" ]; # Ext4 - # Fix touchpad/keyboard issue during boot. - # TODO neither touch nor keyboard work - # TODO try again with initrd.systemd.enable, see below. but disable Plymouth in that case - #boot.initrd.unl0kr.enable = true; - - # TODO - # Motivation behind bare bones systemd-based initrd: https://github.com/NixOS/nixpkgs/pull/164943 - #boot.initrd.systemd.enable = true; - boot.kernelParams = [ # If the CPU is vulnerable, enable all available mitigations # except `nosmt` as we don't run any VMs on this machine. diff --git a/modules/initrd-contact-info.nix b/modules/initrd-contact-info.nix index 6a5ac26..8e619a1 100644 --- a/modules/initrd-contact-info.nix +++ b/modules/initrd-contact-info.nix @@ -77,17 +77,16 @@ in # We found no non-graphical solution to print the contact info with systemd initrd. # Workaround: Run a dummy service that has the contact info as service name ... # - # Alternative: Use Plymouth for a graphical boot splash screen. - # TODO: Only on graphical installations! + # Alternative for non-headless devices: Use Plymouth for a graphical boot splash screen. # # To see the splash screen. https://wiki.archlinux.org/title/Plymouth#Installation #boot.kernelParams = [ "splash" ]; # - boot.plymouth = lib.mkIf (config.boot.initrd.systemd.enable) { - enable = true; - #theme = "breeze"; - logo = "${contact-info-img}/img.png"; - }; +# boot.plymouth = lib.mkIf (config.boot.initrd.systemd.enable) { +# enable = true; +# #theme = "breeze"; +# logo = "${contact-info-img}/img.png"; +# }; # Print contact info as text during boot. boot.initrd.preDeviceCommands = lib.mkIf (! config.boot.initrd.systemd.enable) '' @@ -99,7 +98,7 @@ in # TODO: cleanup # -# TODO: systemd service output is not displayed during boot. onyl [info] service xxx started +# TODO: systemd service output is not displayed during boot. only [info] service xxx started # # # https://github.com/oxalica/nixpkgs/blob/3562c1d5c6ff868924fe95ba7b51344f3c141311/nixos/modules/config/console.nix#L158