From c52c7f314ccadcc2fcd91e28c8fd1b88f6d5ce0c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 18 Oct 2024 17:07:46 +0200 Subject: refactor(modules): Move all system modules to `by-name` From now on all modules should be added to the new `by-name` directory. This should help remove the (superficial and utterly useless) distinction between `home-manager` and `NixOS` modules. --- .../home/conf/beets/plugins/badfiles/default.nix | 13 --- modules/home/conf/beets/plugins/default.nix | 16 ---- .../home/conf/beets/plugins/duplicates/default.nix | 5 -- modules/home/conf/beets/plugins/fuzzy/default.nix | 6 -- modules/home/conf/beets/plugins/ihate/default.nix | 8 -- modules/home/conf/beets/plugins/inline/default.nix | 42 ---------- .../home/conf/beets/plugins/lastgenre/default.nix | 7 -- modules/home/conf/beets/plugins/lyrics/default.nix | 6 -- .../home/conf/beets/plugins/mbsubmit/default.nix | 9 -- modules/home/conf/beets/plugins/play/default.nix | 14 ---- .../home/conf/beets/plugins/replaygain/default.nix | 24 ------ .../conf/beets/plugins/smartplaylist/default.nix | 33 -------- .../home/conf/beets/plugins/xtractor/default.nix | 95 ---------------------- 13 files changed, 278 deletions(-) delete mode 100644 modules/home/conf/beets/plugins/badfiles/default.nix delete mode 100644 modules/home/conf/beets/plugins/default.nix delete mode 100644 modules/home/conf/beets/plugins/duplicates/default.nix delete mode 100644 modules/home/conf/beets/plugins/fuzzy/default.nix delete mode 100644 modules/home/conf/beets/plugins/ihate/default.nix delete mode 100644 modules/home/conf/beets/plugins/inline/default.nix delete mode 100644 modules/home/conf/beets/plugins/lastgenre/default.nix delete mode 100644 modules/home/conf/beets/plugins/lyrics/default.nix delete mode 100644 modules/home/conf/beets/plugins/mbsubmit/default.nix delete mode 100644 modules/home/conf/beets/plugins/play/default.nix delete mode 100644 modules/home/conf/beets/plugins/replaygain/default.nix delete mode 100644 modules/home/conf/beets/plugins/smartplaylist/default.nix delete mode 100644 modules/home/conf/beets/plugins/xtractor/default.nix (limited to 'modules/home/conf/beets/plugins') diff --git a/modules/home/conf/beets/plugins/badfiles/default.nix b/modules/home/conf/beets/plugins/badfiles/default.nix deleted file mode 100644 index 33884785..00000000 --- a/modules/home/conf/beets/plugins/badfiles/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - programs.beets.settings.badfiles = { - check_on_import = true; - commands = { - flac = "${lib.getExe' pkgs.flac "flac"} --test --warnings-as-errors --silent"; - mp3 = "${lib.getExe pkgs.mp3val}"; - }; - }; -} diff --git a/modules/home/conf/beets/plugins/default.nix b/modules/home/conf/beets/plugins/default.nix deleted file mode 100644 index 3bea5ea8..00000000 --- a/modules/home/conf/beets/plugins/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{...}: { - imports = [ - ./badfiles - ./duplicates - ./fuzzy - ./ihate - ./inline - ./lastgenre - ./lyrics - ./mbsubmit - ./play - ./replaygain - ./smartplaylist - ./xtractor - ]; -} diff --git a/modules/home/conf/beets/plugins/duplicates/default.nix b/modules/home/conf/beets/plugins/duplicates/default.nix deleted file mode 100644 index c8a6c108..00000000 --- a/modules/home/conf/beets/plugins/duplicates/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - programs.beets.settings.duplicates = { - keys = ["acoustid_fingerprint"]; - }; -} diff --git a/modules/home/conf/beets/plugins/fuzzy/default.nix b/modules/home/conf/beets/plugins/fuzzy/default.nix deleted file mode 100644 index b86b3a20..00000000 --- a/modules/home/conf/beets/plugins/fuzzy/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - programs.beets.settings.fuzzy = { - # The prefix denoting that a search should be run in fuzzy mode - prefix = "."; - }; -} diff --git a/modules/home/conf/beets/plugins/ihate/default.nix b/modules/home/conf/beets/plugins/ihate/default.nix deleted file mode 100644 index 145f5f8b..00000000 --- a/modules/home/conf/beets/plugins/ihate/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{...}: { - programs.beets.settings.ihate = { - warn = [ - "title:commentary" - "albumtype:live" - ]; - }; -} diff --git a/modules/home/conf/beets/plugins/inline/default.nix b/modules/home/conf/beets/plugins/inline/default.nix deleted file mode 100644 index 0dda8cfc..00000000 --- a/modules/home/conf/beets/plugins/inline/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{...}: { - programs.beets.settings = { - item_fields = { - # Taken from https://github.com/trapd00r/configs/blob/4f3dada5700846cca6c2869e6fa6b3c795b87b67/beets/config.yaml - first_artist = - /* - python - */ - '' - # import an album to another artists directory, like: - # Tom Jones │1999│ Burning Down the House [Single, CD, FLAC] - # to The Cardigans/+singles/Tom Jones & the Cardigans │1999│ Burning Down the House [Single, CD, FLAC] - # https://github.com/beetbox/beets/discussions/4012#discussioncomment-1021414 - # beet import --set myartist='The Cardigans' - # we must first check to see if myartist is defined, that is, given on - # import time, or we raise an NameError exception. - try: - myartist - except NameError: - import re - return re.split(',|\\s+(feat(.?|uring)|&|(Vs|Ft).)', albumartist, 1, flags=re.IGNORECASE)[0] - else: - return myartist - ''; - - first_artist_singleton = - /* - python - */ - '' - try: - myartist - except NameError: - import re - return re.split(',|\\s+(feat(.?|uring)|&|(Vs|Ft).)', artist, 1, flags=re.IGNORECASE)[0] - else: - return myartist - ''; - }; - album_fields = {}; - }; -} diff --git a/modules/home/conf/beets/plugins/lastgenre/default.nix b/modules/home/conf/beets/plugins/lastgenre/default.nix deleted file mode 100644 index d10ca49f..00000000 --- a/modules/home/conf/beets/plugins/lastgenre/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{...}: { - programs.beets.settings.lastgenre = { - prefer_specific = false; - # Lookup the track, not the album - source = "track"; - }; -} diff --git a/modules/home/conf/beets/plugins/lyrics/default.nix b/modules/home/conf/beets/plugins/lyrics/default.nix deleted file mode 100644 index 80544aea..00000000 --- a/modules/home/conf/beets/plugins/lyrics/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{...}: { - programs.beets.settings.lyrics = { - # Always fetch lyrics (and update them, if some were found) - force = true; - }; -} diff --git a/modules/home/conf/beets/plugins/mbsubmit/default.nix b/modules/home/conf/beets/plugins/mbsubmit/default.nix deleted file mode 100644 index b70f1c63..00000000 --- a/modules/home/conf/beets/plugins/mbsubmit/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - lib, - pkgs, - ... -}: { - programs.beets.settings.mbsubmit = { - picard_path = lib.getExe pkgs.picard; - }; -} diff --git a/modules/home/conf/beets/plugins/play/default.nix b/modules/home/conf/beets/plugins/play/default.nix deleted file mode 100644 index f5bc3c9b..00000000 --- a/modules/home/conf/beets/plugins/play/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: { - programs.beets.settings.play = { - command = "${lib.getExe pkgs.mpc-cli} $args add"; - relative_to = config.services.mpd.musicDirectory; - - # Run the command with the returned paths as arguments - raw = true; - }; -} diff --git a/modules/home/conf/beets/plugins/replaygain/default.nix b/modules/home/conf/beets/plugins/replaygain/default.nix deleted file mode 100644 index 611f3799..00000000 --- a/modules/home/conf/beets/plugins/replaygain/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{...}: { - programs.beets.settings = { - replaygain = { - auto = true; - backend = "ffmpeg"; - - r128_targetlevel = 89; - - # Re-calculate the replay gain value even for files, that already have one set. - overwrite = true; - }; - - hook = { - hooks = [ - { - # Also generate the replaygain for the album variant (so selecting between - # track and album becomes possible) - event = "import"; - command = "echo Remember to run 'beet replaygain --album' to generate the album replaygain values for the imported songs!"; - } - ]; - }; - }; -} diff --git a/modules/home/conf/beets/plugins/smartplaylist/default.nix b/modules/home/conf/beets/plugins/smartplaylist/default.nix deleted file mode 100644 index b55c487c..00000000 --- a/modules/home/conf/beets/plugins/smartplaylist/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{config, ...}: { - programs.beets.settings.smartplaylist = { - relative_to = config.services.mpd.musicDirectory; - playlist_dir = config.services.mpd.playlistDirectory; - forward_slash = false; - - # Show the real m3u file paths, when running `--pretend` - pretend_paths = true; - - playlists = [ - { - name = "artists-$first_artist.m3u"; - query = ""; - } - { - name = "ratings-good.m3u"; - query = "rating:0.7..1.0"; - } - { - name = "ratings-mediocre.m3u"; - query = "rating:0.4..0.7"; - } - { - name = "ratings-bad.m3u"; - query = "rating:0.0..0.4"; - } - { - name = "not_played.m3u"; - query = "-play_count: artist:"; - } - ]; - }; -} diff --git a/modules/home/conf/beets/plugins/xtractor/default.nix b/modules/home/conf/beets/plugins/xtractor/default.nix deleted file mode 100644 index d4582c5f..00000000 --- a/modules/home/conf/beets/plugins/xtractor/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: { - programs.beets.settings = { - xtractor = { - # This option is not yet implemented, thus requiring the hook - auto = true; - - dry-run = false; - # Writes the bpm key to the media files - write = true; - threads = 0; - # Also run for files, which already have the required keys - force = true; - quiet = false; - keep_output = true; - keep_profiles = true; - output_path = "${config.xdg.dataHome}/beets/xtactor"; - essentia_extractor = "${lib.getExe pkgs.essentia-extractor}"; - extractor_profile = { - highlevel = { - svm_models = let - m = pkgs.beetsExtraPlugins.xtractor.models; - in [ - "${m}/danceability.history" - "${m}/danceability.history.param" - "${m}/danceability.history.results.html" - "${m}/gender.history" - "${m}/gender.history.param" - "${m}/gender.history.results.html" - "${m}/genre_dortmund.history" - "${m}/genre_dortmund.history.param" - "${m}/genre_dortmund.history.results.html" - "${m}/genre_electronic.history" - "${m}/genre_electronic.history.param" - "${m}/genre_electronic.history.results.html" - "${m}/genre_rosamerica.history" - "${m}/genre_rosamerica.history.param" - "${m}/genre_rosamerica.history.results.html" - "${m}/genre_tzanetakis.history" - "${m}/genre_tzanetakis.history.param" - "${m}/genre_tzanetakis.history.results.html" - "${m}/ismir04_rhythm.history" - "${m}/ismir04_rhythm.history.param" - "${m}/ismir04_rhythm.history.results.html" - "${m}/mood_acoustic.history" - "${m}/mood_acoustic.history.param" - "${m}/mood_acoustic.history.results.html" - "${m}/mood_aggressive.history" - "${m}/mood_aggressive.history.param" - "${m}/mood_aggressive.history.results.html" - "${m}/mood_electronic.history" - "${m}/mood_electronic.history.param" - "${m}/mood_electronic.history.results.html" - "${m}/mood_happy.history" - "${m}/mood_happy.history.param" - "${m}/mood_happy.history.results.html" - "${m}/mood_party.history" - "${m}/mood_party.history.param" - "${m}/mood_party.history.results.html" - "${m}/mood_relaxed.history" - "${m}/mood_relaxed.history.param" - "${m}/mood_relaxed.history.results.html" - "${m}/mood_sad.history" - "${m}/mood_sad.history.param" - "${m}/mood_sad.history.results.html" - "${m}/moods_mirex.history" - "${m}/moods_mirex.history.param" - "${m}/moods_mirex.history.results.html" - "${m}/timbre.history" - "${m}/timbre.history.param" - "${m}/timbre.history.results.html" - "${m}/tonal_atonal.history" - "${m}/tonal_atonal.history.param" - "${m}/tonal_atonal.history.results.html" - "${m}/voice_instrumental.history" - "${m}/voice_instrumental.history.param" - "${m}/voice_instrumental.history.results.html" - ]; - }; - }; - }; - hook = { - hooks = [ - { - event = "import"; - command = "echo Remember to run 'beet xtractor'!"; - } - ]; - }; - }; -} -- cgit 1.4.1