added

removed nix gaming due to it being sunsetted by umu-launcher

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764714051,
+        "lastModified": 1765900596,
-        "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=",
+        "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "a43bedcceced5c21ad36578ed823e6099af78214",
+        "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1766077125,
+        "lastModified": 1766379377,
-        "narHash": "sha256-9Mu7WoSb3ZC1EzvrTGdy6E5tVAwksDTm7yI8HhLP6Sk=",
+        "narHash": "sha256-WZthrraF+SZKK0dBUsUUVHqjhvlsDTyrDxs06m3RT90=",
         "owner": "AvengeMedia",
         "repo": "DankMaterialShell",
-        "rev": "4aefa0f1f7394332fbbb5f4af9919f10304ead24",
+        "rev": "c548255bfc8f93b7bc80047198a0ff5031d3dd9e",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765794845,
+        "lastModified": 1766150702,
-        "narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=",
+        "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9",
+        "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378",
         "type": "github"
       },
       "original": {
@@ -129,24 +129,6 @@
         "type": "github"
       }
     },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1765495779,
-        "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -175,11 +157,11 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1765998079,
+        "lastModified": 1766357191,
-        "narHash": "sha256-X8seot8UGzYFyp94amK5quqzt5c2kWdWScHHAZLPCp0=",
+        "narHash": "sha256-FsXCeHAvzdo4lSSXZdSWV2q5ADkTXNtBKlfh3OuIme8=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "a4cb73db848c733a5fb686038a90abe6d175aabe",
+        "rev": "c355a94b123b0da0b66ff9e8af784140b6102400",
         "type": "github"
       },
       "original": {
@@ -258,11 +240,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765980955,
+        "lastModified": 1766387499,
-        "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
+        "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
+        "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
         "type": "github"
       },
       "original": {
@@ -366,11 +348,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1765999585,
+        "lastModified": 1766357453,
-        "narHash": "sha256-xMaGK7XS02/Ttno5kUTda7tMV38tMHD/ZJj9sYjfd+o=",
+        "narHash": "sha256-6E6k/T6fPXtyhT35wXSv1h3qTQrEbNbDVaMEXiYQ2Xs=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "f88deb928a0f7dc02f427473f8c29e8f2bed14a3",
+        "rev": "60efbf3f63bec3100477ea9ba6cd634e35d5aeaa",
         "type": "github"
       },
       "original": {
@@ -428,11 +410,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764812575,
+        "lastModified": 1765643131,
-        "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=",
+        "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "fd321368a40c782cfa299991e5584ca338e36ebe",
+        "rev": "e50ae912813bdfa8372d62daf454f48d6df02297",
         "type": "github"
       },
       "original": {
@@ -453,11 +435,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759610243,
+        "lastModified": 1765214753,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
         "type": "github"
       },
       "original": {
@@ -559,11 +541,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764962281,
+        "lastModified": 1766160771,
-        "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=",
+        "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0",
+        "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f",
         "type": "github"
       },
       "original": {
@@ -613,11 +595,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764872015,
+        "lastModified": 1766253200,
-        "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=",
+        "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "7997451dcaab7b9d9d442f18985d514ec5891608",
+        "rev": "1079777525b30a947c8d657fac158e00ae85de9d",
         "type": "github"
       },
       "original": {
@@ -626,25 +608,6 @@
         "type": "github"
       }
     },
-    "nix-gaming": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1766023166,
-        "narHash": "sha256-6p0ez0d4qkqLDKLHliS2kz9CQaftsZT3P48J0aV3zRw=",
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "rev": "f67539f079071f57cf3e2f3e3ca00595d62990f3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1763191728,
@@ -658,21 +621,6 @@
         "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1761765539,
