From 0b23814dca6643d75cc121ad18233cc7023dc042 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Wed, 27 Dec 2023 04:44:49 +0100 Subject: [PATCH] WIP: Steam improvements --- flake.lock | 40 +++++++++++++++++++------------------- flake.nix | 16 +++++++++++++++ os-mods/desktop/gaming.nix | 4 ++++ 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 8c00f24..72ee429 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1703336473, - "narHash": "sha256-3aBvTFbEplF4dBzTPQ7AXYtWHOdlKLd/K0faUtKQbyA=", + "lastModified": 1703606540, + "narHash": "sha256-3hAf+mcr6iZj7dGL3UBPSlHpi7iukAQx3Um2Px4DyDs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "69a7b82cbe4c3395230d6066989a28b7636d52f1", + "rev": "80d0d925101f84a36db5c2b85cb69266e0d95391", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1703162528, - "narHash": "sha256-pQ41wN6JlStkZOhRTIHEpuwVywLdh+xzZQW1+FzdjVs=", + "lastModified": 1703532766, + "narHash": "sha256-ojjW3cuNmqL5uqDWohwLoO8dYpheM5+AfgsNmGIMwG8=", "owner": "nix-community", "repo": "disko", - "rev": "a050895e4eb06e0738680021a701ea05dc8dbfc9", + "rev": "1b191113874dee97796749bb21eac3d84735c70a", "type": "github" }, "original": { @@ -344,12 +344,12 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", - "revCount": 561409, + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", + "revCount": 562218, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.561409%2Brev-54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6/018c8732-ea5c-725f-a6c9-9ed48683aa5a/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.562218%2Brev-6df37dc6a77654682fe9f071c62b4242b5342e04/018c99c5-83a2-762d-ae43-a38f3be5b2d9/source.tar.gz" }, "original": { "type": "tarball", @@ -392,11 +392,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "lastModified": 1703499205, + "narHash": "sha256-lF9rK5mSUfIZJgZxC3ge40tp1gmyyOXZ+lRY3P8bfbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "rev": "e1fa12d4f6c6fe19ccb59cac54b5b3f25e160870", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1703068421, - "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", + "lastModified": 1703467016, + "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", + "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", "type": "github" }, "original": { @@ -493,11 +493,11 @@ }, "nur": { "locked": { - "lastModified": 1703402894, - "narHash": "sha256-d2MGoEhaw3izYE/OWtdTPl+ZzHKnx7sle7r2BTXgzKs=", + "lastModified": 1703646418, + "narHash": "sha256-+O5UYPoboInEqQM0KeNVTz8Dff2dTxDwZOSRTgdOejM=", "owner": "nix-community", "repo": "NUR", - "rev": "382e3d672e400c73e772e97472d10ac98e2e0be6", + "rev": "4b648583aa2718a55740bd6f7e2916c9771762c8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a9833e3..c319014 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,22 @@ inherit overlays; config = { allowUnfree = true; + packageOverrides = pkgs: { + steam = pkgs.steam.override { + extraPkgs = pkgs: with pkgs.unstable-os; [ + xorg.libXcursor + xorg.libXi + xorg.libXinerama + xorg.libXScrnSaver + libpng + libpulseaudio + libvorbis + stdenv.cc.cc.lib + libkrb5 + keyutils + ]; + }; + }; permittedInsecurePackages = [ "electron-22.3.27" "electron-24.8.6" diff --git a/os-mods/desktop/gaming.nix b/os-mods/desktop/gaming.nix index ac8594f..42b59c0 100644 --- a/os-mods/desktop/gaming.nix +++ b/os-mods/desktop/gaming.nix @@ -12,4 +12,8 @@ chaotic.steam.extraCompatPackages = with pkgs; [ proton-ge-custom ]; + + environment.systemPackages = with pkgs.unstable-os; [ + gamescope + ]; }