From b331a0113b938966fa255e4b96f2e9171dc329bc Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Mon, 30 Jun 2025 22:42:14 -0400 Subject: [PATCH] Flake update; linux firmware update --- flake.lock | 238 +++++++++++++++++++++++++++++-------------- flake.nix | 5 +- overlays/default.nix | 4 +- 3 files changed, 165 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index aa9696b..ea10aa5 100644 --- a/flake.lock +++ b/flake.lock @@ -76,11 +76,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750851678, - "narHash": "sha256-vZRqRdZH5SegK8qn1VMI0Fjnsh9uTc6Y4EaYcrBDTzs=", + "lastModified": 1751333492, + "narHash": "sha256-ePQTd+GHFiFK2bxmZm3aiWlhyTwbpasjmc+kuM0nxeg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1e8d69811b5d6cd53f71a34e19a00746c94a830d", + "rev": "d107b2c87bf7446959668fcc22b2b09b37b27cf3", "type": "github" }, "original": { @@ -208,7 +208,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -226,7 +226,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_2" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1715533576, @@ -247,6 +247,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -261,9 +279,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1681202837, @@ -279,9 +297,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -401,11 +419,11 @@ ] }, "locked": { - "lastModified": 1750730235, - "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=", + "lastModified": 1751238753, + "narHash": "sha256-hJUPWfz/h+QgXKaKovPwFAdNBnALsvVMggAPgBB+Qvw=", "owner": "nix-community", "repo": "home-manager", - "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38", + "rev": "cab8104e9236fab1eb9a702165454ffed353c20f", "type": "github" }, "original": { @@ -421,11 +439,11 @@ ] }, "locked": { - "lastModified": 1750798083, - "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=", + "lastModified": 1751336185, + "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82", + "rev": "96354906f58464605ff81d2f6c2ea23211cbf051", "type": "github" }, "original": { @@ -435,6 +453,27 @@ } }, "home-manager_3": { + "inputs": { + "nixpkgs": [ + "play", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1751336185, + "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "96354906f58464605ff81d2f6c2ea23211cbf051", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { "inputs": { "nixpkgs": [ "stylix", @@ -461,7 +500,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1709914708, @@ -503,15 +542,15 @@ "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1750816932, - "narHash": "sha256-93dN5ieDQ1VTUCbTCf2WHogjUu3pPk9iLmCQpdQk6R0=", + "lastModified": 1751335864, + "narHash": "sha256-gzOCRagb6AYmjw6pSKNAJUajnSk0gKNsfZYSbiyrBkM=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b630fd69c213f3a92ef799ba8169ed2926731c0f", + "rev": "9ebdcaea0533a5277a65b4fc9935b66e0619e053", "type": "github" }, "original": { @@ -545,11 +584,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750741721, - "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4b1164c3215f018c4442463a27689d973cffd750", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -576,11 +615,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { @@ -592,11 +631,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750741721, - "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4b1164c3215f018c4442463a27689d973cffd750", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -608,11 +647,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750741721, - "narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4b1164c3215f018c4442463a27689d973cffd750", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -699,6 +738,31 @@ "type": "github" } }, + "play": { + "inputs": { + "chaotic": [ + "chaotic" + ], + "flake-utils": "flake-utils", + "home-manager": "home-manager_3", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1751323468, + "narHash": "sha256-CxsOWsjihH47iATdnbaYjJjrTgpULX4cDrJDKwkxyAE=", + "owner": "tophc7", + "repo": "play.nix", + "rev": "e1d48215ee2c0ce9d25bd72d11268925d12d4537", + "type": "github" + }, + "original": { + "owner": "tophc7", + "repo": "play.nix", + "type": "github" + } + }, "root": { "inputs": { "chaotic": "chaotic", @@ -709,6 +773,7 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nixvirt": "nixvirt", + "play": "play", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "snapraid-aio": "snapraid-aio", "solaar": "solaar", @@ -746,11 +811,11 @@ ] }, "locked": { - "lastModified": 1750732748, - "narHash": "sha256-HR2b3RHsPeJm+Fb+1ui8nXibgniVj7hBNvUbXEyz0DU=", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4b4494b2ba7e8a8041b2e28320b2ee02c115c75f", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { @@ -761,24 +826,24 @@ }, "snapraid-aio": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ], "snapraid-aio-src": "snapraid-aio-src" }, "locked": { "lastModified": 1746396069, "narHash": "sha256-nLsYmvA42+wOzy3oYdMBfrmz8pzQkuwPtWk0aZ0l8Fo=", - "ref": "refs/heads/main", + "owner": "tophc7", + "repo": "snapraid-aio.nix", "rev": "31697d56771a9ac899a563da96fa27e88b20f036", - "revCount": 3, - "type": "git", - "url": "https://git.ryot.foo/toph/snapraid-aio.nix.git" + "type": "github" }, "original": { - "type": "git", - "url": "https://git.ryot.foo/toph/snapraid-aio.nix.git" + "owner": "tophc7", + "repo": "snapraid-aio.nix", + "type": "github" } }, "snapraid-aio-src": { @@ -855,10 +920,10 @@ "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_5", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -866,11 +931,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1750810405, - "narHash": "sha256-7Aa6jLbbltPVBCz34UXjIXkmrV1qq+6TYhJ37fErQhg=", + "lastModified": 1751296480, + "narHash": "sha256-PMuzVs9khM7cYrjUCXQeV2OP6WVtbsmdZwa4Cc21y0o=", "owner": "danth", "repo": "stylix", - "rev": "1fc22894545f5adf915e245b3c3e92639fd70f64", + "rev": "4ead8043f70cc3b951e704a1f6e40c8a10230e61", "type": "github" }, "original": { @@ -880,21 +945,6 @@ } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -909,6 +959,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -984,6 +1049,21 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -1089,7 +1169,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -1107,7 +1187,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs-unstable" ] @@ -1128,23 +1208,23 @@ }, "yay": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ - "nixpkgs" + "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1750129774, - "narHash": "sha256-3r/9KDvmciXiM12xBTPoC2YqIMJX7XlkrNSa6lNvfrc=", - "ref": "refs/heads/main", - "rev": "eb39f490a252ac063746d093ac71e73327c5de27", - "revCount": 15, - "type": "git", - "url": "https://git.ryot.foo/toph/yay.nix.git" + "lastModified": 1750969106, + "narHash": "sha256-RRryqilYizTb0+NF4sZVMWpoJxoXNppdfDUmoziSl5o=", + "owner": "tophc7", + "repo": "yay.nix", + "rev": "b1b6463a7045b1ac121ce241d6b147e71f5d953f", + "type": "github" }, "original": { - "type": "git", - "url": "https://git.ryot.foo/toph/yay.nix.git" + "owner": "tophc7", + "repo": "yay.nix", + "type": "github" } }, "zen-browser": { @@ -1154,11 +1234,11 @@ ] }, "locked": { - "lastModified": 1750219862, - "narHash": "sha256-wce+erYDBm6wpLJm6IJh85KYqy/NtdKp6DZQCn4YP1Q=", + "lastModified": 1751256876, + "narHash": "sha256-4A8LmE0Hd9RvQwSEPYdITJebpLt7J99VY76IphzqZKc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "18d6cd2f5a9cd1527d478d4f716e9b9ee6fb6cbb", + "rev": "615b9244dc7ac777b8f0bc3a9cb7290936e4fcf9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 29c01fd..f9608d0 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,10 @@ play = { url = "github:tophc7/play.nix"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs = { + nixpkgs.follows = "nixpkgs-unstable"; + chaotic.follows = "chaotic"; + }; }; ## Misc Packages ## diff --git a/overlays/default.nix b/overlays/default.nix index 898e076..d45c98f 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -18,11 +18,11 @@ let modifications = final: prev: { ## FIXME: Workaround, amd drivers are borked on current nixpkgs-unstable linux-firmware = prev.linux-firmware.overrideAttrs (old: rec { - version = "20250625"; + version = "20250630"; src = prev.fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; - rev = "b05fabcd6f2a16d50b5f86c389dde7a33f00bb81"; + rev = "e2dad11e8d4b169fdeac476d694d6ef8f2d3b5bf"; hash = "sha256-AvSsyfKP57Uhb3qMrf6PpNHKbXhD9IvFT1kcz5J7khM="; }; });