diff --git a/home-manager/nextcloud.nix b/home-manager/nextcloud.nix
new file mode 100644
index 0000000..846a7cc
--- /dev/null
+++ b/home-manager/nextcloud.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, user, ... }:
+
+{
+  services.nextcloud-client = {
+    enable = true;
+    startInBackground = true;
+  };
+}
diff --git a/home-manager/sway/default.nix b/home-manager/sway/default.nix
index badef4d..a054229 100644
--- a/home-manager/sway/default.nix
+++ b/home-manager/sway/default.nix
@@ -126,7 +126,6 @@ in
 
       startup = [
         { command = "keepassxc"; }
-        { command = "nextcloud"; }
         { command = "swaymsg 'workspace 1"; }
         { command = "kitty"; }
         { command = "swaymsg 'workspace 2"; }
diff --git a/home-mandlm.nix b/home-mandlm.nix
index ec0f99c..d65486f 100644
--- a/home-mandlm.nix
+++ b/home-mandlm.nix
@@ -19,7 +19,6 @@
       gcc
       slack
       thunderbird
-      nextcloud-client
       keepassxc
       tree
       light
@@ -41,6 +40,7 @@
   programs.home-manager.enable = true;
 
   imports = [
+    ./home-manager/nextcloud.nix
     ./home-manager/firefox.nix
     ./home-manager/fzf.nix
     ./home-manager/git.nix