fix: push wip

Signed-off-by: Anthony Rabbito <[email protected]>
anthr76 · Oct 11, 2024 · 963a00a · 963a00a
1 parent da008d3
commit 963a00a
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 5 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -8,6 +8,8 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nix-darwin.url = "github:LnL7/nix-darwin";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+    nix-gaming.url = "github:fufexan/nix-gaming";
+    nix-gaming.inputs.nixpkgs.follows = "nixpkgs";
     gomod2nix.url = "github:nix-community/gomod2nix";
     gomod2nix.inputs.nixpkgs.follows = "nixpkgs";
     hardware.url = "github:nixos/nixos-hardware";

diff --git a/home-manager/personalities/desktop/default.nix b/home-manager/personalities/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, inputs, ... }: {
   imports = [
     ./vscode
     ./fonts.nix
@@ -18,10 +18,7 @@
     podman-desktop
     mumble
     murmur
-    (wineWowPackages.waylandFull.override {
-      wineRelease = "staging";
-      mingwSupport = true;
-    })
+    inputs.nix-gaming.packages.${pkgs.system}.wine-ge
     dxvk
     winetricks
     lightworks_2023_02_02

diff --git a/nixos/personalities/base/nix.nix b/nixos/personalities/base/nix.nix
@@ -19,12 +19,15 @@
         "https://nyx.chaotic.cx/"
         # Snowflake
         "https://snowflake.cachix.org"
+        # Nix Gaming
+        "https://nix-gaming.cachix.org"
       ];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
         "snowflake.cachix.org-1:p9pP30w7PFDuzkJ2v4TQ446cXLUglrnBUhN6tUzp2sA="
+        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
       ];
       trusted-users = [ "root" "@wheel" ];
       builders-use-substitutes = true;