From 68e5bf2438262eea9255f3396754e6225ec30e88 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 3 Apr 2022 11:52:29 -0700 Subject: simplify multimedia for the desktop I don't need to have systemd units to synchronize medias from a desktop to the NAS: I'll download all the medias on the NAS directly. I don't need to have a module for each type of media, there's not enough configuration to justify that complexity. I also don't need anymore mpd and co. as I'm using navidrome to host the music on the NAS and sublime-music to listen to it on the desktop. --- users/fcuny/desktop/default.nix | 2 +- users/fcuny/desktop/media/default.nix | 11 ---------- users/fcuny/desktop/media/mpd.nix | 34 ------------------------------- users/fcuny/desktop/media/music.nix | 7 ------- users/fcuny/desktop/media/sync-music.nix | 30 --------------------------- users/fcuny/desktop/media/sync-videos.nix | 29 -------------------------- users/fcuny/desktop/media/videos.nix | 7 ------- users/fcuny/desktop/multimedia.nix | 15 ++++++++++++++ 8 files changed, 16 insertions(+), 119 deletions(-) delete mode 100644 users/fcuny/desktop/media/default.nix delete mode 100644 users/fcuny/desktop/media/mpd.nix delete mode 100644 users/fcuny/desktop/media/music.nix delete mode 100644 users/fcuny/desktop/media/sync-music.nix delete mode 100644 users/fcuny/desktop/media/sync-videos.nix delete mode 100644 users/fcuny/desktop/media/videos.nix create mode 100644 users/fcuny/desktop/multimedia.nix 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; + }; +} -- cgit 1.4.1