8 files changed, 16 insertions, 119 deletions
diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix
index 41def25..106e5c9 100644
--- a/users/fcuny/desktop/default.nix
+++ b/users/fcuny/desktop/default.nix
@@ -5,7 +5,7 @@
     ./browser.nix
     ./emacs.nix
     ./gtk.nix
-    ./media
+    ./multimedia.nix
     ./scanner-printer
     ./syncthing.nix
     ./terminal.nix
diff --git a/users/fcuny/desktop/media/default.nix b/users/fcuny/desktop/media/default.nix
deleted file mode 100644
index 23c2fae..0000000
--- a/users/fcuny/desktop/media/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./mpd.nix
-    ./music.nix
-    ./sync-music.nix
-    ./sync-videos.nix
-    ./videos.nix
-  ];
-}
diff --git a/users/fcuny/desktop/media/mpd.nix b/users/fcuny/desktop/media/mpd.nix
deleted file mode 100644
index a779158..0000000
--- a/users/fcuny/desktop/media/mpd.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = [
-    pkgs.mpd
-    pkgs.ncmpcpp
-  ];
-
-  xdg.configFile."ncmpcpp/config".source = ../../configs/ncmpcpp/config;
-
-  services.mpd = {
-    enable = true;
-    musicDirectory = config.xdg.userDirs.music;
-    network.startWhenNeeded = true;
-    extraConfig = ''
-      auto_update "yes"
-      filesystem_charset "UTF-8"
-      zeroconf_enabled "no"
-      input {
-        plugin "curl"
-      }
-      audio_output {
-        type "pipewire"
-        name "PipeWire Sound Server"
-      }
-      audio_output {
-        type   "fifo"
-        name   "visualizer"
-        path   "/tmp/mpd.fifo"
-        format "44100:16:2"
-      }
-    '';
-  };
-}
diff --git a/users/fcuny/desktop/media/music.nix b/users/fcuny/desktop/media/music.nix
deleted file mode 100644
index ada357a..0000000
--- a/users/fcuny/desktop/media/music.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = [
-    pkgs.pavucontrol
-  ];
-}
diff --git a/users/fcuny/desktop/media/sync-music.nix b/users/fcuny/desktop/media/sync-music.nix
deleted file mode 100644
index 85e795a..0000000
--- a/users/fcuny/desktop/media/sync-music.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  systemd.user.services.sync-music = {
-    Unit = {
-      Description = "synchronize my music collection to the NAS";
-      Documentation = "man:rsync(1)";
-      ConditionFileIsExecutable = "${pkgs.rsync}/bin/rsync";
-      ConditionHost = "carmel";
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.rsync}/bin/rysnc -avz -t %h/media/music/ nas.home:/data/music";
-    };
-  };
-
-  systemd.user.timers.sync-music = {
-    Unit = {
-      Description = "synchronize my music collection to the NAS";
-      Documentation = "man:rsync(1)";
-    };
-    Timer = {
-      OnBootSec = "120m";
-      OnUnitActiveSec = "1d";
-      RandomizedDelaySec = "1800";
-      Persistent = true;
-    };
-    Install = { WantedBy = [ "timers.target" ]; };
-  };
-}
diff --git a/users/fcuny/desktop/media/sync-videos.nix b/users/fcuny/desktop/media/sync-videos.nix
deleted file mode 100644
index ced319d..0000000
--- a/users/fcuny/desktop/media/sync-videos.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  systemd.user.services.sync-videos = {
-    Unit = {
-      Description = "synchronize my videos to the NAS";
-      Documentation = "man:rsync(1)";
-      ConditionFileIsExecutable = "${pkgs.rsync}/bin/rsync";
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.rsync}/bin/rysnc -avz -t %h/media/videos/ nas.home:/data/videos/incoming";
-    };
-  };
-
-  systemd.user.timers.sync-videos = {
-    Unit = {
-      Description = "synchronize my videos to the NAS";
-      Documentation = "man:rsync(1)";
-    };
-    Timer = {
-      OnBootSec = "120m";
-      OnUnitActiveSec = "1d";
-      RandomizedDelaySec = "1800";
-      Persistent = true;
-    };
-    Install = { WantedBy = [ "timers.target" ]; };
-  };
-}
diff --git a/users/fcuny/desktop/media/videos.nix b/users/fcuny/desktop/media/videos.nix
deleted file mode 100644
index 018488b..0000000
--- a/users/fcuny/desktop/media/videos.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.packages = [
-    pkgs.vlc
-  ];
-}
diff --git a/users/fcuny/desktop/multimedia.nix b/users/fcuny/desktop/multimedia.nix
new file mode 100644
index 0000000..34347b8
--- /dev/null
+++ b/users/fcuny/desktop/multimedia.nix
@@ -0,0 +1,15 @@
+{ lib, config, pkgs, ... }:
+
+{
+  home.packages = [ pkgs.pavucontrol pkgs.vlc pkgs.sublime-music ];
+  programs.mpv = {
+    enable = true;
+    config = {
+      sub-auto = "fuzzy";
+      vo = "gpu";
+      hwdec = "auto-safe";
+      gpu-context = "wayland";
+    };
+    scripts = lib.attrVals [ "sponsorblock" ] pkgs.mpvScripts;
+  };
+}