consolidate configuration for music curation

3 files changed, 14 insertions, 18 deletions

diff --git a/users/fcuny/cli/default.nix b/users/fcuny/cli/default.nix
index 2478998..77d236e 100644
--- a/users/fcuny/cli/default.nix
+++ b/users/fcuny/cli/default.nix
@@ -1,15 +1,8 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ./backups.nix
-    ./beets.nix
-    ./git.nix
-    ./shell.nix
-    ./ssh.nix
-    ./tmux.nix
-    ./yt-dlp.nix
-  ];
+  imports =
+    [ ./backups.nix ./git.nix ./media.nix ./shell.nix ./ssh.nix ./tmux.nix ];
 
   home.packages = [ pkgs.gcc pkgs.gnumake pkgs.jq pkgs.ripgrep ];
 }
diff --git a/users/fcuny/cli/beets.nix b/users/fcuny/cli/media.nix
index 39802a7..2dc54a5 100644
--- a/users/fcuny/cli/beets.nix
+++ b/users/fcuny/cli/media.nix
@@ -1,6 +1,18 @@
 { config, lib, pkgs, ... }:
 
 {
+  xdg.configFile."yt-dlp/config".source = ../configs/yt-dlp/config;
+
+  home.packages = with pkgs; [
+    yt-dlp
+    flac
+    abcde
+    (pkgs.writers.writeDashBin "rip-flac" ''
+      ${pkgs.abcde}/bin/abcde -Vx -G -a "cddb,read,encode,tag,move,clean" -o flac
+    '')
+  ];
+
+  # inspired from https://blog.yossarian.net/2022/02/21/Enjoying-music-curation-again
   programs.beets = {
     enable = true;
     settings = {
diff --git a/users/fcuny/cli/yt-dlp.nix b/users/fcuny/cli/yt-dlp.nix
deleted file mode 100644
index d271692..0000000
--- a/users/fcuny/cli/yt-dlp.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  xdg.configFile."yt-dlp/config".source = ../configs/yt-dlp/config;
-
-  home.packages = with pkgs; [
-    yt-dlp
-  ];
-}