diff --git a/flake.lock b/flake.lock index 4fdeeee..dfe54e9 100644 --- a/flake.lock +++ b/flake.lock @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1765526639, - "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "457a55ed77a105088a47cb55b9eccf7768559451", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1765684049, - "narHash": "sha256-svCS2r984qEowMT0y3kCrsD/m0J6zaF5I/UusS7QaH0=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "9b628e171bfaea1a3d1edf31eee46251e0fe4a33", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1765591348, - "narHash": "sha256-GI5eC3BWNBnYk+FV1cTYrjPLrqv1Q5HXD7kwHkqnZ8c=", + "lastModified": 1764900372, + "narHash": "sha256-kTXDohz28PWDyjH+7O6UkXtKwaP0JkCmjMTLc/wbjmk=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "37f2aad139533c27689c00cef0d43f7c51d0b14e", + "rev": "777ee6af79272a1302815a2ea62b2a951aa9a6fe", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 66415f0..6505f68 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,6 @@ ./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/nijika/hardware-configuration.nix b/hosts/nijika/hardware-configuration.nix index a80d5bd..427e9df 100644 --- a/hosts/nijika/hardware-configuration.nix +++ b/hosts/nijika/hardware-configuration.nix @@ -45,12 +45,6 @@ options = [ "fmask=0077" "dmask=0077" ]; }; - fileSystems."/media" = - { device = "/dev/mapper/root"; - fsType = "btrfs"; - options = [ "subvol=media" ]; - }; - swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/nixos-common.nix b/hosts/nixos-common.nix index 2187618..12733a2 100644 --- a/hosts/nixos-common.nix +++ b/hosts/nixos-common.nix @@ -6,7 +6,9 @@ { # 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 deleted file mode 100644 index 1bf78ee..0000000 --- a/modules/hardware/bootloader/limine.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ 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 deleted file mode 100644 index 5648970..0000000 --- a/modules/hardware/bootloader/systemd-boot.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: - -{ - boot.loader.systemd-boot = { - enable = true; - }; - - boot.loader.timeout = 0; -} diff --git a/modules/services/media/arr.nix b/modules/services/media/arr.nix index 803a1e3..94e4a8b 100644 --- a/modules/services/media/arr.nix +++ b/modules/services/media/arr.nix @@ -84,4 +84,21 @@ 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 + ''; + }; }