From 95943fca972ca0abce6c8486a4687547bf496483 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Fri, 10 Jul 2026 12:49:40 -0700 Subject: [PATCH] nixos: add scrobble scrubber app --- nixos/configuration.nix | 1 + nixos/desktop.nix | 2 + nixos/flake.lock | 161 +++++++++++++++++++++++++--------------- nixos/flake.nix | 4 - 4 files changed, 106 insertions(+), 62 deletions(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 087ee40d..169222a0 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -23,6 +23,7 @@ ./extra.nix ./games.nix ./git-sync.nix + ./scrobble-scrubber.nix ./github-agent-runner.nix ./gitea-runner.nix ./gitea.nix diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 9786dc61..bcb4521a 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -170,6 +170,7 @@ ''); rlruPackages = inputs.rlru.packages.${pkgs.stdenv.hostPlatform.system}; scrobbleScrubber = inputs.lastfm-edit.packages.${pkgs.stdenv.hostPlatform.system}.scrobble-scrubber; + scrobbleScrubberApp = inputs.lastfm-edit.packages.${pkgs.stdenv.hostPlatform.system}.scrobble-scrubber-app; rlruDioxusDesktopBase = rlruPackages.rlru-dioxus-desktop.overrideAttrs (_: { # Rust 1.95 can otherwise ICE/SEGV while compiling rlru's desktop dependency # graph in release mode. @@ -364,6 +365,7 @@ wofi rofi-pass rofi-systemd + scrobbleScrubberApp scrobbleScrubber simplescreenrecorder skippy-xd diff --git a/nixos/flake.lock b/nixos/flake.lock index 368437e1..1756bcd5 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1783545757, - "narHash": "sha256-ujyh71rjKf0frYqn4HDZ7baSp5+BNhYpux5Q/8nITRM=", + "lastModified": 1783642944, + "narHash": "sha256-YuaeZs+6565YrJU0xDJ+mZIVn5zmqF9Rth6pMcbnh2E=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "1a4322b6de8b5f99968cb342ac4a1b25d0712698", + "rev": "d120e1bfc6c5e24995178ac8485e98938f2d68d4", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1783474601, - "narHash": "sha256-6BjvxK16cMwHDga884UX2czuVVXMnxpmIT6l1SBnt9I=", + "lastModified": 1783692072, + "narHash": "sha256-CqyNih/F1zKWZP8tDaPXaCuxyRoaINY9dF285fdEbzw=", "owner": "aaddrick", "repo": "claude-desktop-debian", - "rev": "4ef1cd86d48bdcc16c92c10a94952f297208886c", + "rev": "e7673c9d1205cc7b0573b7bffa129751bf947e7a", "type": "github" }, "original": { @@ -174,19 +174,15 @@ }, "codex-desktop-linux": { "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783628228, - "narHash": "sha256-q44gvBu4k0JZOeKiPdi1CEauqnsNtW1WJ9w0Qapo1ec=", + "lastModified": 1783702598, + "narHash": "sha256-hZ1EQNesJnT8qkyCe84aXvbQMC6muWE7I9ZAHhFQ+Rk=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "60f875a42d928df37b6c3742cf649a8562650a36", + "rev": "1496c57e6f470bdf16d30912ab40fe22037fd5b1", "type": "github" }, "original": { @@ -497,9 +493,7 @@ }, "flake-utils": { "inputs": { - "systems": [ - "systems" - ] + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -517,7 +511,9 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": [ + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -552,6 +548,24 @@ } }, "flake-utils_4": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "locked": { "lastModified": 1623875721, "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=", @@ -636,7 +650,7 @@ "flake-utils": [ "flake-utils" ], - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -744,7 +758,7 @@ "hercules-ci-effects_2": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1701009247, @@ -993,9 +1007,9 @@ ], "hyprwayland-scanner": "hyprwayland-scanner", "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -1434,8 +1448,8 @@ ] }, "locked": { - "lastModified": 1783623263, - "narHash": "sha256-njHWrlRaqSKrdF4jVuVzJQygKIfEws+BGgJPPRoc670=", + "lastModified": 1783705118, + "narHash": "sha256-/H7AkkUgqG92Ygghfq1HJnpK93vPRyW7OLLBX5/VrHQ=", "path": "/home/imalison/Projects/lastfm-edit", "type": "path" }, @@ -1463,7 +1477,7 @@ "nix-appimage": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "rlru", "bundlers", @@ -1509,8 +1523,8 @@ }, "nix-utils": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_7" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1744222205, @@ -1587,11 +1601,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -1667,6 +1681,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1778443072, "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", @@ -1682,7 +1712,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1776877367, "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", @@ -1698,7 +1728,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1782723713, "narHash": "sha256-oPXCU/SSUokcGaJREHibG1CBX3+s/W7orDWQOZDsEeQ=", @@ -1714,7 +1744,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1697723726, "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", @@ -1730,7 +1760,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1703255338, "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", @@ -1746,7 +1776,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1629252929, "narHash": "sha256-Aj20gmGBs8TG7pyaQqgbsqAQ6cB+TVuL18Pk3DPBxcQ=", @@ -1765,7 +1795,7 @@ "inputs": { "flake-parts": "flake-parts_4", "hercules-ci-effects": "hercules-ci-effects_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "osx-kvm": "osx-kvm" }, "locked": { @@ -2013,7 +2043,7 @@ "codex-cli-nix": "codex-cli-nix", "codex-desktop-linux": "codex-desktop-linux", "coqui-tts-streamer": "coqui-tts-streamer", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "git-blame-rank": "git-blame-rank", "git-ignore-nix": "git-ignore-nix", "git-sync-rs": "git-sync-rs", @@ -2050,14 +2080,14 @@ "nixified-ai": "nixified-ai", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable", "nixtheplanet": "nixtheplanet", "notifications-tray-icon": "notifications-tray-icon", "org-agenda-api": "org-agenda-api", "railbird-secrets": "railbird-secrets", "rlru": "rlru", - "systems": "systems_5", + "systems": "systems_6", "vscode-server": "vscode-server", "xmonad": "xmonad_2", "xmonad-contrib": "xmonad-contrib_2", @@ -2136,21 +2166,6 @@ } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2165,6 +2180,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -2210,10 +2240,25 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "taffybar": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4", "weeder-nix": "weeder-nix", "xmonad": "xmonad", "xmonad-contrib": "xmonad-contrib" @@ -2234,7 +2279,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, diff --git a/nixos/flake.nix b/nixos/flake.nix index e859c217..0601162c 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -285,10 +285,6 @@ codex-desktop-linux = { url = "github:ilysenko/codex-desktop-linux/main"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; }; claude-code-nix = {