treewide: remove spotify
This commit is contained in:
parent
8a67c3b179
commit
7647385ed6
9 changed files with 1 additions and 51 deletions
|
@ -2,7 +2,6 @@
|
||||||
# Allow unfree applications
|
# Allow unfree applications
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||||
builtins.elem (lib.getName pkg) [
|
builtins.elem (lib.getName pkg) [
|
||||||
"spotify"
|
|
||||||
"keka"
|
"keka"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,11 +82,6 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.nixpkgs-stable.follows = "nixpkgs-stable";
|
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 = {
|
srvos = {
|
||||||
url = "github:nix-community/srvos";
|
url = "github:nix-community/srvos";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{pkgs, ...}: {
|
|
||||||
home.packages = [pkgs.spotify];
|
|
||||||
}
|
|
|
@ -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
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -12,7 +12,6 @@
|
||||||
"rustc-bootstrap"
|
"rustc-bootstrap"
|
||||||
"rustc-bootstrap-wrapper"
|
"rustc-bootstrap-wrapper"
|
||||||
"sof-firmware"
|
"sof-firmware"
|
||||||
"spotify"
|
|
||||||
"temurin-bin"
|
"temurin-bin"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -22,7 +21,6 @@
|
||||||
"libXNVCtrl"
|
"libXNVCtrl"
|
||||||
"nvidia-x11"
|
"nvidia-x11"
|
||||||
"osu-lazer-bin"
|
"osu-lazer-bin"
|
||||||
"spotify"
|
|
||||||
"steam"
|
"steam"
|
||||||
"steam-original"
|
"steam-original"
|
||||||
"xow_dongle-firmware"
|
"xow_dongle-firmware"
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
# Stuff that I only want on my main machine
|
# Stuff that I only want on my main machine
|
||||||
home-manager.users.guanranwang = {
|
home-manager.users.guanranwang = {
|
||||||
imports = map (n: ../../home/applications/${n}) [
|
imports = map (n: ../../home/applications/${n}) [
|
||||||
"spotify/spicetify.nix"
|
|
||||||
"thunderbird"
|
"thunderbird"
|
||||||
"ydict"
|
"ydict"
|
||||||
];
|
];
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
"rustc-bootstrap"
|
"rustc-bootstrap"
|
||||||
"rustc-bootstrap-wrapper"
|
"rustc-bootstrap-wrapper"
|
||||||
"sof-firmware"
|
"sof-firmware"
|
||||||
"spotify"
|
|
||||||
"temurin-bin"
|
"temurin-bin"
|
||||||
"vscodium"
|
"vscodium"
|
||||||
];
|
];
|
||||||
|
@ -24,7 +23,6 @@
|
||||||
"broadcom-sta"
|
"broadcom-sta"
|
||||||
"minecraft-server"
|
"minecraft-server"
|
||||||
"nvidia-x11"
|
"nvidia-x11"
|
||||||
"spotify"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,28 +46,16 @@ proxy-groups:
|
||||||
#- { name: 新加坡, <<: *use, type: url-test, filter: "(?i)(新|sg|singapore)" }
|
#- { name: 新加坡, <<: *use, type: url-test, filter: "(?i)(新|sg|singapore)" }
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
### WHITELIST
|
|
||||||
# FILTER
|
|
||||||
- GEOIP, lan, DIRECT, no-resolve
|
- GEOIP, lan, DIRECT, no-resolve
|
||||||
- GEOSITE, private, DIRECT
|
- GEOSITE, private, DIRECT
|
||||||
- GEOSITE, category-ads, REJECT
|
- GEOSITE, category-ads, REJECT
|
||||||
|
|
||||||
# DIRECT
|
|
||||||
- DOMAIN-SUFFIX, envs.net, DIRECT
|
|
||||||
- DOMAIN-SUFFIX, catgirl.cloud, DIRECT
|
|
||||||
- GEOSITE, freecodecamp, DIRECT # music radio
|
|
||||||
- GEOSITE, icloud, DIRECT
|
- GEOSITE, icloud, DIRECT
|
||||||
- GEOSITE, apple@cn, DIRECT
|
- GEOSITE, apple@cn, DIRECT
|
||||||
- GEOSITE, google@cn, DIRECT
|
- GEOSITE, google@cn, DIRECT
|
||||||
- GEOSITE, microsoft@cn, DIRECT
|
- GEOSITE, microsoft@cn, DIRECT
|
||||||
- GEOSITE, category-games@cn, DIRECT
|
- GEOSITE, category-games@cn, DIRECT
|
||||||
|
|
||||||
# PROXY
|
|
||||||
- GEOSITE, spotify, 台湾
|
|
||||||
# - GEOSITE, google, PROXY
|
|
||||||
# - GEOSITE, telegram, PROXY
|
|
||||||
|
|
||||||
# NOMATCH
|
|
||||||
- GEOSITE, cn, DIRECT
|
- GEOSITE, cn, DIRECT
|
||||||
- GEOIP, cn, DIRECT
|
- GEOIP, cn, DIRECT
|
||||||
- MATCH, PROXY
|
- MATCH, PROXY
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#"Templates"
|
#"Templates"
|
||||||
|
|
||||||
".ssh"
|
".ssh"
|
||||||
#".librewolf"
|
|
||||||
".mozilla/firefox"
|
".mozilla/firefox"
|
||||||
".thunderbird"
|
".thunderbird"
|
||||||
|
|
||||||
|
@ -34,17 +33,13 @@
|
||||||
".local/share"
|
".local/share"
|
||||||
".local/state"
|
".local/state"
|
||||||
|
|
||||||
|
".config/gh"
|
||||||
".config/Mumble"
|
".config/Mumble"
|
||||||
".config/VSCodium"
|
|
||||||
".config/chromium"
|
|
||||||
".config/fcitx5"
|
".config/fcitx5"
|
||||||
".config/obs-studio"
|
".config/obs-studio"
|
||||||
".config/spotify"
|
|
||||||
];
|
];
|
||||||
files = [
|
files = [
|
||||||
".config/sops/age/keys.txt"
|
".config/sops/age/keys.txt"
|
||||||
#".config/KDE/neochat.conf"
|
|
||||||
#".config/neochatrc"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue