From e00ee79ea612bda948c3c2ed08778588b1775054 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Tue, 23 Dec 2025 15:37:16 -0700 Subject: [PATCH] revert some things to bring to attention --- flake.lock | 127 ++++++++++++++++++++++--------- flake.nix | 11 ++- hosts/hardware-configuration.nix | 6 +- hosts/modules/nixos.nix | 4 +- hosts/modules/steam.nix | 3 + pkgs/default.nix | 2 - pkgs/wine-cachyos/default.nix | 95 ----------------------- 7 files changed, 102 insertions(+), 146 deletions(-) delete mode 100644 pkgs/wine-cachyos/default.nix diff --git a/flake.lock b/flake.lock index 5131214..90c018d 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1766379377, - "narHash": "sha256-WZthrraF+SZKK0dBUsUUVHqjhvlsDTyrDxs06m3RT90=", + "lastModified": 1766517055, + "narHash": "sha256-r/+oO2811yJWm52ysdt/gNG2efXKrWH5+jEBttt/m1s=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "c548255bfc8f93b7bc80047198a0ff5031d3dd9e", + "rev": "1d4d145187fa6857cd7a846e09ea032819a98993", "type": "github" }, "original": { @@ -129,6 +129,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -157,11 +175,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1766357191, - "narHash": "sha256-FsXCeHAvzdo4lSSXZdSWV2q5ADkTXNtBKlfh3OuIme8=", + "lastModified": 1766518023, + "narHash": "sha256-DB90UOiBqPl+MkRGIeWbPkOCo/8lRxQ6oTPbLB+OdvI=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "c355a94b123b0da0b66ff9e8af784140b6102400", + "rev": "634c3353fe5bc7a5ecdb89305d87c9ae8d91b185", "type": "github" }, "original": { @@ -240,11 +258,11 @@ ] }, "locked": { - "lastModified": 1766387499, - "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=", + "lastModified": 1766519125, + "narHash": "sha256-sSMkdlSo56WrEzciLZTm8qpYxBYxeByGryAIAmIt+/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e", + "rev": "9c790e687e2e7645899cb21dec2a416710aa1064", "type": "github" }, "original": { @@ -348,11 +366,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1766357453, - "narHash": "sha256-6E6k/T6fPXtyhT35wXSv1h3qTQrEbNbDVaMEXiYQ2Xs=", + "lastModified": 1766498696, + "narHash": "sha256-y0bopy/Hob48/q71u4yJo2S0g90JFUJqq3rfh2DgKkk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "60efbf3f63bec3100477ea9ba6cd634e35d5aeaa", + "rev": "f7f357f15f83612078eb0919ca08b71cac01c25e", "type": "github" }, "original": { @@ -608,6 +626,25 @@ "type": "github" } }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1766455463, + "narHash": "sha256-VEyrofUKseSH18CHlC3J8RiS48YgHwmYyJ9F6Ja1mUA=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "9271d3b26d6e3d57a101bf3da4ce0496dc515018", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1763191728, @@ -621,6 +658,21 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1727802920, @@ -655,11 +707,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1766201043, - "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1766473571, + "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "76701a179d3a98b07653e2b0409847499b2a07d3", "type": "github" }, "original": { @@ -781,12 +849,12 @@ "hu-tao-cursor": "hu-tao-cursor", "hyprland": "hyprland", "hyprland-dots": "hyprland-dots", - "nixpkgs": "nixpkgs_4", + "nix-gaming": "nix-gaming", + "nixpkgs": "nixpkgs_5", "nvim-dots": "nvim-dots", "pinix": "pinix", "quickshell": "quickshell_2", - "unstable": "unstable", - "wine-cachyos": "wine-cachyos" + "unstable": "unstable" } }, "systems": { @@ -836,11 +904,11 @@ }, "unstable": { "locked": { - "lastModified": 1766125104, - "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", + "lastModified": 1766410818, + "narHash": "sha256-ruVneSx6wFy5PMw1ow3BE+znl653TJ6+eeNUj4B/9y8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", + "rev": "3a7affa77a5a539afa1c7859e2c31abdb1aeadf3", "type": "github" }, "original": { @@ -850,23 +918,6 @@ "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": [ diff --git a/flake.nix b/flake.nix index ac2f870..e3988b4 100644 --- a/flake.nix +++ b/flake.nix @@ -8,9 +8,9 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - wine-cachyos = { - url = "github:CachyOS/wine-cachyos/cachyos_10.0_20251126/main"; - flake = false; + + nix-gaming = { + url = "github:fufexan/nix-gaming"; }; unstable = { @@ -80,7 +80,7 @@ self, nixpkgs, home-manager, - wine-cachyos, + nix-gaming, unstable, ghostty, hu-tao-cursor, @@ -105,7 +105,6 @@ customPkgs = import "${self}/pkgs" { inherit pkgs; lib = nixpkgs.lib; - wine-cachyos = inputs.wine-cachyos; }; in { packages.${system} = { @@ -143,6 +142,7 @@ dmsCli = inputs.dankMaterialShell.packages.${system}.default; dankMaterialShell = inputs.dankMaterialShell.packages.${system}.dankMaterialShell; pinix = inputs.pinix.packages.${system}.default; + wine-cachyos = inputs.nix-gaming.packages.${system}.wine-cachyos; }) (final: prev: { inherit @@ -152,7 +152,6 @@ minijinja-cli thorium rpcs3 - wine-cachyos ; }) diff --git a/hosts/hardware-configuration.nix b/hosts/hardware-configuration.nix index 0638b00..53a7c7d 100644 --- a/hosts/hardware-configuration.nix +++ b/hosts/hardware-configuration.nix @@ -14,18 +14,18 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/2feb61a9-08b6-490d-a838-2259d7ddee4f"; + { device = "/dev/disk/by-uuid/0033d82c-8012-4abf-8c0c-ecfd36f0bdb6"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/DD80-2994"; + { device = "/dev/disk/by-uuid/23DF-0813"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/6a02b3ae-531f-4231-ad33-346740ae4b53"; } + [ { device = "/dev/disk/by-uuid/b808d338-9198-4f8d-ab6a-2b2e4e6fc9da"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/modules/nixos.nix b/hosts/modules/nixos.nix index 4914170..e5c21fb 100644 --- a/hosts/modules/nixos.nix +++ b/hosts/modules/nixos.nix @@ -10,7 +10,7 @@ experimental-features = ["nix-command" "flakes"]; substituters = [ "https://cache.nixos.org" - "https://anyrun.cachix.org" + "https://nix-gaming.cachix.org" "https://ghostty.cachix.org" "https://hyprland.cachix.org" "https://nix-community.cachix.org" @@ -18,7 +18,7 @@ ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index b12eb38..867197f 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -3,6 +3,9 @@ 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; diff --git a/pkgs/default.nix b/pkgs/default.nix index 09d34b6..b0399b1 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,12 +1,10 @@ { 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;}; } diff --git a/pkgs/wine-cachyos/default.nix b/pkgs/wine-cachyos/default.nix deleted file mode 100644 index 9e0d2f8..0000000 --- a/pkgs/wine-cachyos/default.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ - 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"]; - }; -}