diff --git a/common/default.nix b/common/default.nix
index f65b087..8195531 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -72,6 +72,36 @@
     };
   };
 
+  boot.supportedFilesystems = ["ext4" "xfs" "btrfs" "vfat" "ntfs"];
+  system.fsPackages = with pkgs; [
+    btrfs-progs
+    nfs-utils
+    ntfs3g
+    xfsprogs
+  ];
+
+  environment.systemPackages =
+    (with pkgs; [
+      # File management
+      imagemagick
+      unzip
+      zip
+
+      # Peripherals
+      hdparm
+      pciutils
+      usbutils
+    ])
+    ++ [
+      nix-melt.packages.${pkgs.system}.default
+
+      (nurl.packages.${pkgs.system}.default.override {
+        nix = config.nix.package;
+      })
+
+      mozilla-addons-to-nix.packages.${pkgs.system}.default
+    ];
+
   home-manager = let
     inherit (lib) mapAttrs' nameValuePair;
 
@@ -105,15 +135,6 @@
           source = v;
         })
       self.devShells.${pkgs.system};
-
-      home.packages = [
-        nix-melt.packages.${pkgs.system}.default
-
-        (nurl.packages.${pkgs.system}.default.override {
-          nix = config.nix.package;
-        })
-        mozilla-addons-to-nix.packages.${pkgs.system}.default
-      ];
     };
   in {
     users = {
diff --git a/common/home/packages.nix b/common/home/packages.nix
index 2488c04..d8e2215 100644
--- a/common/home/packages.nix
+++ b/common/home/packages.nix
@@ -12,20 +12,19 @@
       undollar
     ])
     ++ (with pkgs; [
+      # Networking
       dig.dnsutils
-      imagemagick
-      killall
       mosh
+      openssh
+      rsync
+      wget
+
+      # Misc CLI stuff
+      killall
       neofetch
       nix-output-monitor
-      openssh
       progress
-      rsync
       tree
-      unzip
-      usbutils
-      wget
-      zip
     ])
     ++ [
       # This could help as well: nix derivation show -r /run/current-system