diff --git a/nixcfgs/modules/home/dev/rust.nix b/nixcfgs/modules/home/dev/rust.nix
index fb34c5c..98cd850 100644
--- a/nixcfgs/modules/home/dev/rust.nix
+++ b/nixcfgs/modules/home/dev/rust.nix
@@ -5,8 +5,10 @@
     cargo
     clippy
     rustfmt
-    make
+    gnumake
     cmake
+    llvm
+    gcc
   ];
 
   programs.vscode.profiles.default.extensions = with pkgs.vscode-extensions; [
diff --git a/nixcfgs/modules/nixos/desktop/diskutil.nix b/nixcfgs/modules/nixos/desktop/diskutil.nix
index 1e0ccc0..097cd62 100644
--- a/nixcfgs/modules/nixos/desktop/diskutil.nix
+++ b/nixcfgs/modules/nixos/desktop/diskutil.nix
@@ -1,7 +1,9 @@
 {pkgs, ...}: {
+  # udisks2 is needed for disk management and mounting.
+  # If you cannot see external drives in your file manager, enable this.
   services.udisks2.enable = true;
   programs.gnome-disks.enable = true;
-  environment.systempackages = [
+  environment.systemPackages = [
     pkgs.smartmontools
   ];
 }
diff --git a/nixcfgs/modules/nixos/desktop/host-machine.nix b/nixcfgs/modules/nixos/desktop/host-machine.nix
index 99117f1..11511f7 100644
--- a/nixcfgs/modules/nixos/desktop/host-machine.nix
+++ b/nixcfgs/modules/nixos/desktop/host-machine.nix
@@ -1,4 +1,8 @@
 {pkgs, ...}: {
+  imports = [
+    ./xremap.nix
+    ./diskutil.nix
+  ];
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -6,7 +10,6 @@
   environment.systemPackages = with pkgs; [
     pciutils
     usbutils
-    smartmontools
     v4l-utils
   ];