From cde6cb09fd342e27e5ee3ec7093caf5369f81ecd Mon Sep 17 00:00:00 2001
From: b12f <git@benjaminbaedorf.eu>
Date: Wed, 30 Oct 2024 22:43:06 +0100
Subject: [PATCH] hosts/droppie: fix boot, remove unused services

---
 hosts/default.nix                        |  2 --
 hosts/droppie/configuration.nix          |  1 +
 hosts/droppie/default.nix                |  2 --
 hosts/droppie/hardware-configuration.nix |  9 ++---
 hosts/droppie/jellyfin.nix               | 44 ------------------------
 hosts/droppie/nginx.nix                  | 15 --------
 6 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 hosts/droppie/jellyfin.nix
 delete mode 100644 hosts/droppie/nginx.nix

diff --git a/hosts/default.nix b/hosts/default.nix
index 86c38b7..735f792 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -69,8 +69,6 @@
           self.nixosModules.base
           ./droppie
           self.nixosModules.yule
-          self.nixosModules.acme
-          self.nixosModules.proxy
           self.nixosModules.persistence
         ];
       };
diff --git a/hosts/droppie/configuration.nix b/hosts/droppie/configuration.nix
index 5d476ef..b6470dc 100644
--- a/hosts/droppie/configuration.nix
+++ b/hosts/droppie/configuration.nix
@@ -20,6 +20,7 @@ in {
 
   boot.kernelParams = [
     "boot.shell_on_fail=1"
+    "nomodeset"
     # Hack so that network is considered up by boot.initrd.network and postCommands gets executed.
     "ip=127.0.0.1:::::lo:none"
   ];
diff --git a/hosts/droppie/default.nix b/hosts/droppie/default.nix
index 00d26fc..9bef4a7 100644
--- a/hosts/droppie/default.nix
+++ b/hosts/droppie/default.nix
@@ -5,7 +5,5 @@
 
     ./networking.nix
     ./backup-autostop.nix
-    ./nginx.nix
-    ./jellyfin.nix
   ];
 }
diff --git a/hosts/droppie/hardware-configuration.nix b/hosts/droppie/hardware-configuration.nix
index 1ee4771..8d5a5f6 100644
--- a/hosts/droppie/hardware-configuration.nix
+++ b/hosts/droppie/hardware-configuration.nix
@@ -13,16 +13,16 @@
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "ehci_pci" "usbhid" "usb_storage" "uas" "sd_mod"];
-  boot.initrd.kernelModules = ["dm-snapshot" "amdgpu"];
+  boot.initrd.kernelModules = ["dm-snapshot"];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
 
   boot.initrd.luks.devices = {
     "cryptroot" = {
-      device = "/dev/sdb2";
+      device = "/dev/disk/by-uuid/08330ff9-581a-41e1-b8fa-757dc4c90b16";
       allowDiscards = true;
     };
-    "cryptdata".device = "/dev/sda1";
+    "cryptdata".device = "/dev/disk/by-uuid/bc9f00ea-027e-409b-87c9-ab5628683378";
   };
 
   fileSystems."/" = {
@@ -51,10 +51,11 @@
     device = "/dev/disk/by-uuid/991E-79C1";
     fsType = "vfat";
     neededForBoot = true;
+    options = [ "fmask=0022" "dmask=0022" ];
   };
 
   fileSystems."/data" = {
-    device = "/dev/disk/by-uuid/5fc34ef4-207b-45fb-b846-dbb01080d9fe";
+    device = "/dev/disk/by-uuid/391db8c4-5654-4a5c-a5c8-e34811f54786";
     fsType = "ext4";
   };
 
diff --git a/hosts/droppie/jellyfin.nix b/hosts/droppie/jellyfin.nix
deleted file mode 100644
index 018ea06..0000000
--- a/hosts/droppie/jellyfin.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  flake,
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  environment.systemPackages = [
-    pkgs.jellyfin
-    pkgs.jellyfin-web
-    pkgs.jellyfin-ffmpeg
-  ];
-
-  services.jellyfin = {
-    enable = true;
-    openFirewall = false;
-  };
-
-  # from https://jellyfin.org/docs/general/networking/index.html
-  networking.firewall.allowedUDPPorts = [1900 7359];
-
-  security.acme.certs = {
-    "media.b12f.io" = {};
-  };
-
-  services.nginx.virtualHosts = {
-    "media.b12f.io" = {
-      forceSSL = true;
-      useACMEHost = "media.b12f.io";
-      locations."/".proxyPass = "http://127.0.0.1:8096";
-    };
-  };
-
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-
-    extraPackages = with pkgs; [
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-  };
-}
diff --git a/hosts/droppie/nginx.nix b/hosts/droppie/nginx.nix
deleted file mode 100644
index e1c7bba..0000000
--- a/hosts/droppie/nginx.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  flake,
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  services.nginx = {
-    defaultListenAddresses = [
-      "192.168.178.3"
-      "10.13.12.3"
-      "[fd00:b12f:acab:1312:acab:3::]"
-    ];
-  };
-}