flake: drop nix-gaming

This commit is contained in:
Guanran Wang 2024-06-05 18:19:23 +08:00
parent 8ce479ba6b
commit f515e8795e
Signed by: nyancat
GPG key ID: 91F97D9ED12639CF
7 changed files with 15 additions and 58 deletions

View file

@ -323,29 +323,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-gaming": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1717550333,
"narHash": "sha256-QebVpP3Z0zVBTSqExNQRg3FLOi2h0bPML6urBbUPzLY=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "de70cdf224bd40928fe2af7fa558e1bdb7d8d619",
"type": "github"
},
"original": {
"owner": "fufexan",
"repo": "nix-gaming",
"type": "github"
}
},
"nix-on-droid": { "nix-on-droid": {
"inputs": { "inputs": {
"home-manager": [ "home-manager": [
@ -603,7 +580,6 @@
"neovim": "neovim", "neovim": "neovim",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-formatter-pack": "nix-formatter-pack", "nix-formatter-pack": "nix-formatter-pack",
"nix-gaming": "nix-gaming",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixcasks": "nixcasks", "nixcasks": "nixcasks",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

View file

@ -55,11 +55,6 @@
url = "github:LnL7/nix-darwin"; url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-gaming = {
url = "github:fufexan/nix-gaming";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts";
};
nixos-hardware = { nixos-hardware = {
url = "github:NixOS/nixos-hardware"; url = "github:NixOS/nixos-hardware";
}; };

View file

@ -6,6 +6,7 @@
"adoptopenjdk-hotspot-bin" "adoptopenjdk-hotspot-bin"
"cargo-bootstrap" "cargo-bootstrap"
"cef-binary" "cef-binary"
"osu-lazer-bin"
"rustc-bootstrap" "rustc-bootstrap"
"rustc-bootstrap-wrapper" "rustc-bootstrap-wrapper"
"sof-firmware" "sof-firmware"
@ -17,6 +18,7 @@
allowUnfreePredicate = pkg: allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [ builtins.elem (lib.getName pkg) [
"nvidia-x11" "nvidia-x11"
"osu-lazer-bin"
"spotify" "spotify"
"steam" "steam"
"steam-original" "steam-original"

View file

@ -27,9 +27,6 @@ in {
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
# pipewireLowLatency module from github:fufexan/nix-gaming
# lowLatency.enable = true;
}; };
}) })
(lib.mkIf (cfg.soundServer == "pulseaudio") { (lib.mkIf (cfg.soundServer == "pulseaudio") {

View file

@ -17,7 +17,6 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
nix-gaming.nixosModules.pipewireLowLatency
nixos-sensible.nixosModules.default nixos-sensible.nixosModules.default
nur.nixosModules.nur nur.nixosModules.nur
self.nixosModules.default self.nixosModules.default

View file

@ -17,14 +17,12 @@
# Personal cachix-s # Personal cachix-s
"https://berberman.cachix.org" "https://berberman.cachix.org"
"https://guanran928.cachix.org" "https://guanran928.cachix.org"
"https://nix-gaming.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"berberman.cachix.org-1:UHGhodNXVruGzWrwJ12B1grPK/6Qnrx2c3TjKueQPds=" "berberman.cachix.org-1:UHGhodNXVruGzWrwJ12B1grPK/6Qnrx2c3TjKueQPds="
"guanran928.cachix.org-1:BE/iBCj2/pqJXG908wHRrcaV0B2fC+KbFjHsXY6b91c=" "guanran928.cachix.org-1:BE/iBCj2/pqJXG908wHRrcaV0B2fC+KbFjHsXY6b91c="
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
]; ];
trusted-users = ["@wheel"]; trusted-users = ["@wheel"];

View file

@ -1,14 +1,7 @@
{ {pkgs, ...}: {
pkgs,
inputs,
...
}: let
gamePkgs = inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system};
in {
programs.mangohud.enable = true; programs.mangohud.enable = true;
home.packages = with pkgs; home.packages = with pkgs; [
[
(prismlauncher.override {glfw = glfw-wayland-minecraft;}) (prismlauncher.override {glfw = glfw-wayland-minecraft;})
(steam.override { (steam.override {
extraEnv = { extraEnv = {
@ -16,11 +9,8 @@ in {
}; };
}) })
mumble mumble
osu-lazer-bin
# lunar-client # lunar-client
# protonup-qt # protonup-qt
] ];
++ (with gamePkgs; [
osu-lazer-bin
# (osu-stable.override {location = "${config.xdg.dataHome}/osu-stable";})
]);
} }