From cf00e10ef3040fbf2142b717f77dd1d18c5d1371 Mon Sep 17 00:00:00 2001
From: Ryan Kavanagh <rak@debian.org>
Date: Thu, 25 Jul 2013 07:53:25 -0400
Subject: Update beets config location

---
 .beetsconfig              | 13 -------------
 .config/beets/config.yaml | 16 ++++++++++++++++
 Makefile                  |  2 +-
 3 files changed, 17 insertions(+), 14 deletions(-)
 delete mode 100644 .beetsconfig
 create mode 100644 .config/beets/config.yaml

diff --git a/.beetsconfig b/.beetsconfig
deleted file mode 100644
index af9f3f4..0000000
--- a/.beetsconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[beets]
-directory: ~/music_clean
-library: ~/.beetsmusic.blb
-path_format: $format/$artist/$album/$track $title
-import_incremental: yes
-import_quiet_fallback: skip
-import_log: ~/music_clean/import_log
-import_move: yes
-
-[paths]
-default: $format/$albumartist/$album/$track $title
-singleton: $format/Singletons/$artist - $title
-comp: $format/comp/$album/$track $title
diff --git a/.config/beets/config.yaml b/.config/beets/config.yaml
new file mode 100644
index 0000000..4a9715a
--- /dev/null
+++ b/.config/beets/config.yaml
@@ -0,0 +1,16 @@
+# Automatically migrated from legacy .beetsconfig.
+
+directory: ~/music_clean
+library: ~/.beetsmusic.blb
+path_format: $format/$artist/$album/$track $title
+
+import:
+    incremental: true
+    quiet_fallback: skip
+    log: ~/music_clean/import_log
+    move: true
+
+paths:
+    default: $format/$albumartist/$album/$track $title
+    singleton: $format/Singletons/$artist - $title
+    comp: $format/comp/$album/$track $title
diff --git a/Makefile b/Makefile
index ef90e15..6c24f77 100755
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ GLOBAL_FILES = \
     .Xdefaults \
     .Xsession \
     .asoundrc \
-    .beetsconfig \
     .calendar/ \
+    .config/beets/ \
     .config/fontconfig/ \
     .config/nitrogen/ \
     .config/zathura/ \
-- 
cgit v1.2.3