diff --git a/home/services/default.nix b/home/services/default.nix index c6da227..aeb9593 100644 --- a/home/services/default.nix +++ b/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; }; diff --git a/home/services/gpg-agent.nix b/home/services/gpg-agent.nix index 1a995b5..f4190d2 100644 --- a/home/services/gpg-agent.nix +++ b/home/services/gpg-agent.nix @@ -1,9 +1,11 @@ { ... }: { - gpg-agent = { - enable = true; - enableExtraSocket = true; - enableScDaemon = true; - enableSshSupport = true; - pinentryFlavor = "gnome3"; + services = { + gpg-agent = { + enable = true; + enableExtraSocket = true; + enableScDaemon = true; + enableSshSupport = true; + pinentryFlavor = "gnome3"; + }; }; } diff --git a/home/services/spotifyd.nix b/home/services/spotifyd.nix index c23f29e..7f50139 100644 --- a/home/services/spotifyd.nix +++ b/home/services/spotifyd.nix @@ -1,22 +1,24 @@ { 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"; + 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"; + }; }; }; };