From 7647385ed6421682f7248c84d7c371cd016a105e Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sat, 15 Jun 2024 05:42:17 +0800 Subject: [PATCH] treewide: remove spotify --- darwin/profiles/common/core/anti-features.nix | 1 - flake.nix | 5 ----- home/applications/spotify/default.nix | 3 --- home/applications/spotify/spicetify.nix | 19 ------------------- hosts/aristotle/anti-feature.nix | 2 -- hosts/aristotle/default.nix | 1 - hosts/blacksteel/anti-feature.nix | 2 -- .../opt-in/clash-meta-client/config.yaml | 12 ------------ nixos/profiles/common/opt-in/impermanence.nix | 7 +------ 9 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 home/applications/spotify/default.nix delete mode 100644 home/applications/spotify/spicetify.nix diff --git a/darwin/profiles/common/core/anti-features.nix b/darwin/profiles/common/core/anti-features.nix index 034a3fe..bf1fcd2 100644 --- a/darwin/profiles/common/core/anti-features.nix +++ b/darwin/profiles/common/core/anti-features.nix @@ -2,7 +2,6 @@ # Allow unfree applications nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "spotify" "keka" ]; } diff --git a/flake.nix b/flake.nix index f872f4c..d06daef 100644 --- a/flake.nix +++ b/flake.nix @@ -82,11 +82,6 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs-stable"; }; - spicetify-nix = { - url = "github:the-argus/spicetify-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; srvos = { url = "github:nix-community/srvos"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/applications/spotify/default.nix b/home/applications/spotify/default.nix deleted file mode 100644 index 3a6c544..0000000 --- a/home/applications/spotify/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - home.packages = [pkgs.spotify]; -} diff --git a/home/applications/spotify/spicetify.nix b/home/applications/spotify/spicetify.nix deleted file mode 100644 index 72bc354..0000000 --- a/home/applications/spotify/spicetify.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - pkgs, - inputs, - ... -}: let - spicePkgs = inputs.spicetify-nix.packages.${pkgs.stdenv.hostPlatform.system}.default; -in { - # import the flake's module for your system - imports = [inputs.spicetify-nix.homeManagerModule]; - - # configure spicetify :) - programs.spicetify = { - enable = true; - enabledExtensions = with spicePkgs.extensions; [ - adblock - keyboardShortcut - ]; - }; -} diff --git a/hosts/aristotle/anti-feature.nix b/hosts/aristotle/anti-feature.nix index 36c5353..023959e 100644 --- a/hosts/aristotle/anti-feature.nix +++ b/hosts/aristotle/anti-feature.nix @@ -12,7 +12,6 @@ "rustc-bootstrap" "rustc-bootstrap-wrapper" "sof-firmware" - "spotify" "temurin-bin" ]; @@ -22,7 +21,6 @@ "libXNVCtrl" "nvidia-x11" "osu-lazer-bin" - "spotify" "steam" "steam-original" "xow_dongle-firmware" diff --git a/hosts/aristotle/default.nix b/hosts/aristotle/default.nix index 7a9411b..ea381a8 100644 --- a/hosts/aristotle/default.nix +++ b/hosts/aristotle/default.nix @@ -31,7 +31,6 @@ # Stuff that I only want on my main machine home-manager.users.guanranwang = { imports = map (n: ../../home/applications/${n}) [ - "spotify/spicetify.nix" "thunderbird" "ydict" ]; diff --git a/hosts/blacksteel/anti-feature.nix b/hosts/blacksteel/anti-feature.nix index 1561131..92ff525 100644 --- a/hosts/blacksteel/anti-feature.nix +++ b/hosts/blacksteel/anti-feature.nix @@ -13,7 +13,6 @@ "rustc-bootstrap" "rustc-bootstrap-wrapper" "sof-firmware" - "spotify" "temurin-bin" "vscodium" ]; @@ -24,7 +23,6 @@ "broadcom-sta" "minecraft-server" "nvidia-x11" - "spotify" ]; }; } diff --git a/nixos/profiles/common/opt-in/clash-meta-client/config.yaml b/nixos/profiles/common/opt-in/clash-meta-client/config.yaml index d6f161e..8ab93c8 100644 --- a/nixos/profiles/common/opt-in/clash-meta-client/config.yaml +++ b/nixos/profiles/common/opt-in/clash-meta-client/config.yaml @@ -46,28 +46,16 @@ proxy-groups: #- { name: 新加坡, <<: *use, type: url-test, filter: "(?i)(新|sg|singapore)" } rules: - ### WHITELIST - # FILTER - GEOIP, lan, DIRECT, no-resolve - GEOSITE, private, DIRECT - GEOSITE, category-ads, REJECT - # DIRECT - - DOMAIN-SUFFIX, envs.net, DIRECT - - DOMAIN-SUFFIX, catgirl.cloud, DIRECT - - GEOSITE, freecodecamp, DIRECT # music radio - GEOSITE, icloud, DIRECT - GEOSITE, apple@cn, DIRECT - GEOSITE, google@cn, DIRECT - GEOSITE, microsoft@cn, DIRECT - GEOSITE, category-games@cn, DIRECT - # PROXY - - GEOSITE, spotify, 台湾 - # - GEOSITE, google, PROXY - # - GEOSITE, telegram, PROXY - - # NOMATCH - GEOSITE, cn, DIRECT - GEOIP, cn, DIRECT - MATCH, PROXY diff --git a/nixos/profiles/common/opt-in/impermanence.nix b/nixos/profiles/common/opt-in/impermanence.nix index 61ba21c..4617cf2 100644 --- a/nixos/profiles/common/opt-in/impermanence.nix +++ b/nixos/profiles/common/opt-in/impermanence.nix @@ -26,7 +26,6 @@ #"Templates" ".ssh" - #".librewolf" ".mozilla/firefox" ".thunderbird" @@ -34,17 +33,13 @@ ".local/share" ".local/state" + ".config/gh" ".config/Mumble" - ".config/VSCodium" - ".config/chromium" ".config/fcitx5" ".config/obs-studio" - ".config/spotify" ]; files = [ ".config/sops/age/keys.txt" - #".config/KDE/neochat.conf" - #".config/neochatrc" ]; }; };