diff --git a/overlays/default.nix b/overlays/default.nix
index 8fd97c39..b8657361 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -12,7 +12,8 @@
     };
 
   modifications = final: prev: rec {
-    # dconf-editor-wrapped = import ./dconf-editor.nix { inherit final prev; }; # Only kept as an example, has nothing to do with current dconf-editor-wrapped derivation
+    # Only kept as an example, has nothing to do with current dconf-editor-wrapped derivation
+    # dconf-editor-wrapped = import ./dconf-editor.nix { inherit final prev; };
     # Use dconf-editor.nix: { final, prev }: final.<package>.overrideAttrs (oldAttrs: { ... }) or sth similar
   };
 in
diff --git a/system/default.nix b/system/default.nix
index 578a1249..913f36a2 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -359,6 +359,7 @@ with mylib.networking; {
       "networkmanager"
       "wheel"
       "audio"
+      "video"
       "pipewire"
       "realtime"
       "gamemode"
@@ -515,8 +516,8 @@ with mylib.networking; {
       ];
     };
 
-    gnome.gnome-keyring.enable = false; # TODO: Do apps require this?
-    gnome.gcr-ssh-agent.enable = false;
+    gnome.gnome-keyring.enable = true; # Apps (e.g. nextcloud) require this
+    gnome.gcr-ssh-agent.enable = false; # TODO: Use this instead of ssh.startAgent?
   };
 
   virtualisation = {