b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hosts/droppie: fix boot, remove unused services

Browse source
This commit is contained in:
b12f 2024-10-30 22:43:06 +01:00
parent 06195facf3
commit cde6cb09fd
Signed by: b12f
GPG key ID: 729956E1124F8F26
6 changed files with 6 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/default.nix
View file

@ -69,8 +69,6 @@
self.nixosModules.base self.nixosModules.base
./droppie ./droppie
self.nixosModules.yule self.nixosModules.yule
self.nixosModules.acme
self.nixosModules.proxy
self.nixosModules.persistence self.nixosModules.persistence
]; ];
}; };

1
hosts/droppie/configuration.nix
View file

@ -20,6 +20,7 @@ in {
boot.kernelParams = [ boot.kernelParams = [
"boot.shell_on_fail=1" "boot.shell_on_fail=1"
"nomodeset"
# Hack so that network is considered up by boot.initrd.network and postCommands gets executed. # Hack so that network is considered up by boot.initrd.network and postCommands gets executed.
"ip=127.0.0.1:::::lo:none" "ip=127.0.0.1:::::lo:none"
]; ];

2
hosts/droppie/default.nix
View file

@ -5,7 +5,5 @@
./networking.nix ./networking.nix
./backup-autostop.nix ./backup-autostop.nix
./nginx.nix
./jellyfin.nix
]; ];
} }

9
hosts/droppie/hardware-configuration.nix
View file

@ -13,16 +13,16 @@
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "ehci_pci" "usbhid" "usb_storage" "uas" "sd_mod"]; 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.kernelModules = ["kvm-amd"];
boot.extraModulePackages = []; boot.extraModulePackages = [];
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
"cryptroot" = { "cryptroot" = {
device = "/dev/sdb2"; device = "/dev/disk/by-uuid/08330ff9-581a-41e1-b8fa-757dc4c90b16";
allowDiscards = true; allowDiscards = true;
}; };
"cryptdata".device = "/dev/sda1"; "cryptdata".device = "/dev/disk/by-uuid/bc9f00ea-027e-409b-87c9-ab5628683378";
}; };
fileSystems."/" = { fileSystems."/" = {
@ -51,10 +51,11 @@
device = "/dev/disk/by-uuid/991E-79C1"; device = "/dev/disk/by-uuid/991E-79C1";
fsType = "vfat"; fsType = "vfat";
neededForBoot = true; neededForBoot = true;
options = [ "fmask=0022" "dmask=0022" ];
}; };
fileSystems."/data" = { fileSystems."/data" = {
device = "/dev/disk/by-uuid/5fc34ef4-207b-45fb-b846-dbb01080d9fe"; device = "/dev/disk/by-uuid/391db8c4-5654-4a5c-a5c8-e34811f54786";
fsType = "ext4"; fsType = "ext4";
}; };

44
hosts/droppie/jellyfin.nix
View file

@ -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
];
};
}

15
hosts/droppie/nginx.nix
View file

@ -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::]"
];
};
}