diff --git a/config/headless.nix b/config/headless.nix
index b4048d8..3244bb8 100644
--- a/config/headless.nix
+++ b/config/headless.nix
@@ -3,9 +3,8 @@
   imports = [ ./shared.nix ];
 
   # Bootloader.
-  boot.loader.grub.enable = true;
-  boot.loader.grub.device = "/dev/sda";
-  boot.loader.grub.useOSProber = true;
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
 
   system.stateVersion = "24.05";
 }
diff --git a/config/media.nix b/config/media.nix
index 0eb474a..aef46dc 100644
--- a/config/media.nix
+++ b/config/media.nix
@@ -5,6 +5,16 @@
     ./headless.nix
   ];
 
+  services.xserver.videoDrivers = ["nvidia"];
+  hardware.opengl.enable = true;
+  hardware.nvidia = {
+      open = false;
+      modesetting.enable = true;
+      powerManagement.enable = false;
+      powerManagement.finegrained = false;
+      nvidiaSettings = true;
+  };
+
   users.users.media = import ./user.nix;
   networking.hostName = "r330-media";
 
@@ -12,7 +22,7 @@
   networking.defaultGateway = "192.168.100.1";
   networking.nameservers = [ "192.168.100.1" ];
   networking.firewall.allowedTCPPorts = [ 80 443 32400 ];
-  networking.interfaces.ens18.ipv4.addresses = [
+  networking.interfaces.enp6s18.ipv4.addresses = [
     {
       address = "192.168.100.5";
       prefixLength = 24;
diff --git a/hardware/media.nix b/hardware/media.nix
index a20b6e5..12c4983 100644
--- a/hardware/media.nix
+++ b/hardware/media.nix
@@ -8,20 +8,26 @@
     [ (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/3f87972b-cf61-4efd-883c-b9f794775232";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/d761e265-99eb-4dd6-a92d-40ba56f962ec";
+      fsType = "ext4";
+    };
 
-  fileSystems."/mnt/storage" = {
-    device = "/dev/disk/by-uuid/b579c911-e74c-4f03-b918-a4e5a6b764ab";
-    fsType = "ext4";
-  };
+  fileSystems."/mnt/storage" =
+    { device = "/dev/disk/by-uuid/b579c911-e74c-4f03-b918-a4e5a6b764ab";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3B58-9662";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
 
   swapDevices = [ ];
 
@@ -30,7 +36,7 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
diff --git a/home/shared.nix b/home/shared.nix
index d5e77b8..acd03f0 100644
--- a/home/shared.nix
+++ b/home/shared.nix
@@ -24,9 +24,11 @@ in {
     btop
     p7zip
     ripgrep
+    openvpn
+    pciutils
     fastfetch
     bitwarden-cli
-    openvpn
+    nvtopPackages.full
 
     # Dev tools
     clang