diff --git a/hosts/default.nix b/hosts/default.nix
index 5f845eb..38ac38a 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -27,7 +27,7 @@ in
 {
   desktop = lib.nixosSystem {                                # Desktop profile
     inherit system;
-    specialArgs = { inherit inputs user locationhyprland nixos-hardware nur; };
+    specialArgs = { inherit inputs user location hyprland nixos-hardware nur; };
     modules = [
       nur.nixosModules.nur
       #hyprland.nixosModules.default
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index 73990a7..62a5eb6 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -17,37 +17,31 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" "rtsx_usb_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" "vfio_virqfd" ];
-  boot.kernelModules = [ "kvm" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-label/ROOT";
+    { device = "/dev/disk/by-label/NIXROOT";
       fsType = "btrfs";
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@" ];
     };
 
   fileSystems."/home" =
-    { device = "/dev/disk/by-label/ROOT";
+    { device = "/dev/disk/by-label/NIXROOT";
       fsType = "btrfs";
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home" ];
     };
 
-  fileSystems."/opt" =
-    { device = "/dev/disk/by-label/ROOT";
-      fsType = "btrfs";
-      options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@opt" ];
-    };
-
   fileSystems."/srv" =
-    { device = "/dev/disk/by-label/ROOT";
+    { device = "/dev/disk/by-label/NIXROOT";
       fsType = "btrfs";
       options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-label/BOOT";
+    { device = "/dev/disk/by-label/NIXBOOT";
       fsType = "vfat";
     };
 
@@ -73,7 +67,7 @@
       enable = true;
     };
     interfaces = {
-      eth0 = {
+      enp34s0 = {
         useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
         #ipv4.addresses = [ {
         #    address = "192.168.0.51";
@@ -90,7 +84,7 @@
     #};
   };
 
-  #hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
 }
diff --git a/modules/shell/git.nix b/modules/shell/git.nix
index 02b9c7e..e36928b 100644
--- a/modules/shell/git.nix
+++ b/modules/shell/git.nix
@@ -13,8 +13,9 @@
       signing = {
         key = "/home/${user}/.ssh/id_ed25519_sk_rk_yubiC";
         signByDefault = true;
+      };
       extraConfig = {
-        gpg = { format = ssh; };
+        gpg = { format = "ssh"; };
       };
     };
   };