diff --git a/modules/datasync.nix b/modules/datasync.nix
index 2ed4ce6..dcd5110 100644
--- a/modules/datasync.nix
+++ b/modules/datasync.nix
@@ -83,6 +83,35 @@
       automount_opts =
         "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
       credentials = config.age.secrets.samba-ugent.path;
+  # Automount external storage
+  systemd.mounts = [
+    # USB
+    {
+      what = "/dev/sda1";
+      where = "/usb";
+      mountConfig = { TimeoutSec = "5"; };
+    }
+    # SD card
+    {
+      what = "/dev/mmcblk0p1";
+      where = "/sdcard";
+      mountConfig = { TimeoutSec = "5"; };
+    }
+  ];
+  systemd.automounts = [
+    # USB
+    {
+      where = "/usb";
+      automountConfig = { TimeoutIdleSec = "5"; };
+      wantedBy = [ "default.target" ];
+    }
+    # SD card
+    {
+      where = "/sdcard";
+      automountConfig = { TimeoutIdleSec = "5"; };
+      wantedBy = [ "default.target" ];
+    }
+  ];
 
     in [
       "${automount_opts},credentials=${credentials},noperm,vers=3.0,sec=ntlmv2i"
diff --git a/modules/gui.nix b/modules/gui.nix
index 5239e94..4d91bea 100644
--- a/modules/gui.nix
+++ b/modules/gui.nix
@@ -85,36 +85,6 @@ with pkgs;
     baseIndex = 1;
   };
 
-  # Automount external storage
-  systemd.mounts = [
-    # USB
-    {
-      what = "/dev/sda1";
-      where = "/usb";
-      mountConfig = { TimeoutSec = "5"; };
-    }
-    # SD card
-    {
-      what = "/dev/mmcblk0p1";
-      where = "/sdcard";
-      mountConfig = { TimeoutSec = "5"; };
-    }
-  ];
-  systemd.automounts = [
-    # USB
-    {
-      where = "/usb";
-      automountConfig = { TimeoutIdleSec = "5"; };
-      wantedBy = [ "default.target" ];
-    }
-    # SD card
-    {
-      where = "/sdcard";
-      automountConfig = { TimeoutIdleSec = "5"; };
-      wantedBy = [ "default.target" ];
-    }
-  ];
-
   # Integrate pass with the browser
   programs.browserpass.enable = true;