diff --git a/home/isabel/services/shared/cloud/default.nix b/home/isabel/services/shared/cloud/default.nix
index 354d9d6e7..cf7ffd887 100644
--- a/home/isabel/services/shared/cloud/default.nix
+++ b/home/isabel/services/shared/cloud/default.nix
@@ -4,10 +4,10 @@
   pkgs,
   ...
 }: let
-  inherit (lib) mkIf isAcceptedDevice isWayland;
+  inherit (lib) mkIf isAcceptedDevice mkGraphicalService;
   acceptedTypes = ["desktop" "laptop" "lite" "hybrid"];
 in {
-  config = mkIf ((isAcceptedDevice osConfig acceptedTypes) && (isWayland osConfig)) {
+  config = mkIf (isAcceptedDevice osConfig acceptedTypes) {
     /*
     services = {
       nextcloud-client.enable = true;
@@ -17,8 +17,12 @@ in {
 
     home.packages = [pkgs.nextcloud-client];
 
-    systemd.user.services.nextcloud = lib.mkGraphicalService {
-      Unit.Description = "Nextcloud client service";
+    systemd.user.services.nextcloud = mkGraphicalService {
+      Unit = {
+        Description = "Nextcloud sync client service";
+        After = "network-online.target";
+      };
+
       Service = {
         ExecStart = "${pkgs.nextcloud-client}/bin/nextcloud --background";
         Restart = "always";
diff --git a/lib/default.nix b/lib/default.nix
index 79500e975..70f651b26 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -9,5 +9,6 @@
   services = import ./services.nix {inherit lib;};
   validators = import ./validators.nix {inherit lib;};
   helpers = import ./helpers.nix {inherit lib;};
+  hardware = import ./hardware.nix {inherit lib;};
 in
-  nixpkgs.lib.extend (_: _: builders // services // validators // helpers)
+  nixpkgs.lib.extend (_: _: builders // services // validators // helpers // hardware)