diff --git a/README.md b/README.md index ba3f221..f89a4c9 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,6 @@ Ritual/Tears: - Telegram Desktop - Geary - Obsidian - - Spicetify - - Copy plugins/themes/patches ### Rsyncd Modules Modded minecraft instance rsync modules can be accessed through `mc-[modpack]@bloodletting::mc-[modpack]` with `--rsh=ssh` @@ -49,7 +47,3 @@ Modded minecraft instance rsync modules can be accessed through `mc-[modpack]@bl ```sh cd common/pkgs/mastodon && ./update.sh --owner AgathaSorceress --rev ``` - -## Reference configs used - - https://github.com/Xe/nixos-configs - - https://git.nora.codes/nora/nixconfig diff --git a/common/fragments/graphical/bspwm.nix b/common/fragments/graphical/bspwm.nix index 78a399b..bc2b268 100644 --- a/common/fragments/graphical/bspwm.nix +++ b/common/fragments/graphical/bspwm.nix @@ -15,7 +15,7 @@ "element-desktop" "dino" "telegram-desktop" - "spotify" + "cider" "geary" "bspm -d" ]; diff --git a/common/fragments/graphical/default.nix b/common/fragments/graphical/default.nix index 4b86df3..5979237 100644 --- a/common/fragments/graphical/default.nix +++ b/common/fragments/graphical/default.nix @@ -13,7 +13,6 @@ ./picom.nix ./polybar.nix ./rofi.nix - ./spotify.nix ./syncthing.nix ./theme.nix ./url-eater.nix @@ -23,8 +22,8 @@ (final: prev: { pads = final.callPackage ../../../common/pkgs/pads.nix { }; bspm = final.callPackage ../../../common/pkgs/bspm.nix { }; - polybar-spotify = - final.callPackage ../../../common/pkgs/polybar-spotify.nix { }; + polybar-scripts = + final.callPackage ../../../common/pkgs/polybar-scripts.nix { }; }) ]; @@ -35,6 +34,7 @@ brightnessctl broot bspm + cider colmena darktable dino @@ -64,7 +64,7 @@ obs-studio obsidian pfetch - polybar-spotify + polybar-scripts pridefetch prismlauncher rink diff --git a/common/fragments/graphical/polybar.nix b/common/fragments/graphical/polybar.nix index eecafb5..e29015f 100644 --- a/common/fragments/graphical/polybar.nix +++ b/common/fragments/graphical/polybar.nix @@ -78,7 +78,7 @@ modules = { left = "bspwm"; center = "date"; - right = "spotify wireguard notification-status"; + right = "mpris wireguard notification-status"; }; wm-restack = "bspwm"; @@ -326,15 +326,13 @@ format-prefix = " "; }; - "module/spotify" = { + "module/mpris" = { type = "custom/script"; - interval = 1; + tail = true; exec = - "${pkgs.polybar-spotify}/bin/polybar-spotify -f '{artist}: {song}'"; - format-prefix = " "; - format = "