From f8b37b4f689af5b3daaff52c13c87f1c788660a7 Mon Sep 17 00:00:00 2001 From: Phil Pluckthun Date: Sun, 17 May 2026 16:00:03 +0100 Subject: [PATCH] Update flakes --- flake.lock | 88 ++++++++++++++++------------------------ machines/pepper/home.nix | 5 --- modules/apps/games.nix | 32 ++++++++++++--- modules/nvim/default.nix | 1 - 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 13b6f9f..84e1988 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1777668651, - "narHash": "sha256-hzccmVXGxxpjc7PlJjXQmce7TKUaEqOnwB+rAZs4Ns0=", + "lastModified": 1778964373, + "narHash": "sha256-4dBTznhaHP0y4Ia7bBtnHxglYIrN5rjYt8Fh9p3i1Yc=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "e6c4aa5a294f30886f907b757b4e0751d3d01a56", + "rev": "8967b30df30d69be6b3efdc77ef40359ef122e0d", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1777553167, - "narHash": "sha256-wyGbwRrLlcwAwMcXX6QAd7yzF8wEjFhULYUO4Ajz7W4=", + "lastModified": 1778234684, + "narHash": "sha256-usIHfvSt7aXvMvRGtcbsue3rA13Z+9TW/7I3WBzLqFY=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "61259a00667ee19410810b992bee615b00587aca", + "rev": "3d7fe422ef6162154830209b9e50bf69e150cff7", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1775037210, - "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", + "lastModified": 1779003074, + "narHash": "sha256-fzWN7BoguvtZtxEohqSHpn1mE+WC8cQ587xNTW5fe4g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "06648f4902343228ce2de79f291dd5a58ee12146", + "rev": "1e107a7b92c6910f0e910d9f2520f5791189a01b", "type": "github" }, "original": { @@ -365,11 +365,11 @@ ] }, "locked": { - "lastModified": 1777679572, - "narHash": "sha256-egYNbRrkn+6SwTHinhdb6WUfzzdC3nXfCRqS321VylY=", + "lastModified": 1779027260, + "narHash": "sha256-ZbgWWFQmSyM3HQ31nAZk2hJ7OSeNr9uRFHL8jCifY9M=", "owner": "nix-community", "repo": "home-manager", - "rev": "9cb587ade2aa1b4a7257f0238d41072690b0ca4f", + "rev": "bcb774cfc3268120cd61808629f9aa7dad3750a2", "type": "github" }, "original": { @@ -566,11 +566,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1776983936, - "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", + "lastModified": 1778945272, + "narHash": "sha256-Aipz0UiBhE2a1FYJrNc2y+5vKWo5QVkhmaIJk3/ls+g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", + "rev": "379c1f274f0fa354d012f0600806de54e79f29b5", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777548390, - "narHash": "sha256-WacE23EbHTsBKvr8cu+1DFNbP6Rh1brHUH5SDUI0NQI=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7aaa00e7cc9be6c316cb5f6617bd740dd435c59d", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -732,7 +732,6 @@ "nvim-dap": "nvim-dap", "nvim-lspconfig": "nvim-lspconfig", "nvim-treesitter": "nvim-treesitter", - "nvim-treesitter-refactor": "nvim-treesitter-refactor", "nvim-treesitter-textobjects": "nvim-treesitter-textobjects", "oil-nvim": "oil-nvim", "plenary-nvim": "plenary-nvim", @@ -746,11 +745,11 @@ "which-key-nvim": "which-key-nvim" }, "locked": { - "lastModified": 1732627617, - "narHash": "sha256-Whu1kME/xFk1BgACsLwMZxiBvimZWNwOYErDBarNvds=", + "lastModified": 1778166533, + "narHash": "sha256-yzl2RtXchKEuIny6ZsMzQcHmEdt0AZqzaZt4x7GtOJA=", "owner": "kitten", "repo": "system-nvim-plugins.nix", - "rev": "7a52b5f5ecc432ae077485e3105e777d116b3232", + "rev": "d73bd6e36338aa8b23faf792465c82b69a55e45f", "type": "github" }, "original": { @@ -762,11 +761,11 @@ "nvim-treesitter": { "flake": false, "locked": { - "lastModified": 1732604102, - "narHash": "sha256-1Fxt+aQW4fj4KY73uDV9UzAao55MkSgTZCtcAL4ksls=", + "lastModified": 1775221900, + "narHash": "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "28591731d84c2fc18ddda60e1d53da24c31c4987", + "rev": "4916d6592ede8c07973490d9322f187e07dfefac", "type": "github" }, "original": { @@ -775,30 +774,14 @@ "type": "github" } }, - "nvim-treesitter-refactor": { - "flake": false, - "locked": { - "lastModified": 1726312917, - "narHash": "sha256-q6AzZtGvrQ/QAZSF8cM3fd6myENm6eE1rI6fqvLzqlg=", - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-refactor", - "rev": "d8b74fa87afc6a1e97b18da23e762efb032dc270", - "type": "github" - }, - "original": { - "owner": "nvim-treesitter", - "repo": "nvim-treesitter-refactor", - "type": "github" - } - }, "nvim-treesitter-textobjects": { "flake": false, "locked": { - "lastModified": 1732260993, - "narHash": "sha256-b/7Bz7L83KL+uZC1bRJ4PrzPVK/NaCKSx4VCHlPcdCM=", + "lastModified": 1775552773, + "narHash": "sha256-fOpRElIwvsFWm4AwETx7fpC3RtdH2BpCfX4YHVitqw0=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-textobjects", - "rev": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595", + "rev": "851e865342e5a4cb1ae23d31caf6e991e1c99f1e", "type": "github" }, "original": { @@ -1147,16 +1130,17 @@ }, "locked": { "dir": "nix", - "lastModified": 1776863312, - "narHash": "sha256-YBMcJrtMAxMt/MGrLsEYt6Xlfmm9e5tMHga5YA1Hdg8=", - "owner": "AndyFilter", + "lastModified": 1774866951, + "narHash": "sha256-zAQ35OHXGhGo+Zbi7lhNt/0XfjGUZfNG9fyoZrvAZvg=", + "owner": "kitten", "repo": "yeetmouse", - "rev": "63f133462aba176178dcdd9caaee7cb242f06384", + "rev": "784d7a4609c46bdbc542ec63961fede682ca9b9a", "type": "github" }, "original": { "dir": "nix", - "owner": "AndyFilter", + "owner": "kitten", + "ref": "@kitten/fix/nix-build-gui-config-changes", "repo": "yeetmouse", "type": "github" } @@ -1171,11 +1155,11 @@ ] }, "locked": { - "lastModified": 1777564084, - "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", + "lastModified": 1778919017, + "narHash": "sha256-P2+aRay2sPQGVXzNmiD4yYlhy4ytxqBvT4A2OLOvkoU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", + "rev": "7c41a80acc12ab012448b84aec90ca9b4bf8b9ac", "type": "github" }, "original": { diff --git a/machines/pepper/home.nix b/machines/pepper/home.nix index 127945d..90135d1 100644 --- a/machines/pepper/home.nix +++ b/machines/pepper/home.nix @@ -24,11 +24,6 @@ discord.enable = true; ghostty.enable = true; zen-browser.enable = true; - ollama = { - enable = true; - package = pkgs.ollama-rocm; - flashAttention = true; - }; }; }; } diff --git a/modules/apps/games.nix b/modules/apps/games.nix index b8a6d46..c897d94 100644 --- a/modules/apps/games.nix +++ b/modules/apps/games.nix @@ -44,14 +44,36 @@ in { users.users."${user}".extraGroups = [ "gamemode" ]; - environment.systemPackages = [ - (pkgs.lutris.override { - extraPkgs = (pkgs: with pkgs; [ gamemode ]); - }) - ]; + environment.systemPackages = with pkgs; [ heroic ]; programs = { gamemode.enable = true; + gamescope = { + enable = true; + package = pkgs.gamescope.overrideAttrs (old: { + enableWsi = true; + enableExecutable = true; + NIX_CFLAGS_COMPILE = [ "-fno-fast-math" ]; + }); + env = { + PROTON_ENABLE_WAYLAND = "1"; + PROTON_USE_NTSYNC = "1"; + SDL_VIDEODRIVER = "windows,wayland,x11"; + }; + args = [ + "--backend" "wayland" + "--adaptive-sync" + "--expose-wayland" + "--immediate-flips" + "--force-grab-cursor" + "--rt" + "-f" + "-S" "fit" + "-W" "2560" + "-H" "1440" + "-r" "360" + ]; + }; steam = { enable = true; package = pkgs.steam.override { diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix index bc35257..9b6bf0f 100644 --- a/modules/nvim/default.nix +++ b/modules/nvim/default.nix @@ -64,7 +64,6 @@ let telescope-zf-native-nvim nvim-treesitter - nvim-treesitter-refactor nvim-treesitter-textobjects ]; }; -- 2.51.2