fix broken import

home/services/default.nix

@@ -1,9 +1,9 @@
 { ... }: {
+  imports = [
+    ./gpg-agent.nix
+    ./spotifyd.nix
+  ];
   services = {
-    imports = [
-      ./gpg-agent.nix
-      ./spotifyd.nix
-    ];
     blueman-applet.enable = true;
     gnome-keyring.enable = true;
   };

home/services/gpg-agent.nix

@@ -1,9 +1,11 @@
 { ... }: {
-  gpg-agent = {
+  services = {
-    enable = true;
+    gpg-agent = {
-    enableExtraSocket = true;
+      enable = true;
-    enableScDaemon = true;
+      enableExtraSocket = true;
-    enableSshSupport = true;
+      enableScDaemon = true;
-    pinentryFlavor = "gnome3";
+      enableSshSupport = true;
+      pinentryFlavor = "gnome3";
+    };
   };
 }

home/services/spotifyd.nix

@@ -1,22 +1,24 @@
 { pkgs, ... }: {
-  spotifyd = {
+  services = {
-    enable = true;
+    spotifyd = {
-    package = pkgs.spotifyd.override {
+      enable = true;
-      withKeyring = true;
+      package = pkgs.spotifyd.override {
-      withMpris = true;
+        withKeyring = true;
-    };
+        withMpris = true;
-    settings = {
+      };
-      global = {
+      settings = {
-        use_keyring = true;
+        global = {
-        use_mpris = true;
+          use_keyring = true;
-        username_cmd = ''
+          use_mpris = true;
-          ${pkgs.libsecret}/bin/secret-tool search --all service spotifyd 2>&1 | grep 'username' | awk -F'= ' '{print $2}'
+          username_cmd = ''
-        '';
+            ${pkgs.libsecret}/bin/secret-tool search --all service spotifyd 2>&1 | grep 'username' | awk -F'= ' '{print $2}'
-        device_name = "Skipperd";
+          '';
-        device_type = "computer";
+          device_name = "Skipperd";
-        backend = "pulseaudio";
+          device_type = "computer";
-        no_audio_cache = true;
+          backend = "pulseaudio";
-        dbus_type = "session";
+          no_audio_cache = true;
+          dbus_type = "session";
+        };
       };
     };
   };