rmpc cfg update

2 files changed, 207 insertions, 256 deletions

diff --git a/.config/rmpc/config.ron b/.config/rmpc/config.ron
index 31ec749..fbd8c5c 100644
--- a/.config/rmpc/config.ron
+++ b/.config/rmpc/config.ron
@@ -107,111 +107,108 @@
   tabs: [
   (
       name: "Queue",
-      border_type: None,
       pane: Split(
-        direction: Horizontal,
+        direction: Vertical,
         panes: [
         (
-            size: "40%",
-            borders: "RIGHT",
+            size: "100%",
+            borders: "NONE",
             pane: Split(
-              direction: Vertical,
+              borders: "NONE",
+              direction: Horizontal,
               panes: [
               (
-                  size: "3",
-                  pane: Pane(Lyrics),
+                  size: "70%",
+                  borders: "ALL",
+                  pane: Pane(Queue),
                 ),
               (
-                  size: "100%",
-                  pane: Pane(AlbumArt),
-                )
-              ],
+                  size: "30%",
+                  borders: "NONE",
+                  pane: Split(
+                    direction: Vertical,
+                    panes: [
+                    (
+                        size: "75%",
+                        borders: "ALL",
+                        pane: Pane(AlbumArt),
+                      ),
+                    (
+                        size: "25%",
+                        borders: "NONE",
+                        pane: Split(
+                          direction: Vertical,
+                          panes: [
+                          (
+                              size: "100%",
+                              pane: Pane(Lyrics),
+                            ),
+                          ]
+                        ),
+                      ),
+                    ]
+                  ),
+                ),
+              ]
             ),
           ),
-        (
-            size: "60%",
-            pane: Pane(Queue),
-          ),
         ],
       ),
     ),
   (
       name: "Directories",
-      border_type: None,
-      pane: Pane(Directories),
+      pane: Split(
+        direction: Horizontal,
+        panes: [(size: "100%", borders: "ALL", pane: Pane(Directories))],
+      ),
     ),
   (
       name: "Artists",
-      border_type: None,
-      pane: Pane(Artists),
+      pane: Split(
+        direction: Horizontal,
+        panes: [(size: "100%", borders: "ALL", pane: Pane(Artists))],
+      ),
     ),
   (
       name: "Album Artists",
-      border_type: None,
-      pane: Pane(AlbumArtists),
+      pane: Split(
+        direction: Horizontal,
+        panes: [(size: "100%", borders: "ALL", pane: Pane(AlbumArtists))],
+      ),
     ),
   (
       name: "Albums",
-      border_type: None,
-      pane: Pane(Albums),
+      pane: Split(
+        direction: Horizontal,
+        panes: [(size: "100%", borders: "ALL", pane: Pane(Albums))],
+      ),
     ),
   (
       name: "Playlists",
-      border_type: None,
-      pane: Pane(Playlists),
+      pane: Split(
+        direction: Horizontal,
+        panes: [(size: "100%", borders: "ALL", pane: Pane(Playlists))],
+      ),
     ),
   (
       name: "Search",
-      border_type: None,
-      pane: Pane(Search),
+      pane: Split(
+        direction: Horizontal,
+        panes: [(size: "100%", borders: "ALL", pane: Pane(Search))],
+      ),
     ),
   (
-      name: "Testing",
-      border_type: Single,
+      name: "Browser",
       pane: Split(
         direction: Horizontal,
-        panes: [
-        (
-            size: "40%",
-            pane: Pane(Queue),
-          ),
-        (
-            size: "60%",
-            pane: Split(
-              direction: Vertical,
-              panes: [
-              (
-                  size: "50%",
-                  pane: Pane(Directories),
-                ),
-              (
-                  size: "50%",
-                  pane: Split(
-                    direction: Horizontal,
-                    panes: [
-                    (
-                        size: "60%",
-                        pane: Split(
-                          direction: Vertical,
-                          panes: [
-                          (
-                              size: "50%",
-                              pane: Pane(Albums),
-                            ),
-                          (
-                              size: "50%",
-                              pane: Pane(Artists),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ],
+        panes: [(size: "100%", borders: "ALL", pane: Pane(Browser(root_tag: "Artist")))],
+      ),
+    ),
+  (
+      name: "Lyrics",
+      pane: Split(
+        direction: Horizontal,
+        panes: [(size: "100%", borders: "ALL", pane: Pane(Lyrics))],
       ),
     ),
   ],
diff --git a/.config/rmpc/themes/def.ron b/.config/rmpc/themes/def.ron
index f64694b..e1e9736 100644
--- a/.config/rmpc/themes/def.ron
+++ b/.config/rmpc/themes/def.ron
@@ -2,193 +2,177 @@
 #![enable(unwrap_newtypes)]
 #![enable(unwrap_variant_newtypes)]
 (
-  draw_borders: false,
+  default_album_art_path: None,
   show_song_table_header: true,
+  draw_borders: true,
+  browser_column_widths: [20, 38, 42],
   background_color: None,
-  default_album_art_path: None,
+  modal_backdrop: true,
+  text_color: "#d3c6aa",
   header_background_color: None,
   modal_background_color: None,
-  modal_backdrop: true,
-  text_color: None,
+  preview_label_style: (fg: "#b48ead"),
+  preview_metadata_group_style: (fg: "#88c0d0"),
+  tab_bar: (
+    enabled: true,
+    active_style: (fg: "#2e3440", bg: "magenta", modifiers: "Bold"),
+    inactive_style: (fg: "#d3c6aa", bg: None, modifiers: ""),
+  ),
+  highlighted_item_style: (fg: "yellow", modifiers: "Bold"),
+  current_item_style: (fg: "black", bg: "yellow", modifiers: "Bold"),
+  borders_style: (fg: "magenta", modifiers: "Bold"),
+  highlight_border_style: (fg: "magenta"),
+  symbols: (song: "󰝚 ", dir: " ", playlist: "󰲸 ", marker: "* ", ellipsis: "..."),
+  progress_bar: (
+    symbols: ["█", "█", "█", "█", "█"],
+    track_style: (fg: "dark_gray"),
+    elapsed_style: (fg: "magenta"),
+    thumb_style: (fg: "magenta"),
+  ),
+  scrollbar: (
+    symbols: ["│", "█", "▲", "▼"],
+    track_style: (fg: "#a86c8a"),
+    ends_style: (fg: "magenta"),
+    thumb_style: (fg: "magenta"),
+  ),
+  song_table_format: [
+  (
+      prop: (kind: Property(Artist), style: (fg: "magenta"),
+        default: (kind: Text("Unknown"), style: (fg: "#b48ead"))
+      ),
+      width: "20%",
+    ),
+  (
+      prop: (kind: Property(Title), style: (fg: "#d3c6aa"),
+        highlighted_item_style: (fg: "#d8dee9", modifiers: "Bold"),
+        default: (kind: Property(Filename), style: (fg: "#d8dee9"),)
+      ),
+      width: "35%",
+    ),
+  (
+      prop: (kind: Property(Album), style: (fg: "#a86c8a"),
+        default: (kind: Text("Unknown Album"), style: (fg: "#b48ead"))
+      ),
+      width: "30%",
+    ),
+  (
+      prop: (kind: Property(Duration), style: (fg: "magenta"),
+        default: (kind: Text("-"))
+      ),
+      width: "15%",
+      alignment: Right,
+    ),
+  ],
   layout: Split(
     direction: Vertical,
     panes: [
     (
+        size: "3",
+        pane: Pane(Tabs),
+      ),
+    (
         size: "4",
-        borders: "ALL",
         pane: Split(
-          direction: Vertical,
+          direction: Horizontal,
           panes: [
           (
-              size: "1",
-              direction: Vertical,
+              size: "100%",
               pane: Split(
-                direction: Horizontal,
+                direction: Vertical,
                 panes: [
                 (
-                    size: "23",
-                    pane: Pane(Property(
-                      content: [
-                      (kind: Text("["), style: (fg: "yellow", modifiers: "Bold")),
-                      (kind: Property(Status(StateV2())), style: (fg: "yellow", modifiers: "Bold")),
-                      (kind: Text("]"), style: (fg: "yellow", modifiers: "Bold")),
-                      ], align: Left,
-                    )),
-                  ),
-                (
-                    size: "100%",
-                    borders: "LEFT | RIGHT",
-                    pane: Pane(Property(
-                      content: [
-                      (kind: Property(Song(Filename)), style: (modifiers: "Bold"),
-                          default: (kind: Text("No Song"), style: (modifiers: "Bold")))
-                      ], align: Center, scroll_speed: 1
-                    )),
+                    size: "4",
+                    borders: "ALL",
+                    pane: Pane(Header),
                   ),
-                (
-                    size: "23",
-                    pane: Pane(Property(
-                      content: [
-                      (kind: Property(Widget(Volume)), style: (fg: "blue", modifiers: "Bold"))
-                      ], align: Right
-                    )),
-                  ),
-                ],
-              ),
-            ),
-          (
-              size: "1",
-              direction: Vertical,
-              pane: Split(
-                direction: Horizontal,
-                panes: [
-                (
-                    size: "23",
-                    pane: Pane(Property(
-                      content: [
-                      (kind: Property(Status(Elapsed))),
-                      (kind: Text(" / ")),
-                      (kind: Property(Status(Duration))),
-                      (kind: Group([
-                        (kind: Text(" (")),
-                        (kind: Property(Status(Bitrate))),
-                        (kind: Text(" kbps)")),
-                        ])),
-                      ], align: Left,
-                    )),
-                  ),
-                (
-                    size: "100%",
-                    borders: "LEFT | RIGHT",
-                    pane: Pane(Property(
-                      content: [
-                      (kind: Property(Song(Artist)), style: (fg: "yellow", modifiers: "Bold"),
-                          default: (kind: Text("Unknown"), style: (fg: "yellow", modifiers: "Bold"))),
-                      (kind: Text(" - ")),
-                      (kind: Property(Song(Album)), default: (kind: Text("Unknown Album")))
-                      ], align: Center, scroll_speed: 2
-                    )),
-                  ),
-                (
-                    size: "23",
-                    pane: Pane(Property(content: [
-                    (kind: Property(Status(RepeatV2(
-                        on_label: " ",
-                        off_label: " ",
-                        on_style: (fg: "yellow", modifiers: "Bold"),
-                        off_style: (fg: "blue", modifiers: "Dim"),
-                      )))),
-                    (kind: Property(Status(RandomV2(
-                        on_label: " ",
-                        off_label: " ",
-                        on_style: (fg: "yellow", modifiers: "Bold"),
-                        off_style: (fg: "blue", modifiers: "Dim"),
-                      )))),
-                    (kind: Property(Status(SingleV2(
-                        on_label: "󰑘 ",
-                        off_label: "󰑘 ",
-                        oneshot_label: "󰑘 ",
-                        on_style: (fg: "yellow", modifiers: "Bold"),
-                        off_style: (fg: "blue", modifiers: "Dim"),
-                        oneshot_style: (fg: "red", modifiers: "Bold"),
-                      )))),
-                    (kind: Property(Status(ConsumeV2(
-                        on_label: " ",
-                        off_label: " ",
-                        oneshot_label: "",
-                        on_style: (fg: "yellow", modifiers: "Bold"),
-                        off_style: (fg: "blue", modifiers: "Dim"),
-                        oneshot_style: (fg: "red", modifiers: "Dim"),
-                      )))),
-                    ], align: Right)),
-                  ),
-                ],
-              ),
+                ]
+              )
             ),
           ]
-        )
-      ),
-    (
-        size: "3",
-        borders: "ALL",
-        pane: Pane(Tabs),
+        ),
       ),
     (
         size: "100%",
-        borders: "ALL",
-        background_color: "red",
-        pane: Pane(TabContent),
-      ),
-    (
-        size: "3",
-        borders: "ALL",
         pane: Split(
           direction: Horizontal,
           panes: [
           (
-              pane: Pane(Property(content: [(kind: Property(Status(StateV2(playing_label: "  ", paused_label: "  ", stopped_label: "  ",
-                playing_style: (fg: "blue"), paused_style: (fg: "green"), stopped_style: (fg: "red")
-              ))))], align: Left)),
-              size: "3",
-            ),
-          (
               size: "100%",
-              pane: Pane(ProgressBar),
-            ),
-          (
-              size: "13",
-              pane: Pane(Property(
-                content: [
-                (kind: Property(Status(Elapsed))),
-                (kind: Text(" / ")),
-                (kind: Property(Status(Duration))),
-                ], align: Right,
-              )),
+              borders: "NONE",
+              pane: Pane(TabContent),
             ),
           ]
         ),
       ),
-    ]
-  ),
-  symbols: (
-    song: "",
-    dir: "",
-    marker: "\u{e0b0}",
-    ellipsis: "…"
-  ),
-  progress_bar: (
-    symbols: ["█", "\u{e0b0}", "█"],
-    track_style: (fg: "#1e2030"),
-    elapsed_style: (fg: "blue"),
-    thumb_style: (fg: "blue", bg: "#1e2030"),
+    (
+        size: "3",
+        borders: "TOP | BOTTOM",
+        pane: Pane(ProgressBar),
+      ),
+    ],
   ),
-  scrollbar: (
-    symbols: ["│", "█", "▲", "▼"],
-    track_style: (),
-    ends_style: (),
-    thumb_style: (fg: "blue"),
+  header: (
+    rows: [
+    (
+        left: [
+        (kind: Text(""), style: (fg: "magenta", modifiers: "Bold")),
+        (kind: Property(Status(StateV2(playing_label: "  ", paused_label: "  ", stopped_label: "  ")))),
+        (kind: Text(" "), style: (fg: "magenta", modifiers: "Bold")),
+        (kind: Property(Widget(ScanStatus)))
+        ],
+        center: [
+        (kind: Property(Song(Title)), style: (fg: "#d3c6aa",modifiers: "Bold"),
+            default: (kind: Property(Song(Filename)), style: (fg: "#d8dee9",modifiers: "Bold"))
+          )
+        ],
+        right: [
+        (kind: Text("󱡬"), style: (fg: "magenta", modifiers: "Bold")),
+        (kind: Property(Status(Volume)), style: (fg: "#d3c6aa", modifiers: "Bold")),
+        (kind: Text("%"), style: (fg: "magenta", modifiers: "Bold"))
+        ]
+      ),
+    (
+        left: [
+        (kind: Text("[ "),style: (fg: "magenta", modifiers: "Bold")),
+        (kind: Property(Status(Elapsed)),style: (fg: "#d3c6aa")),
+        (kind: Text(" / "),style: (fg: "#a86c8a", modifiers: "Bold")),
+        (kind: Property(Status(Duration)),style: (fg: "#d3c6aa")),
+        (kind: Text(" | "),style: (fg: "#a86c8a")),
+        (kind: Property(Status(Bitrate)),style: (fg: "#d3c6aa")),
+        (kind: Text(" kbps"),style: (fg: "#a86c8a")),
+        (kind: Text("]"),style: (fg: "magenta", modifiers: "Bold"))
+        ],
+        center: [
+        (kind: Property(Song(Artist)), style: (fg: "magenta", modifiers: "Bold"),
+            default: (kind: Text("Unknown Artist"), style: (fg: "#88c0d0", modifiers: "Bold"))
+          ),
+        (kind: Text(" - ")),
+        (kind: Property(Song(Album)),style: (fg: "#a86c8a" ),
+            default: (kind: Text("Unknown Album"), style: (fg: "#81a1c1", modifiers: "Bold"))
+          )
+        ],
+        right: [
+        (kind: Text("[ "),style: (fg: "magenta")),
+        (kind: Property(Status(RepeatV2(
+            on_label: "", off_label: "",
+            on_style: (fg: "#d3c6aa", modifiers: "Bold"), off_style: (fg: "dark_gray", modifiers: "Bold"))))),
+        (kind: Text(" | "),style: (fg: "magenta")),
+        (kind: Property(Status(RandomV2(
+            on_label: "", off_label: "",
+            on_style: (fg: "#d3c6aa", modifiers: "Bold"), off_style: (fg: "dark_gray", modifiers: "Bold"))))),
+        (kind: Text(" | "),style: (fg: "magenta")),
+        (kind: Property(Status(ConsumeV2(
+            on_label: "󰮯", off_label: "󰮯", oneshot_label: "󰮯󰇊",
+            on_style: (fg: "#d3c6aa", modifiers: "Bold"), off_style: (fg: "dark_gray", modifiers: "Bold"))))),
+        (kind: Text(" | "),style: (fg: "magenta")),
+        (kind: Property(Status(SingleV2(
+            on_label: "󰎤", off_label: "󰎦", oneshot_label: "󰇊", off_oneshot_label: "󱅊",
+            on_style: (fg: "#d3c6aa", modifiers: "Bold"), off_style: (fg: "dark_gray", modifiers: "Bold"))))),
+        (kind: Text(" ]"),style: (fg: "magenta")),
+        ]
+      ),
+    ],
   ),
-  browser_column_widths: [20, 38, 42],
   browser_song_format: [
   (
       kind: Group([
@@ -205,34 +189,4 @@
       default: (kind: Property(Filename))
     ),
   ],
-  tab_bar: (
-    active_style: (fg: "black", bg: "blue", modifiers: "Bold"),
-    inactive_style: (),
-  ),
-  highlighted_item_style: (fg: "blue", modifiers: "Bold"),
-  current_item_style: (fg: "black", bg: "blue", modifiers: "Bold"),
-  borders_style: (fg: "blue", modifiers: "Bold"),
-  highlight_border_style: (fg: "red"),
-  song_table_format: [
-  (
-      prop: (kind: Property(Other("albumartist")), default: (kind: Property(Artist), default: (kind: Text("Unknown")))),
-      width: "20%",
-      label: "Artist"
-    ),
-  (
-      prop: (kind: Property(Title), default: (kind: Text("Unknown"))),
-      width: "35%",
-    ),
-  (
-      prop: (kind: Property(Album), default: (kind: Text("Unknown Album"))),
-      width: "45%",
-    ),
-  (
-      prop: (kind: Property(Duration),default: (kind: Text("-"))),
-      width: "5",
-      alignment: Right,
-      label: "Len"
-    ),
-  ],
-  header: (rows: []),
 )