Change mpv for mplayer, fixes emacs/emms/MPRIS issues I was having

Reorganise, remove home/media/default.nix and move some home.package
definitions that I'd missed into relevant environment.systemPackages

flake.nix

@@ -25,7 +25,6 @@
         homeModules = [
           ./home/accounts/default.nix
           ./home/hyprland/default.nix
-          ./home/media/default.nix
           ./home/nyxt/default.nix
           ./home/alacritty.nix
           ./home/default.nix

home/hyprland/default.nix

@@ -1,11 +1,4 @@
 { config, lib, pkgs, ... }: {
-  home.packages = with pkgs; [
-    grim
-    slurp
-    signal-desktop
-    whatsapp-for-linux
-    webcord
-  ];
   imports = [ ./waybar/default.nix ./rofi/default.nix ./gtk.nix ./mako.nix ];
   services = {
     avizo.enable = true;

home/hyprland/gtk.nix

@@ -1,6 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }: {
-
-{
   gtk = {
     enable = true;
     cursorTheme = {

home/hyprland/waybar/default.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, ... }: {
-  home.packages = with pkgs; [ networkmanagerapplet bluez ];
   systemd.user.targets.tray.Unit = {
     Description = "Home Manager System Tray";
     Requires = [ "graphical-session-pre.target" ];

home/media/default.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ tagger ];
-  programs.mpv = {
-    enable = true;
-    scripts = with pkgs.mpvScripts; [
-      mpris
-      autoload
-      thumbfast
-      thumbnail
-      sponsorblock
-      quality-menu
-      webtorrent-mpv-hook
-    ];
-  };
-}

system/desktop.nix

@@ -11,6 +11,8 @@
     protonvpn-cli
     protonvpn-gui
     transmission-gtk
+    mplayer
+    tagger
     libreoffice
     remmina
     minesweep-rs

system/hyprland.nix

@@ -22,11 +22,17 @@
       wtype
       wl-clipboard
       grim
+      slurp
       swayimg
       pamixer
       pavucontrol
       playerctl
       brightnessctl
+      networkmanagerapplet
+      bluez
+      signal-desktop
+      whatsapp-for-linux
+      webcord
     ];
   };
   services = {