From ea97683dfda5bb735bf96c0ecb148c02cb6541b4 Mon Sep 17 00:00:00 2001 From: Nico Date: Sun, 14 Dec 2025 19:04:45 +1100 Subject: [PATCH 1/6] nix: update flake sources to c2a0396 --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index dfe54e9..4fdeeee 100644 --- a/flake.lock +++ b/flake.lock @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", + "lastModified": 1765526639, + "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", + "rev": "457a55ed77a105088a47cb55b9eccf7768559451", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1765684049, + "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764900372, - "narHash": "sha256-kTXDohz28PWDyjH+7O6UkXtKwaP0JkCmjMTLc/wbjmk=", + "lastModified": 1765591348, + "narHash": "sha256-GI5eC3BWNBnYk+FV1cTYrjPLrqv1Q5HXD7kwHkqnZ8c=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "777ee6af79272a1302815a2ea62b2a951aa9a6fe", + "rev": "37f2aad139533c27689c00cef0d43f7c51d0b14e", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { From cb2c94c4d95d5749a61cee25b06d2043f55db6e8 Mon Sep 17 00:00:00 2001 From: Nico Date: Fri, 12 Dec 2025 21:44:58 +1100 Subject: [PATCH 2/6] bootloaders: split bootloaders into seperate files --- flake.nix | 1 + hosts/nixos-common.nix | 2 -- modules/hardware/bootloader/limine.nix | 23 ++++++++++++++++++++ modules/hardware/bootloader/systemd-boot.nix | 9 ++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 modules/hardware/bootloader/limine.nix create mode 100644 modules/hardware/bootloader/systemd-boot.nix diff --git a/flake.nix b/flake.nix index 6505f68..66415f0 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,7 @@ ./modules/users/nico.nix ./modules/users/alex.nix ./modules/hardware/secureboot.nix + ./modules/hardware/bootloader/systemd-boot.nix lanzaboote.nixosModules.lanzaboote ./hosts/nijika/configuration.nix diff --git a/hosts/nixos-common.nix b/hosts/nixos-common.nix index 12733a2..2187618 100644 --- a/hosts/nixos-common.nix +++ b/hosts/nixos-common.nix @@ -6,9 +6,7 @@ { # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.loader.timeout = 0; # Networking networking.networkmanager.enable = true; diff --git a/modules/hardware/bootloader/limine.nix b/modules/hardware/bootloader/limine.nix new file mode 100644 index 0000000..1bf78ee --- /dev/null +++ b/modules/hardware/bootloader/limine.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: + +{ + boot.loader.limine = { + enable = true; + validateChecksums = true; + panicOnChecksumMismatch = true; + enableEditor = false; + + + extraEntries = +'' +/memtest86 + protocol: chainload + path: boot():///efi/memtest86/memtest86.efi +''; + additionalFiles = { + "efi/memtest86/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi"; + }; + + secureBoot.enable = true; + }; +} diff --git a/modules/hardware/bootloader/systemd-boot.nix b/modules/hardware/bootloader/systemd-boot.nix new file mode 100644 index 0000000..5648970 --- /dev/null +++ b/modules/hardware/bootloader/systemd-boot.nix @@ -0,0 +1,9 @@ +{ config, ... }: + +{ + boot.loader.systemd-boot = { + enable = true; + }; + + boot.loader.timeout = 0; +} From db97556d3dcd9ff5b258f4799828783f6d9374b2 Mon Sep 17 00:00:00 2001 From: Nico Date: Fri, 12 Dec 2025 21:51:14 +1100 Subject: [PATCH 3/6] deluge: use a declarative configuration --- modules/services/media/arr.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/services/media/arr.nix b/modules/services/media/arr.nix index 94e4a8b..7765ddb 100644 --- a/modules/services/media/arr.nix +++ b/modules/services/media/arr.nix @@ -75,6 +75,29 @@ web.enable = true; web.openFirewall = false; group = "media"; + + declarative = true; + authFile = "/var/lib/deluge/auth"; + config = { + download_location = "/media/torrents/"; + torrentfiles_location = "/media/torrents/files/"; + copy_torrent_file = true; + + allow_remote = true; + random_port = true; + upnp = true; + + max_active_seeding = 5; + max_active_downloading = 3; + max_active_limit = 8; + + max_download_speed = -1; + max_upload_speed = 10000; # 10 MiB/s + new_release_check = false; + enabled_plugins = [ + "Label" + ]; + }; }; services.caddy.virtualHosts."deluge.${config.homelab.domain}" = { From 1397a7e9e12bd1b29109e978e68e18c6fec4d403 Mon Sep 17 00:00:00 2001 From: Nico Date: Fri, 12 Dec 2025 21:51:31 +1100 Subject: [PATCH 4/6] jellyseer: remove jellyseer --- modules/services/media/arr.nix | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/modules/services/media/arr.nix b/modules/services/media/arr.nix index 7765ddb..55d75cd 100644 --- a/modules/services/media/arr.nix +++ b/modules/services/media/arr.nix @@ -107,21 +107,4 @@ import block_non_private_ips ''; }; - - # - # Requesting Frontend - services.jellyseerr = { - enable = true; - port = 5055; - openFirewall = false; - package = pkgs.jellyseerr; - }; - - services.caddy.virtualHosts."jellyseer.${config.homelab.domain}" = { - useACMEHost = config.homelab.domain; - extraConfig = '' - reverse_proxy http://localhost:5055 - import block_non_private_ips - ''; - }; } From efa6c47e107e625c57c325c04a67206fd7c6931f Mon Sep 17 00:00:00 2001 From: Nico Date: Sat, 13 Dec 2025 21:02:04 +1100 Subject: [PATCH 5/6] Revert "deluge: use a declarative configuration" This reverts commit c02057b16decb83b295e4ab52dfdc3124c9c15fb. --- modules/services/media/arr.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/modules/services/media/arr.nix b/modules/services/media/arr.nix index 55d75cd..803a1e3 100644 --- a/modules/services/media/arr.nix +++ b/modules/services/media/arr.nix @@ -75,29 +75,6 @@ web.enable = true; web.openFirewall = false; group = "media"; - - declarative = true; - authFile = "/var/lib/deluge/auth"; - config = { - download_location = "/media/torrents/"; - torrentfiles_location = "/media/torrents/files/"; - copy_torrent_file = true; - - allow_remote = true; - random_port = true; - upnp = true; - - max_active_seeding = 5; - max_active_downloading = 3; - max_active_limit = 8; - - max_download_speed = -1; - max_upload_speed = 10000; # 10 MiB/s - new_release_check = false; - enabled_plugins = [ - "Label" - ]; - }; }; services.caddy.virtualHosts."deluge.${config.homelab.domain}" = { From decbb0713babac9c29b7d63e5ab61bfd499ec7f8 Mon Sep 17 00:00:00 2001 From: Nico Date: Sun, 14 Dec 2025 20:22:08 +1100 Subject: [PATCH 6/6] nijika: mount media subvolume on boot holy fuck how did i not notice this for so long, like i didnt reboot for a long time or smth??? --- hosts/nijika/hardware-configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hosts/nijika/hardware-configuration.nix b/hosts/nijika/hardware-configuration.nix index 427e9df..a80d5bd 100644 --- a/hosts/nijika/hardware-configuration.nix +++ b/hosts/nijika/hardware-configuration.nix @@ -45,6 +45,12 @@ options = [ "fmask=0077" "dmask=0077" ]; }; + fileSystems."/media" = + { device = "/dev/mapper/root"; + fsType = "btrfs"; + options = [ "subvol=media" ]; + }; + swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";