From 5b64f404123c8b785748967d64ce7158b0cb411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= Date: Wed, 12 Feb 2025 22:44:30 +0100 Subject: [PATCH] Add media1 host --- hosts/media1/configuration.nix | 2 +- hosts/media1/hardware-configuration.nix | 65 ++++++++----------------- services/ns/zones-home-2rjus-net.conf | 5 +- 3 files changed, 24 insertions(+), 48 deletions(-) diff --git a/hosts/media1/configuration.nix b/hosts/media1/configuration.nix index 553384e..e80dc61 100644 --- a/hosts/media1/configuration.nix +++ b/hosts/media1/configuration.nix @@ -42,7 +42,7 @@ systemd.network.networks."enp2s0" = { matchConfig.Name = "enp2s0"; address = [ - "10.69.31.49/24" + "10.69.12.82/24" ]; routes = [ { Gateway = "10.69.31.1"; } diff --git a/hosts/media1/hardware-configuration.nix b/hosts/media1/hardware-configuration.nix index 2a60722..0d68fb0 100644 --- a/hosts/media1/hardware-configuration.nix +++ b/hosts/media1/hardware-configuration.nix @@ -1,58 +1,33 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +{ config, lib, pkgs, modulesPath, ... }: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "nvme" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "rtsx_usb_sdmmc" - ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "rtsx_usb_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/faa60038-b3a4-448a-8909-49857818c955"; - fsType = "xfs"; - }; + fileSystems."/" = + { + device = "/dev/disk/by-uuid/3e7c311c-b1a3-4be7-b8bf-e497cba64302"; + fsType = "btrfs"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/7A94-A91C"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; + fileSystems."/boot" = + { + device = "/dev/disk/by-uuid/F0D7-E5C1"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; - swapDevices = [ - { device = "/dev/disk/by-uuid/f7a4f85e-0b4b-492d-a611-f50d2b915c2c"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + swapDevices = + [{ device = "/dev/disk/by-uuid/1a06a36f-da61-4d36-b94e-b852836c328a"; }]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } + diff --git a/services/ns/zones-home-2rjus-net.conf b/services/ns/zones-home-2rjus-net.conf index 7847ac3..0db2c39 100644 --- a/services/ns/zones-home-2rjus-net.conf +++ b/services/ns/zones-home-2rjus-net.conf @@ -1,7 +1,7 @@ $ORIGIN home.2rjus.net. $TTL 1800 @ IN SOA ns1.home.2rjus.net. admin.test.2rjus.net. ( - 2051 ; serial number + 2052 ; serial number 3600 ; refresh 900 ; retry 1209600 ; expire @@ -40,10 +40,11 @@ restic IN A 10.69.12.52 radarr-jail IN A 10.69.12.53 sonarr-jail IN A 10.69.12.54 bazarr IN A 10.69.12.55 -mpnzb IN A 10.69.12.57 +mpnzb IN A 10.69.12.57 pve1 IN A 10.69.12.75 inc1 IN A 10.69.12.80 inc2 IN A 10.69.12.81 +media1 IN A 10.69.12.82 ; 13_SVC ns1 IN A 10.69.13.5