diff --git a/home/client-apps/packages.nix b/home/client-apps/packages.nix index c5481d0d..f014c97f 100644 --- a/home/client-apps/packages.nix +++ b/home/client-apps/packages.nix @@ -169,6 +169,7 @@ in winetricks wpsoffice xca + yesplaymusic yt-dlp yubioath-flutter zoom-us diff --git a/hosts/lt-hp-omen/configuration.nix b/hosts/lt-hp-omen/configuration.nix index 0a9e9045..0d1f0cf6 100644 --- a/hosts/lt-hp-omen/configuration.nix +++ b/hosts/lt-hp-omen/configuration.nix @@ -19,7 +19,6 @@ # ../../nixos/optional-apps/clamav.nix ../../nixos/optional-apps/libvirt ../../nixos/optional-apps/llama-sakura-llm.nix - ../../nixos/optional-apps/netease-cloud-music.nix ../../nixos/optional-apps/netns-tnl-buyvm.nix ../../nixos/optional-apps/nix-distributed.nix ../../nixos/optional-apps/obs-studio.nix diff --git a/nixos/optional-apps/netease-cloud-music.nix b/nixos/optional-apps/netease-cloud-music.nix deleted file mode 100644 index 8bf9a8f9..00000000 --- a/nixos/optional-apps/netease-cloud-music.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ - pkgs, - lib, - LT, - config, - ... -}: -let - netns = config.lantian.netns.netease; - - inherit (pkgs.nur-xddxdd) netease-cloud-music; -in -{ - environment.systemPackages = [ netease-cloud-music ]; - - environment.etc."netns/netease/resolv.conf".text = '' - nameserver 114.114.114.114 - options edns0 - ''; - - lantian.netns.netease = { - ipSuffix = "2"; - }; - - systemd.services = { - unblock-netease-music = { - description = "Unblock NetEase Music"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" ]; - requires = [ "network-online.target" ]; - - environment.HOME = "/var/cache/unblock-netease-music"; - path = with pkgs; [ - bash - nodejs - ]; - - serviceConfig = LT.serviceHarden // { - Restart = "always"; - RestartSec = "3"; - - ExecStart = - "${pkgs.nodejs}/bin/npx -p @unblockneteasemusic/server unblockneteasemusic" - + " -p ${LT.portStr.NeteaseUnlock.HTTP}:${LT.portStr.NeteaseUnlock.HTTPS}" - + " -a ${LT.this.ltnet.IPv4}"; - - CacheDirectory = "unblock-netease-music"; - WorkingDirectory = "/var/cache/unblock-netease-music"; - - User = "unblock-netease-music"; - Group = "unblock-netease-music"; - MemoryDenyWriteExecute = lib.mkForce false; - }; - }; - }; - - security.wrappers.netease-cloud-music = { - owner = "root"; - group = "root"; - capabilities = "cap_sys_admin+ep"; - source = pkgs.writeShellScript "netease-cloud-music" '' - ${pkgs.nur-xddxdd.netns-exec}/bin/netns-exec-dbus -- netease \ - env \ - QT_AUTO_SCREEN_SCALE_FACTOR=$QT_AUTO_SCREEN_SCALE_FACTOR \ - QT_SCREEN_SCALE_FACTORS=$QT_SCREEN_SCALE_FACTORS \ - XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR \ - ${netease-cloud-music}/bin/netease-cloud-music \ - --ignore-certificate-errors - ''; - }; - - users.users.unblock-netease-music = { - group = "unblock-netease-music"; - isSystemUser = true; - }; - users.groups.unblock-netease-music = { }; -}