From ec6c475ec980500b375fe9c102a5c1a8bd494387 Mon Sep 17 00:00:00 2001 From: Anthony Rabbito Date: Fri, 25 Oct 2024 11:27:06 -0400 Subject: [PATCH] push fixes Signed-off-by: Anthony Rabbito --- flake.lock | 149 +++++++++++++---------- flake.nix | 2 + modules/nixos/gaming-kernel.nix | 1 + nixos/hosts/f80/default.nix | 1 + nixos/personalities/desktop/gaming.nix | 41 +++---- nixos/personalities/physical/default.nix | 7 +- pkgs/discover-overlay/default.nix | 3 +- 7 files changed, 112 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index 6de9362..cb1c42c 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1729348269, - "narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=", + "lastModified": 1729599319, + "narHash": "sha256-e/4JPcIRte5zkwqmGFrFo3763e0iHURX6N0apz4jbI0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "528723447ef037a1c081add43f4fd46440c9c3b1", + "rev": "1b86b304c8eb1437d9337a760e7f930826fc4d6d", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1729281548, - "narHash": "sha256-MuojlSnwAJAwfhgmW8ZtZrwm2Sko4fqubCvReqbUzYw=", + "lastModified": 1729712798, + "narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=", "owner": "nix-community", "repo": "disko", - "rev": "a6a3179ddf396dfc28a078e2f169354d0c137125", + "rev": "09a776702b004fdf9c41a024e1299d575ee18a7d", "type": "github" }, "original": { @@ -51,11 +51,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1729321532, - "narHash": "sha256-3/d/mbLQhrkE1qK2Ut/mrMElE6fP9t6ITJoRQ6F+D7o=", + "lastModified": 1729753754, + "narHash": "sha256-eOr9ZXL68i27i2Xd+UHM95OBUFCEClEvqMbEACsIFMg=", "owner": "rycee", "repo": "nur-expressions", - "rev": "70087c8c6e491dcc0bbff459073b480b1a72ac1c", + "rev": "88c24cff42f478f2d32685d4e2a7be246214294d", "type": "gitlab" }, "original": { @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1728509152, - "narHash": "sha256-tQo1rg3TlwgyI8eHnLvZSlQx9d/o2Rb4oF16TfaTOw0=", + "lastModified": 1729448365, + "narHash": "sha256-oquZeWTYWTr5IxfwEzgsxjtD8SSFZYLdO9DaQb70vNU=", "owner": "nix-community", "repo": "gomod2nix", - "rev": "d5547e530464c562324f171006fc8f639aa01c9f", + "rev": "5d387097aa716f35dd99d848dc26d8d5b62a104c", "type": "github" }, "original": { @@ -187,11 +187,11 @@ }, "hardware": { "locked": { - "lastModified": 1729333370, - "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1729414726, + "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "fe56302339bb28e3471632379d733547caec8103", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1729716953, + "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1728974938, - "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", + "lastModified": 1729177642, + "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "23170582b0658e6afd913149a58863af3a57b376", + "rev": "bb69165ff372ddbd3228a03513922acd783040e8", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1729177642, - "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", + "lastModified": 1729751760, + "narHash": "sha256-sJIYCzp0AyWeIFDUvrX8DpakEFIAnYgMQbIupqT0Um4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bb69165ff372ddbd3228a03513922acd783040e8", + "rev": "899f84dd062dffc5dd912ba235e86be4855e5ffb", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1729757100, + "narHash": "sha256-x+8uGaX66V5+fUBHY23Q/OQyibQ38nISzxgj7A7Jqds=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "04193f188e4144d7047f83ad1de81d6034d175cd", "type": "github" }, "original": { @@ -304,11 +304,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1729025406, - "narHash": "sha256-uYbDN6JikC19WfD3zg0kpOpJVZFvBhHXYo3YJo28vOs=", + "lastModified": 1729453639, + "narHash": "sha256-L19R5CXCfTU9IFs9FAaYhDiteegfhJQMiAHLfls4Pdw=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "8d1193a959c7810f01610c10a055b0020390bf4e", + "rev": "68bc646058386e2ffbd9d78d79d6558e684f6b8c", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "umu": "umu" }, "locked": { - "lastModified": 1729301900, - "narHash": "sha256-NZ0GGy0OMCVzEsdaqLnefGtXsUnjgoCI2pleIvAUvfI=", + "lastModified": 1729733994, + "narHash": "sha256-OFI0EG5ToqHJMPgMKmo6eAJcHqhNVgrgcAMQ8oIHEN8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "5646c9455e9edf9ef59998fc79b82c5d5818ce77", + "rev": "af2e2e01939aa85a6ca588b97297a0856618f341", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -391,11 +391,11 @@ ] }, "locked": { - "lastModified": 1720066371, - "narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=", + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "622f829f5fe69310a866c8a6cd07e747c44ef820", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", "type": "github" }, "original": { @@ -413,11 +413,11 @@ ] }, "locked": { - "lastModified": 1729302344, - "narHash": "sha256-txj6S9QC1IiUlxz41dU8QORG47Mu0vX7ldwNKud2oy4=", + "lastModified": 1729734515, + "narHash": "sha256-KGE6Exd1NAhTo806QUqK3oCk40L7spjfEpHnrNNkFD4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "a2a26f1bada2202572599346eb952bd3e130af66", + "rev": "087ec37265ff1c8641086ee2a51450963494cdeb", "type": "github" }, "original": { @@ -428,11 +428,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -486,13 +486,29 @@ "type": "github" } }, + "nixpkgs-pr-350153": { + "locked": { + "lastModified": 1729504932, + "narHash": "sha256-EPpVtygY6YKeyyUe+gGuUp05c9QxCKs72QrMKXK/j2A=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "853015057fa0cd29fa47e94ebd88ea4d74b3703c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "853015057fa0cd29fa47e94ebd88ea4d74b3703c", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -504,11 +520,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1728156290, - "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", + "lastModified": 1729357638, + "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17ae88b569bb15590549ff478bab6494dde4a907", + "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", "type": "github" }, "original": { @@ -533,11 +549,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -549,11 +565,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -565,11 +581,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728093190, - "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", + "lastModified": 1729265718, + "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", + "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", "type": "github" }, "original": { @@ -596,6 +612,7 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-pr-169155": "nixpkgs-pr-169155", "nixpkgs-pr-269415": "nixpkgs-pr-269415", + "nixpkgs-pr-350153": "nixpkgs-pr-350153", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" @@ -607,11 +624,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1728345710, - "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", + "lastModified": 1729775275, + "narHash": "sha256-J2vtHq9sw1wWm0aTMXpEEAzsVCUMZDTEe5kiBYccpLE=", "owner": "mic92", "repo": "sops-nix", - "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", + "rev": "78a0e634fc8981d6b564f08b6715c69a755c4c7d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 57eaccb..48eda59 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-flatpak.url = "github:gmodena/nix-flatpak"; + # ccid broken in nixpkgs + nixpkgs-pr-350153.url = "github:nixos/nixpkgs?ref=853015057fa0cd29fa47e94ebd88ea4d74b3703c"; }; outputs = { self, disko, gomod2nix, nix-darwin, nixpkgs, nixpkgs-unstable, home-manager, chaotic diff --git a/modules/nixos/gaming-kernel.nix b/modules/nixos/gaming-kernel.nix index 342c2da..c394e00 100644 --- a/modules/nixos/gaming-kernel.nix +++ b/modules/nixos/gaming-kernel.nix @@ -33,3 +33,4 @@ }; }; } +# env DXVK_HDR=1 gamescope --adaptive-sync --force-grab-cursor --rt -f -W 3840 -H 2160 -r 240 --prefer-vk-device 1002:744c --hdr-enabled --hdr-debug-force-output -- env MANGOHUD=1 gamemoderun %command% diff --git a/nixos/hosts/f80/default.nix b/nixos/hosts/f80/default.nix index be0b297..9c2657d 100644 --- a/nixos/hosts/f80/default.nix +++ b/nixos/hosts/f80/default.nix @@ -50,6 +50,7 @@ environment.systemPackages = [ pkgs.gdb ]; chaotic.nyx.overlay.onTopOf = "user-pkgs"; chaotic.scx.enable = true; + chaotic.scx.scheduler = "scx_bpfland"; fonts.fontconfig = { antialias = false; subpixel.rgba = "none"; diff --git a/nixos/personalities/desktop/gaming.nix b/nixos/personalities/desktop/gaming.nix index 5b724f7..7333d4d 100644 --- a/nixos/personalities/desktop/gaming.nix +++ b/nixos/personalities/desktop/gaming.nix @@ -1,45 +1,38 @@ { inputs, pkgs, lib, ... }: { - # chaotic.mesa-git.enable = true; + # Current nixpkgs mesa 10/24/24 causes microstutters. + chaotic.mesa-git.enable = true; programs.steam = { enable = true; gamescopeSession.enable = true; - extest.enable = true; + extest.enable = false; + protontricks.enable = true; + fontPackages = with pkgs; [ + liberation_ttf + wqy_zenhei + source-han-sans + ]; + extraPackages = with pkgs; [ + gamemode + ]; package = pkgs.steam.override { - # privateTmp = false; extraEnv = { STEAM_FORCE_DESKTOPUI_SCALING = "1.5"; }; - extraPkgs = pkgs: - with pkgs; [ - liberation_ttf - wqy_zenhei - # Gamescope - xorg.libXcursor - xorg.libXi - xorg.libXinerama - xorg.libXScrnSaver - libpng - libpulseaudio - libvorbis - stdenv.cc.cc.lib - libkrb5 - keyutils - gamemode - ]; + extraLibraries = pkgs: [ pkgs.xorg.libxcb ]; }; extraCompatPackages = with pkgs; [ proton-ge-bin ]; }; programs.gamescope = { enable = true; capSysNice = false; - package = pkgs.gamescope_git; + package = pkgs.gamescope; }; hardware.graphics = { enable32Bit = true; - extraPackages = [ pkgs.gamescope-wsi_git ]; - extraPackages32 = [ pkgs.pkgsi686Linux.gamescope-wsi_git ]; + extraPackages = [ pkgs.gamescope-wsi ]; + extraPackages32 = [ pkgs.pkgsi686Linux.gamescope-wsi ]; }; hardware.pulseaudio.support32Bit = true; #FIXME: https://github.com/NixOS/nixpkgs/pull/326868 - environment.systemPackages = [ pkgs.protontricks pkgs.vulkan-tools pkgs.amdgpu_top pkgs.gamescope_git ]; + environment.systemPackages = [ pkgs.vulkan-tools pkgs.amdgpu_top pkgs.gamescope ]; programs.gamemode = { enable = true; settings = { diff --git a/nixos/personalities/physical/default.nix b/nixos/personalities/physical/default.nix index 3e11c08..cb41408 100644 --- a/nixos/personalities/physical/default.nix +++ b/nixos/personalities/physical/default.nix @@ -20,5 +20,10 @@ in { programs.ssh.startAgent = true; programs.ssh.agentPKCS11Whitelist = "${pkgs.yubico-piv-tool}/lib/libykcs11*,${pkgs.tpm2-pkcs11}/lib/libtpm2_pkcs11*"; - services.pcscd.enable = true; + services.pcscd = { + enable = true; + plugins = [ + inputs.nixpkgs-pr-350153.legacyPackages.${pkgs.system}.ccid + ]; + }; } diff --git a/pkgs/discover-overlay/default.nix b/pkgs/discover-overlay/default.nix index bea59f0..40a16db 100644 --- a/pkgs/discover-overlay/default.nix +++ b/pkgs/discover-overlay/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage, fetchFromGitHub, gobject-introspection, gtk-layer-shell, gtk3 , lib, wrapGAppsHook, pillow, pygobject3, pyxdg, requests, setuptools -, websocket-client, xlib, }: +, websocket-client, xlib, pulsectl-asyncio }: buildPythonPackage rec { pname = "discover-overlay"; version = "0.7.8"; @@ -23,6 +23,7 @@ buildPythonPackage rec { setuptools websocket-client xlib + pulsectl-asyncio ]; doCheck = false;