refactor services

home/services/default.nix

@@ -1,14 +1,9 @@
 { ... }: {
-  imports = [
-    ./media.nix
-  ];
-  services.blueman-applet.enable = true;
-  services.gnome-keyring.enable = true;
-  services.gpg-agent = {
-    enable = true;
-    enableExtraSocket = true;
-    enableScDaemon = true;
-    enableSshSupport = true;
-    pinentryFlavor = "gnome3";
+  services = {
+    imports = [
+      ./spotifyd.nix
+    ];
+    blueman-applet.enable = true;
+    gnome-keyring.enable = true;
   };
 }

home/services/media.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }: {
-  services = {
-    spotifyd = {
-      enable = true;
-      package = pkgs.spotifyd.override {
-        withKeyring = true;
-        withMpris = true;
-      };
-      settings = {
-        global = {
-          use_keyring = true;
-          use_mpris = true;
-          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";
-          backend = "pulseaudio";
-          no_audio_cache = true;
-          dbus_type = "session";
-        };
-      };
-    };
-  };
-}

home/services/spotifyd.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }: {
+  spotifyd = {
+    enable = true;
+    package = pkgs.spotifyd.override {
+      withKeyring = true;
+      withMpris = true;
+    };
+    settings = {
+      global = {
+        use_keyring = true;
+        use_mpris = true;
+        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";
+        backend = "pulseaudio";
+        no_audio_cache = true;
+        dbus_type = "session";
+      };
+    };
+  };
+}