diff --git a/flake.lock b/flake.lock index ddf98be..199e8aa 100644 --- a/flake.lock +++ b/flake.lock @@ -865,22 +865,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1759381078, @@ -995,16 +979,16 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", - "owner": "NixOS", + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1158,7 +1142,6 @@ "nvchad-starter": "nvchad-starter", "sops-nix": "sops-nix", "spacemacs": "spacemacs", - "spicetify-nix": "spicetify-nix", "stylix": "stylix", "treefmt-nix": "treefmt-nix", "zen-browser": "zen-browser" @@ -1242,25 +1225,6 @@ "type": "github" } }, - "spicetify-nix": { - "inputs": { - "nixpkgs": "nixpkgs_9", - "systems": "systems_7" - }, - "locked": { - "lastModified": 1771268051, - "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", - "owner": "Gerg-L", - "repo": "spicetify-nix", - "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", - "type": "github" - }, - "original": { - "owner": "Gerg-L", - "repo": "spicetify-nix", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -1276,7 +1240,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_8", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1402,21 +1366,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1500,7 +1449,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1770228511, diff --git a/flake.nix b/flake.nix index f6ba68f..dbbd394 100644 --- a/flake.nix +++ b/flake.nix @@ -240,11 +240,5 @@ nixpkgs.follows = "nixpkgs"; }; }; - - spicetify-nix = { - type = "github"; - owner = "Gerg-L"; - repo = "spicetify-nix"; - }; }; } diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index b1d8c6c..57ce569 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -43,7 +43,6 @@ wallpaper.enable = true; accounts.email.enable = true; programs = { - spotify.enable = true; chromium.enable = true; thunderbird.enable = true; foot.enable = false; diff --git a/home/david/modules/programs/spotify.nix b/home/david/modules/programs/spotify.nix deleted file mode 100644 index f321082..0000000 --- a/home/david/modules/programs/spotify.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - config, - lib, - inputs, - pkgs, - ... -}: let - cfg = config.david.programs.spotify; - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { - options = { - david.programs.spotify = { - enable = lib.mkEnableOption "spotify"; - }; - }; - config = lib.mkIf cfg.enable { - stylix.targets.spicetify.enable = false; - programs.spicetify = { - enable = true; - wayland = true; - windowManagerPatch = true; - enabledExtensions = with spicePkgs.extensions; [ - sort-play - allOfArtist - sleepTimer - coverAmbience - beautifulLyrics - sectionMarker - playingSource - adblock - history - copyToClipboard - songStats - playNext - ]; - theme = spicePkgs.themes.catppuccin; - colorScheme = "mocha"; - }; - }; -} diff --git a/home/modules/default.nix b/home/modules/default.nix index c6aff89..53d02e7 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -10,7 +10,6 @@ nix4nvchad.homeManagerModule noctalia.homeModules.default zen-browser.homeModules.twilight - spicetify-nix.homeManagerModules.spicetify ]) ++ lib.youthlic.loadImports ./.; diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index 184c4a4..7d85385 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -55,6 +55,7 @@ kdePackages.neochat vlc btop + spotify localsend zulip wechat diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 6820ad3..1f72c13 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -51,9 +51,6 @@ cinny-2 = cinny-template { port = 9094; }; - cinny-3 = cinny-template { - port = 9095; - }; }; }; bash.enable = true; @@ -105,6 +102,7 @@ handbrake wechat-uos nvtopPackages.full + spotify localsend jq onefetch diff --git a/nixos/modules/programs/dae/config.dae b/nixos/modules/programs/dae/config.dae index 21f4ae0..5cbb748 100644 --- a/nixos/modules/programs/dae/config.dae +++ b/nixos/modules/programs/dae/config.dae @@ -69,7 +69,6 @@ routing { domain(full: time.windows.com) -> must_direct domain(regex: ".*wgetcloud.*v2ray.*") -> must_direct domain(suffix: "hit.edu.cn") -> must_direct - domain(geosite: netflix) -> hk domain(geosite: microsoft) -> proxy # domain(geosite: onedrive) -> must_direct domain(geosite: "category-ai-!cn") -> us diff --git a/nvfetcher.toml b/nvfetcher.toml index 98a26a2..5ca5c3a 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,3 +1,7 @@ +[spotx] +fetch.github = "SpotX-Official/SpotX-Bash" +src.git = "https://github.com/SpotX-Official/SpotX-Bash.git" + [TrackersListCollection] fetch.github = "XIU2/TrackersListCollection" src.git = "https://github.com/XIU2/TrackersListCollection.git" diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 1173520..55bcd91 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -5,6 +5,7 @@ in pipe [ ./niri.nix + ./spotifyx.nix ./radicle-explorer.nix ./wshowkeys.nix # ./QQ.nix diff --git a/overlays/modifications/spotifyx.nix b/overlays/modifications/spotifyx.nix new file mode 100644 index 0000000..6395e95 --- /dev/null +++ b/overlays/modifications/spotifyx.nix @@ -0,0 +1,5 @@ +{outputs, ...}: _final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + spotify = outputs.packages."${system}".spotifyx; +} diff --git a/pkgs/spotifyx.nix b/pkgs/spotifyx.nix new file mode 100644 index 0000000..baf89f1 --- /dev/null +++ b/pkgs/spotifyx.nix @@ -0,0 +1,36 @@ +{ + spotify, + unzip, + zip, + perl, + makeWrapper, + srcs, +}: let + inherit (srcs) spotx; +in + spotify.overrideAttrs ( + _final: prev: { + nativeBuildInputs = + prev.nativeBuildInputs + ++ [ + unzip + zip + perl + makeWrapper + ]; + spotx = spotx.src; + postUnpack = '' + cp $spotx/spotx.sh ./spotx.sh + chmod +x ./spotx.sh + patchShebangs --build ./spotx.sh + ''; + postInstall = '' + ./spotx.sh -P $out/share/spotify -h -p + ''; + postFixup = '' + wrapProgram $out/bin/spotify \ + --set NIXOS_OZONE_WL 1 \ + --add-flags '--wayland-text-input-version=3' + ''; + } + )