Mirror/nix-git
Mirror/nix-git
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/nix-git synced 2025-02-22 10:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Daniel Langbein 2025-02-18 13:57:48 +01:00
commit 3524fc8df2
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO.md
View File

@ -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

9
hosts/yodaTab/configuration.nix
View File

@ -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.

15
modules/initrd-contact-info.nix
View File

@ -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

2
modules/journalwatch.nix
View File

@ -228,7 +228,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