From b330c1c08eeb2a47dc9c7661efe85bae67233f29 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 4 May 2025 13:41:56 -0400 Subject: [PATCH] cleanup and rmpc --- flake.lock | 48 ++++++++++++++++++------------------ modules/home/rmpc/config.ron | 23 ++++++++--------- modules/home/waybar.nix | 3 +-- packages/rmpc-latest.nix | 6 ++--- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 9ac9a67..161345c 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1746203026, - "narHash": "sha256-SyXvOYSdP5AeWBZ9Bh0R//o3qJb9MOa5p3aIUqZ5RnI=", + "lastModified": 1746375743, + "narHash": "sha256-8Vv393fOQ4/oo7gmoAvziIMvtJqXH9oIyjMZ6Hx+P44=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a738f51b28507d1c68ec612d75840a6165ebe1bf", + "rev": "a281243eaec6ac810584f2a73126e8dd48c3a15e", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1746204974, - "narHash": "sha256-Evu4H0/kzaQoCNLGQTp+JGTqkywzPx0IAo20Ci2zNck=", + "lastModified": 1746369725, + "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e8c62c651242fc685b10efc4a48ab777635fb7f", + "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", "type": "github" }, "original": { @@ -540,11 +540,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1745997160, - "narHash": "sha256-gTFloyC0x68Uy4qLfGwZSu0YYR4ZeB/7YiBwoglkVOw=", + "lastModified": 1746281087, + "narHash": "sha256-9amK5DEpueAD+aobmBmjbV+C16RO7lcDOdf5ucJtNvM=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "0e3e7206bc248d154dbafb6f7acd7d6d3ad2ff93", + "rev": "6c64630df81b52208b210f02476f55e4db56e6cf", "type": "github" }, "original": { @@ -930,11 +930,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746341346, + "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", "type": "github" }, "original": { @@ -988,11 +988,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746183838, + "narHash": "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "bf3287dac860542719fe7554e21e686108716879", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1746141548, - "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "lastModified": 1746232882, + "narHash": "sha256-MHmBH2rS8KkRRdoU/feC/dKbdlMkcNkB5mwkuipVHeQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "rev": "7a2622e2c0dbad5c4493cb268aba12896e28b008", "type": "github" }, "original": { @@ -1530,11 +1530,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1746194391, - "narHash": "sha256-FAPOdiIHbc/v5We6/+SBjDHQ8J27145QtV/onDyDsQ0=", + "lastModified": 1746365493, + "narHash": "sha256-8Js+cgkK9cHcJFBSSbLQoOnojYY4I6F4vGBq3zoUId8=", "owner": "wez", "repo": "wezterm", - "rev": "d4b50f6cc34aa0d8729f0914e1926ee6c6e19369", + "rev": "dd3caaae34e0c8557e9f2b4557b573fe2cdb37dd", "type": "github" }, "original": { @@ -1608,11 +1608,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1746209831, - "narHash": "sha256-1R1MRxHmTbNUASTCdJTaaIEUevx18+XpVVxEcb0q7VM=", + "lastModified": 1746379089, + "narHash": "sha256-JRwPB7Ur2/jfNFyrPcdVc4hzKrdKsAPAb9hADPYgLg4=", "owner": "sxyazi", "repo": "yazi", - "rev": "a201c93419bede1f35c69a6b8b21ebbf4a752e6e", + "rev": "c53865788a5ec08e10d8785343481af16d24fb05", "type": "github" }, "original": { diff --git a/modules/home/rmpc/config.ron b/modules/home/rmpc/config.ron index 15cea58..c678b9d 100644 --- a/modules/home/rmpc/config.ron +++ b/modules/home/rmpc/config.ron @@ -16,6 +16,7 @@ status_update_interval_ms: 1000, select_current_song_on_change: false, browser_song_sort: [Disc, Track, Artist, Title], + directories_sort: ModifiedTime(group_directories_first: true, reverse: true), album_art: ( method: Auto, max_size_px: (width: 1200, height: 1200), @@ -32,13 +33,13 @@ "": NextTab, "": PreviousTab, "1": SwitchToTab("Queue"), - # "2": SwitchToTab("Recently Added"), - "2": SwitchToTab("Genre"), - "3": SwitchToTab("Artists"), - "4": SwitchToTab("Album Artists"), - "5": SwitchToTab("Albums"), - "6": SwitchToTab("Playlists"), - "7": SwitchToTab("Search"), + "2": SwitchToTab("Latest"), + "3": SwitchToTab("Genre"), + "4": SwitchToTab("Artists"), + "5": SwitchToTab("Album Artists"), + "6": SwitchToTab("Albums"), + "7": SwitchToTab("Playlists"), + "8": SwitchToTab("Search"), "q": Quit, ">": NextTrack, "p": TogglePause, @@ -119,10 +120,10 @@ name: "Queue", pane: Pane(Queue), ), - # ( - # name: "Recently Added", - # pane: Pane(Browser(root_tag: "album", separator: ";")), - # ), + ( + name: "Latest", + pane: Pane(Directories), + ), ( name: "Genre", pane: Pane(Browser(root_tag: "genre", separator: ";")), diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index ad4d798..0535af2 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -141,8 +141,7 @@ in { "status-icons" = { "paused" = ""; }; - "on-click-right" = "$HOME/.local/bin/wezapp ncmpcpp"; - + "on-click-right" = "$HOME/.local/bin/wezapp rmpc"; }; "wlr/taskbar" = { diff --git a/packages/rmpc-latest.nix b/packages/rmpc-latest.nix index b99968b..eeee302 100644 --- a/packages/rmpc-latest.nix +++ b/packages/rmpc-latest.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "rmpc"; - version = "0.9.0"; + version = "master"; src = fetchFromGitHub { owner = "mierak"; repo = "rmpc"; rev = "master"; - hash = "sha256-2RVP00aVtrs7F7ZJBCVoy5JL7uIR+m1AZ2HCs7pebKE="; + hash = "sha256-Lxu9x+LBnNOxEFE2CcQ3yiji4t2B9OIy1TW4jPDTJBk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-aUvG3+PrG9xjkGyXXDE+deke4y1rbz59T/bI3+X3Khs="; + cargoHash = "sha256-RQ0ibBFkVq7KgYrbMeIgTBSDJbCLCea/ThhbJgOuKxk="; checkFlags = [ # Test currently broken, needs to be removed. See https://github.com/mierak/rmpc/issues/254