-        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1727802920,
@@ -707,27 +655,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1765457389,
+        "lastModified": 1766201043,
-        "narHash": "sha256-ddhDtNYvleZeYF7g7TRFSmuQuZh7HCgqstg5YBGwo5s=",
+        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f997fa0f94fb1ce55bccb97f60d41412ae8fde4c",
+        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1765838191,
-        "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6",
         "type": "github"
       },
       "original": {
@@ -783,11 +715,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765016596,
+        "lastModified": 1765911976,
-        "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
+        "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
+        "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27",
         "type": "github"
       },
       "original": {
@@ -825,11 +757,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764663772,
+        "lastModified": 1766386896,
-        "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
+        "narHash": "sha256-1uql4y229Rh+/2da99OVNe6DfsjObukXkf60TYRCvhI=",
         "ref": "refs/heads/master",
-        "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
+        "rev": "3918290c1bcd93ed81291844d9f1ed146672dbfc",
-        "revCount": 713,
+        "revCount": 714,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -849,12 +781,12 @@
         "hu-tao-cursor": "hu-tao-cursor",
         "hyprland": "hyprland",
         "hyprland-dots": "hyprland-dots",
-        "nix-gaming": "nix-gaming",
+        "nixpkgs": "nixpkgs_4",
-        "nixpkgs": "nixpkgs_5",
         "nvim-dots": "nvim-dots",
         "pinix": "pinix",
         "quickshell": "quickshell_2",
-        "unstable": "unstable"
+        "unstable": "unstable",
+        "wine-cachyos": "wine-cachyos"
       }
     },
     "systems": {
@@ -904,11 +836,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1765934234,
+        "lastModified": 1766125104,
-        "narHash": "sha256-pJjWUzNnjbIAMIc5gRFUuKCDQ9S1cuh3b2hKgA7Mc4A=",
+        "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "af84f9d270d404c17699522fab95bbf928a2d92f",
+        "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059",
         "type": "github"
       },
       "original": {
@@ -918,6 +850,23 @@
         "type": "github"
       }
     },
+    "wine-cachyos": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1764277244,
+        "narHash": "sha256-Xr18O5TBDwqZjf3XKqcViKLHzyw2aauNbqJEPSm8LJs=",
+        "owner": "CachyOS",
+        "repo": "wine-cachyos",
+        "rev": "040817d193f3901db2f388a343d2a52b1c9c322b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "CachyOS",
+        "ref": "cachyos_10.0_20251126/main",
+        "repo": "wine-cachyos",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": [

flake.nix

