Update XMonad config

.config/beets/config.yaml

@@ -1,61 +1,78 @@
 directory: ~/Music
 library: ~/Music/musiclibrary.db
-plugins: inline edit fetchart embedart mbsync albumtypes smartplaylist lyrics the info lastimport types ftintitle scrub fuzzy chroma limit replaygain random summarize musicbrainz
 format_item: %the{$artist} - %the{$album} ($original_year)$atypes - %the{$title}
 format_album: %the{$albumartist} - %the{$album} ($original_year)$atypes
 sort_item: artist+ original_year+ original_month+ album+ disc+ track+
 sort_album: albumartist+ original_year+ original_month+ album+
 original_date: yes
-item_fields:
-  multidisc: 1 if disctotal > 1 else 0
-type:
-  play_count: int
 import:
   move: yes
   timid: yes
 paths:
   default: $albumartist/[$original_year]$atypes $album%aunique{}/%if{$multidisc,$disc-}$track $title
   singleton: $artist/$title
-musicbrainz:
-  searchlimit: 10
+plugins: albumtypes autobpm chroma edit embedart fetchart fish ftintitle fuzzy info inline lastgenre lastimport limit lyrics mbsync mpdupdate musicbrainz random replaygain scrub smartplaylist summarize the types web
+chroma:
+  auto: no
+embedart:
+  auto: no
+  remove_art_file: yes
 fetchart:
   cautious: yes
   minwidth: 250
   maxwidth: 1000
   enforce_ratio: 1%
-  sources: filesystem wikipedia coverart amazon albumart
-embedart:
+  sources: [filesystem, wikipedia, coverart, amazon, albumart]
+ftintitle:
+  drop: yes
+  custom_words: ['ft.', '&', 'featuring']
+fuzzy:
+  threshold: 0.8
+item_fields:
+  multidisc: 1 if disctotal > 1 else 0
+lastgenre:
+  canonical: yes
+  fallback: ''
+  force: yes
+  keep_existing: no
+  whitelist: ~/.config/beets/genres.txt
+lyrics:
   auto: no
-  remove_art_file: yes
+  fallback: ''
+musicbrainz:
+  searchlimit: 10
+replaygain:
+  command: mp3gain
 smartplaylist:
   relative_to: ~/Music
   playlist_dir: ~/.local/share/mpd/playlists
+  auto: yes
   playlists:
-    - name: Metal_Before_90s.m3u
-      query: 'genre:Metal original_year:..1989'
-    - name: 90s_Power_Metal.m3u
-      query: 'genre:"Power Metal" original_year:1990..1999'
-    - name: 2000plus_Power_Metal.m3u
-      query: 'genre:"Power Metal" original_year:2000..'
-    - name: Symphonic_Metal.m3u
-      query: 'genre:"Symphonic Metal"'
-    - name: Gothic_Metal.m3u
-      query: 'genre:"Gothic Metal"'
+    - name: 80s.m3u
+      query: 'original_year:1980..1989 original_year+ artist+'
+    - name: 90s.m3u
+      query: 'original_year:1990..1999 original_year+ artist+'
+    - name: 2000s.m3u
+      query: 'original_year:2000..2009 original_year+ artist+'
+    - name: 2010s.m3u
+      query: 'original_year:2010..2019 original_year+ artist+'
+    - name: 2020s.m3u
+      query: 'original_year:2020..2029 original_year+ artist+'
+    - name: Black_Metal.m3u
+      query: 'genres:"Black Metal"'
     - name: 90s_Black_Metal.m3u
-      query: 'genre:"Black Metal" original_year:1990..1999'
-    - name: Symphonic_and_Melodic_Black.m3u
-      query: ['genre:"Symphonic Black Metal"', 'genre:"Melodic Black Metal"']
+      query: 'genres:"Black Metal" original_year:1990..1999 original_year+ artist+'
+    - name: Power_Metal.m3u
+      query: 'genres:"Power Metal"'
+    - name: 2000s_Power_Metal.m3u
+      query: 'genres:"Power Metal" original_year:2000..2009 original_year+ artist+'
+    - name: Rock.m3u
+      query: 'genres:Rock ^genres:"Post-Rock"'
+    - name: Symphonic_Metal.m3u
+      query: 'genres:"Symphonic Metal"'
 the:
   patterns: ^Il\s ^La\s ^Lo\s ^Gli\s ^Le\s
-ftintitle:
-  drop: yes
-scrub:
-  auto: no
-fuzzy:
-  threshold: 0.8
-chroma:
-  auto: no
-replaygain:
-  command: mp3gain
-include: [ lyrics.yaml, lastfm.yaml ]
+type:
+  lastfm_play_count: int
 
+include: [ lastfm.yaml ]

.config/xmonad/xmonad.hs

@@ -155,8 +155,8 @@ myLayoutHook = onWorkspace "2:\xe743 " myWebLayout $ onWorkspace "3:\xf1b6 " myG
         tabbed shrinkText myTabConfig
     myTabConfig =
       def
-        { activeColor = "#737aa2",
-          inactiveColor = "#24283b"
+        { activeColor = "#24283b",
+          inactiveColor = "#737aa2"
         }
     tiled = Tall nmaster delta ratio
     nmaster = 1
@@ -197,16 +197,9 @@ myXmobarPP =
 -- Autostart
 myStartupHook :: X ()
 myStartupHook = do
-  spawnOnce "xsetroot -cursor_name left_ptr"
   spawnOnce myScreenSetup
---  spawnOnce $
---    "xrandr --output HDMI-1-0 --preferred --primary --output eDP-1 --right-of HDMI-1-0 --preferred && ~/.fehbg"
---      ++ " && picom -b -c"
+  spawnOnce "xsetroot -cursor_name left_ptr"
   spawnOnce "xautolock -time 10 -locker slock -detectsleep"
---  spawnOnce
---    "trayer -l --edge top --align right --SetDockType true \
---    \--SetPartialStrut true --expand true --widthtype request \
---    \--tint 0x232634 --height 18 --monitor 1"
   spawnOnce "redshift-gtk"
   spawnOnce "udiskie"
   spawnOnce "nm-applet"