From 576e5cfffa10d3cdc96e5227244cb4cd24fc1a76 Mon Sep 17 00:00:00 2001 From: Cian Hughes Date: Tue, 5 May 2026 21:16:28 +0100 Subject: [PATCH] Switched spotify/spicetify for tidal/sone --- flake.lock | 86 ++++++---------------------- flake.nix | 2 - home-manager/core/dotfiles | 2 +- home-manager/worklaptop/packages.nix | 1 + home-manager/worklaptop/programs.nix | 27 --------- 5 files changed, 21 insertions(+), 97 deletions(-) diff --git a/flake.lock b/flake.lock index eb96398..1855462 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1777851538, + "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5", "type": "github" }, "original": { @@ -154,11 +154,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1777077449, - "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=", + "lastModified": 1777673416, + "narHash": "sha256-5c2POKPOjU40Kh0MirOdScBLG0bu9TAuPYAtPRNZMBs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160", + "rev": "26ef669cffa904b6f6832ab57b77892a37c1a671", "type": "github" }, "original": { @@ -248,19 +248,6 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1776877367, - "narHash": "sha256-wMN1gM00sUQ2KC9CNr/XEOGdfOrl67PabIRv9AYayTo=", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre985613.0726a0ecb6d4/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -269,11 +256,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777253304, - "narHash": "sha256-XqSHEKEW5pSAx9MoMo8mKPgkjoy4FEhZ4x0a6hGYrSI=", + "lastModified": 1777859147, + "narHash": "sha256-0vCgxdwrxBkHmqNgJtUMGCFwSV5a6AgYdKAgBCtFFPM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6773c4750a12c9e9af9c4ce2365e083f1d0d0ad8", + "rev": "6b48834dd6c3913d211476ab2f964f3fb100675e", "type": "github" }, "original": { @@ -292,11 +279,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777167795, - "narHash": "sha256-VHdtmxVX7oF2+FxYQQPARQmtaHw23FoTBiTaH6ucOEg=", + "lastModified": 1777773024, + "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "697db4c14e27d841956ff76887fc312443e6fb17", + "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", "type": "github" }, "original": { @@ -312,8 +299,7 @@ "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable_2", "noctalia": "noctalia", - "sops-nix": "sops-nix", - "spicetify-nix": "spicetify-nix" + "sops-nix": "sops-nix" } }, "sops-nix": { @@ -321,11 +307,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1777338324, - "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -334,25 +320,6 @@ "type": "github" } }, - "spicetify-nix": { - "inputs": { - "nixpkgs": "nixpkgs_7", - "systems": "systems_4" - }, - "locked": { - "lastModified": 1777183994, - "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=", - "owner": "Gerg-L", - "repo": "spicetify-nix", - "rev": "501256c3e670ca1679501ce3839ea805df00d8ba", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "spicetify-nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1689347949, @@ -398,21 +365,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 7e5cb02..917503e 100644 --- a/flake.nix +++ b/flake.nix @@ -24,8 +24,6 @@ url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; - # Add spicetify input - spicetify-nix.url = "github:Gerg-L/spicetify-nix"; }; outputs = { diff --git a/home-manager/core/dotfiles b/home-manager/core/dotfiles index 3131dc2..104c290 160000 --- a/home-manager/core/dotfiles +++ b/home-manager/core/dotfiles @@ -1 +1 @@ -Subproject commit 3131dc2b05d7448c0c97338b76169f2fc3fbf49a +Subproject commit 104c290cab4ebb1bf911c9ef5635355075366875 diff --git a/home-manager/worklaptop/packages.nix b/home-manager/worklaptop/packages.nix index df80807..a0c653e 100644 --- a/home-manager/worklaptop/packages.nix +++ b/home-manager/worklaptop/packages.nix @@ -51,6 +51,7 @@ in { nixers.rbw-autofill unstablePkgs.ruff pkgs.signal-desktop + unstablePkgs.sone pkgs.sshs unstablePkgs.uv pkgs.vial diff --git a/home-manager/worklaptop/programs.nix b/home-manager/worklaptop/programs.nix index 2bcbb92..6a70a08 100644 --- a/home-manager/worklaptop/programs.nix +++ b/home-manager/worklaptop/programs.nix @@ -10,7 +10,6 @@ }: { imports = [ inputs.noctalia.homeModules.default - inputs.spicetify-nix.homeManagerModules.default ]; programs = { @@ -35,31 +34,5 @@ }; }; hyprcursor-phinger.enable = true; - spicetify = let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; - in { - enable = true; - theme = { - name = "TokyoNight"; - src = pkgs.fetchFromGitHub { - owner = "evening-hs"; - repo = "Spotify-Tokyo-Night-Theme"; - rev = "main"; - hash = "sha256-cLj9v8qtHsdV9FfzV2Qf4pWO8AOBXu51U/lUMvdEXAk="; - }; - appendName = false; - injectCss = true; - replaceColors = true; - overwriteAssets = true; - }; - colorScheme = "Night"; - enabledExtensions = with spicePkgs.extensions; [ - adblock - shuffle - hidePodcasts - fullAppDisplay - trashbin - ]; - }; }; }