diff --git a/flake.lock b/flake.lock index ea54526..37df747 100644 --- a/flake.lock +++ b/flake.lock @@ -323,29 +323,6 @@ "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": { "inputs": { "home-manager": [ @@ -603,7 +580,6 @@ "neovim": "neovim", "nix-darwin": "nix-darwin", "nix-formatter-pack": "nix-formatter-pack", - "nix-gaming": "nix-gaming", "nix-on-droid": "nix-on-droid", "nixcasks": "nixcasks", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index dc24e69..f872f4c 100644 --- a/flake.nix +++ b/flake.nix @@ -55,11 +55,6 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-gaming = { - url = "github:fufexan/nix-gaming"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - }; nixos-hardware = { url = "github:NixOS/nixos-hardware"; }; diff --git a/hosts/aristotle/anti-feature.nix b/hosts/aristotle/anti-feature.nix index 4317c84..f82c868 100644 --- a/hosts/aristotle/anti-feature.nix +++ b/hosts/aristotle/anti-feature.nix @@ -6,6 +6,7 @@ "adoptopenjdk-hotspot-bin" "cargo-bootstrap" "cef-binary" + "osu-lazer-bin" "rustc-bootstrap" "rustc-bootstrap-wrapper" "sof-firmware" @@ -17,6 +18,7 @@ allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nvidia-x11" + "osu-lazer-bin" "spotify" "steam" "steam-original" diff --git a/nixos/modules/myFlake/hardware/components/audio.nix b/nixos/modules/myFlake/hardware/components/audio.nix index c522e23..8cc21d6 100644 --- a/nixos/modules/myFlake/hardware/components/audio.nix +++ b/nixos/modules/myFlake/hardware/components/audio.nix @@ -27,9 +27,6 @@ in { alsa.support32Bit = true; pulse.enable = true; jack.enable = true; - - # pipewireLowLatency module from github:fufexan/nix-gaming - # lowLatency.enable = true; }; }) (lib.mkIf (cfg.soundServer == "pulseaudio") { diff --git a/nixos/profiles/common/core/default.nix b/nixos/profiles/common/core/default.nix index 7d8c356..cdcdf55 100644 --- a/nixos/profiles/common/core/default.nix +++ b/nixos/profiles/common/core/default.nix @@ -17,7 +17,6 @@ home-manager.nixosModules.home-manager impermanence.nixosModules.impermanence lanzaboote.nixosModules.lanzaboote - nix-gaming.nixosModules.pipewireLowLatency nixos-sensible.nixosModules.default nur.nixosModules.nur self.nixosModules.default diff --git a/nixos/profiles/common/core/nix/nix.nix b/nixos/profiles/common/core/nix/nix.nix index 62cee5a..0c32685 100644 --- a/nixos/profiles/common/core/nix/nix.nix +++ b/nixos/profiles/common/core/nix/nix.nix @@ -17,14 +17,12 @@ # Personal cachix-s "https://berberman.cachix.org" "https://guanran928.cachix.org" - "https://nix-gaming.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "berberman.cachix.org-1:UHGhodNXVruGzWrwJ12B1grPK/6Qnrx2c3TjKueQPds=" "guanran928.cachix.org-1:BE/iBCj2/pqJXG908wHRrcaV0B2fC+KbFjHsXY6b91c=" - "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; trusted-users = ["@wheel"]; diff --git a/nixos/profiles/common/opt-in/gaming/home/default.nix b/nixos/profiles/common/opt-in/gaming/home/default.nix index 3b612a1..9452c1b 100644 --- a/nixos/profiles/common/opt-in/gaming/home/default.nix +++ b/nixos/profiles/common/opt-in/gaming/home/default.nix @@ -1,26 +1,16 @@ -{ - pkgs, - inputs, - ... -}: let - gamePkgs = inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}; -in { +{pkgs, ...}: { programs.mangohud.enable = true; - home.packages = with pkgs; - [ - (prismlauncher.override {glfw = glfw-wayland-minecraft;}) - (steam.override { - extraEnv = { - # STEAM_EXTRA_COMPAT_TOOLS_PATHS = gamePkgs.proton-ge; - }; - }) - mumble - # lunar-client - # protonup-qt - ] - ++ (with gamePkgs; [ - osu-lazer-bin - # (osu-stable.override {location = "${config.xdg.dataHome}/osu-stable";}) - ]); + home.packages = with pkgs; [ + (prismlauncher.override {glfw = glfw-wayland-minecraft;}) + (steam.override { + extraEnv = { + # STEAM_EXTRA_COMPAT_TOOLS_PATHS = gamePkgs.proton-ge; + }; + }) + mumble + osu-lazer-bin + # lunar-client + # protonup-qt + ]; }