@@ -8,9 +8,9 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
+    wine-cachyos = {
-    nix-gaming = {
+      url = "github:CachyOS/wine-cachyos/cachyos_10.0_20251126/main";
-      url = "github:fufexan/nix-gaming";
+      flake = false;
     };
 
     unstable = {
@@ -80,7 +80,7 @@
     self,
     nixpkgs,
     home-manager,
-    nix-gaming,
+    wine-cachyos,
     unstable,
     ghostty,
     hu-tao-cursor,
@@ -105,6 +105,7 @@
     customPkgs = import "${self}/pkgs" {
       inherit pkgs;
       lib = nixpkgs.lib;
+      wine-cachyos = inputs.wine-cachyos;
     };
   in {
     packages.${system} = {
@@ -151,6 +152,7 @@
                   minijinja-cli
                   thorium
                   rpcs3
+                  wine-cachyos
                   ;
               })
 

hosts/modules/nixos.nix

@@ -10,7 +10,6 @@
     experimental-features = ["nix-command" "flakes"];
     substituters = [
       "https://cache.nixos.org"
-      "https://nix-gaming.cachix.org"
       "https://anyrun.cachix.org"
       "https://ghostty.cachix.org"
       "https://hyprland.cachix.org"
@@ -19,7 +18,6 @@
     ];
     trusted-public-keys = [
       "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
       "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
       "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns="
       "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="

hosts/modules/nvidia.nix

@@ -6,14 +6,6 @@
   services.xserver.videoDrivers = ["nvidia"];
 
   hardware.nvidia = {
-    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      version = "575.64.05";
-      sha256_64bit = "sha256-hfK1D5EiYcGRegss9+H5dDr/0Aj9wPIJ9NVWP3dNUC0=";
-      sha256_aarch64 = "sha256-GRE9VEEosbY7TL4HPFoyo0Ac5jgBHsZg9sBKJ4BLhsA=";
-      openSha256 = "sha256-mcbMVEyRxNyRrohgwWNylu45vIqF+flKHnmt47R//KU=";
-      settingsSha256 = "sha256-o2zUnYFUQjHOcCrB0w/4L6xI1hVUXLAWgG2Y26BowBE=";
-      persistencedSha256 = "sha256-2g5z7Pu8u2EiAh5givP5Q1Y4zk4Cbb06W37rf768NFU=";
-    };
     open = true;
     modesetting.enable = true;
     powerManagement.enable = false;

hosts/modules/steam.nix

@@ -3,9 +3,6 @@
     enable = true;
     # apparently enabling this makes big picture boot up, does not work on nvidia however
     # gamescopeSession.enable = true;
-    extraCompatPackages = [
-      pkgs.proton-ge-bin
-    ];
   };
   programs.gamemode = {
     enable = true;
@@ -17,7 +14,7 @@
   };
   environment.systemPackages = with pkgs; [
     lutris
-    wineWowPackages.stable
+    wine-cachyos
     winetricks
     protontricks
     gamemode

pkgs/default.nix

@@ -1,10 +1,12 @@
 {
   pkgs,
   lib,
+  wine-cachyos,
 }: {
   clear-sans = pkgs.callPackage ./clear-sans {};
   binary-font = pkgs.callPackage ./binary-font {};
   minijinja-cli = pkgs.callPackage ./minijinja-cli {};
   thorium = pkgs.callPackage ./thorium {};
   rpcs3 = pkgs.callPackage ./rpcs3 {};
+  wine-cachyos = pkgs.callPackage ./wine-cachyos {inherit wine-cachyos;};
 }

pkgs/wine-cachyos/default.nix

@@ -0,0 +1,95 @@
+{
+  pkgs,
+  lib,
+  wine-cachyos,
+}:
+pkgs.stdenv.mkDerivation {
+  pname = "wine-cachyos";
+  version = "10.18";
+  src = wine-cachyos;
+  nativeBuildInputs = with pkgs; [
+    autoconf
+    automake
+    bison
+    flex
+    fontforge
+    gettext
+    makeWrapper
+    perl
+    pkg-config
+    python3
+    wayland-scanner
+  ];
+
+  buildInputs = with pkgs; [
+    SDL2
+    alsa-lib
+    cups
+    dbus
+    fontconfig
+    freetype
+    gnutls
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    libGL
+    libdrm
+    libpulseaudio
+    libunwind
+    libusb1
+    libva
+    mesa
+    ncurses
+    openldap
+    pcre2
+    samba
+    udev
+    vulkan-headers
+    vulkan-loader
+    wayland
+    wayland-protocols
+    libxkbcommon
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXinerama
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXxf86vm
+  ];
+
+  patches = [];
+
+  postPatch = ''
+    sed -i '/BCRYPT_ECDH_P384_ALGORITHM/a #define BCRYPT_ECDH_P521_ALGORITHM  L"ECDH_P521"' include/bcrypt.h
+  '';
+
+  postUnpack = ''
+    export HOME=$TMPDIR
+    cd $sourceRoot
+    patchShebangs tools dlls/winevulkan
+    ./autogen.sh
+    cd ..
+  '';
+
+  configureFlags = [
+    "--disable-tests"
+    "--with-x"
+    "--with-gstreamer"
+    "--with-wayland"
+    "--with-vulkan"
+    "--enable-win64"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "Wine with CachyOS optimizations";
+    homepage = "https://github.com/CachyOS/wine-cachyos";
+    license = licenses.lgpl21Plus;
+    platforms = ["x86_64-linux"];
+    maintainers = ["Cobray"];
+  };
+}