diff --git a/flake.nix b/flake.nix index eafd3388..36eedeaf 100644 --- a/flake.nix +++ b/flake.nix @@ -104,6 +104,7 @@ ./users/aly ./desktop/gnome ./modules/virtualization + ./modules/homelab ./modules/steam ./modules/via-qmk ./modules/logitech @@ -160,4 +161,4 @@ ]; }; }; -} \ No newline at end of file +} diff --git a/hosts/mauville/hardware-configuration.nix b/hosts/mauville/hardware-configuration.nix index a2498ee9..b2a585d1 100644 --- a/hosts/mauville/hardware-configuration.nix +++ b/hosts/mauville/hardware-configuration.nix @@ -8,23 +8,28 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/ed744c02-8854-4f1a-8e75-ed15f02775e3"; + { device = "/dev/disk/by-uuid/c4217c88-3101-434b-8321-58e2ac89527c"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/37BB-86B6"; + { device = "/dev/disk/by-uuid/3445-B2A0"; fsType = "vfat"; }; + fileSystems."/mnt/Media" = + { device = "/dev/disk/by-uuid/f7e9e6d6-2bf6-429a-aaf0-49b55d53fc83"; + fsType = "ext4"; + }; + swapDevices = - [ { device = "/dev/disk/by-uuid/7a33dbc2-73f7-490b-9aa6-382e119a997e"; } + [ { device = "/dev/disk/by-uuid/26094ada-7ba4-4437-bacb-b3cdf6c3397b"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -32,8 +37,8 @@ # 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.wlp0s20f3.useDHCP = lib.mkDefault true; + # networking.interfaces.enp4s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/homelab/default.nix b/modules/homelab/default.nix index 0730ab8d..e0b5acde 100644 --- a/modules/homelab/default.nix +++ b/modules/homelab/default.nix @@ -20,17 +20,23 @@ audiobookshelf = { ports = ["0.0.0.0:13378:80"]; image = "ghcr.io/advplyr/audiobookshelf:latest"; + volumes = [ + "/mnt/Media:/Media" + ]; }; plex-server = { ports = ["0.0.0.0:32400:32400"]; image = "plexinc/pms-docker:public"; + volumes = [ + "/mnt/Media:/Media" + ]; }; transmission-server = { ports = ["0.0.0.0:9091:9091"]; image = "linuxserver/transmission:latest"; - # volumes = [ - # "/home/aly/transmission:/config" - # ]; + volumes = [ + "/mnt/Media:/Media" + ]; }; }; };