From cee982f17f82034f3a22fef272d4b4e5fe988211 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 12 Dec 2025 00:56:26 +0800 Subject: [PATCH] chore: Update flake inputs, remove chotic flake and switch to beta nvidia driver --- flake.lock | 636 +++++------------- flake.nix | 9 +- .../modules/programs/alacritty/default.nix | 1 - home/extra/default.nix | 1 - nixos/configurations/Akun/default.nix | 4 +- nixos/configurations/Tytonidae/default.nix | 2 +- nixos/configurations/Tytonidae/hardware.nix | 4 +- nixos/modules/nix.nix | 1 - nixos/modules/programs/steam.nix | 2 +- nixos/modules/top-level/default.nix | 1 - 10 files changed, 192 insertions(+), 469 deletions(-) diff --git a/flake.lock b/flake.lock index 40e6891..6c75b85 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -91,28 +91,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager", - "jovian": "jovian", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1763959276, - "narHash": "sha256-QJYTBOOGUy9HfPVvjY3sLwFgqNqcx6l7Ho9CnOV1jeM=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "9da2c2a35bd0c1dfcc4f7a32d62189d2e37cb1d7", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "repo": "nyx", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1754269165, @@ -159,11 +137,11 @@ ] }, "locked": { - "lastModified": 1763651264, - "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", + "lastModified": 1765326679, + "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", "owner": "nix-community", "repo": "disko", - "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", + "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", "type": "github" }, "original": { @@ -175,11 +153,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1762312706, - "narHash": "sha256-R3I8NErGSCd6kSTUBNe7SNcRDUtJ1xl8zvD13C6SrRg=", + "lastModified": 1765413096, + "narHash": "sha256-ADJNz84TCmcEScOeibny6/NmGXjV6BylbDD1xZnm7bE=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "ead254e15269bf8564625df4c8d2af6690a0df49", + "rev": "008a539d628c8c4c4e895b8f5166b390e988dbfb", "type": "github" }, "original": { @@ -190,15 +168,15 @@ }, "emacs-overlay": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1763977942, - "narHash": "sha256-Dhi5xNbhZI/GNKgxun7ckVCwLYepuWwMIPn8dYFJl0E=", + "lastModified": 1765441709, + "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f87351a238ddda570226360a8e0725fc2d75f273", + "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", "type": "github" }, "original": { @@ -217,11 +195,11 @@ ] }, "locked": { - "lastModified": 1763973050, - "narHash": "sha256-g0szh6HO7TogmtCKfbHi8dlMPWqvm7aiyc63wtL0FWc=", + "lastModified": 1765441709, + "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ec7f997a2ec8fab1b842e3b40df9fc9e55465909", + "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", "type": "github" }, "original": { @@ -233,11 +211,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -265,11 +243,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -318,27 +296,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "neovim-nightly", @@ -359,7 +316,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -377,7 +334,7 @@ "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -398,7 +355,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nur", @@ -419,20 +376,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -469,24 +412,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "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" - } - }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -522,7 +447,7 @@ "inputs": { "nixpkgs": [ "lanzaboote", - "pre-commit-hooks-nix", + "pre-commit", "nixpkgs" ] }, @@ -544,11 +469,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -561,15 +486,15 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_2" + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763839772, - "narHash": "sha256-R692DLhMzPmqyo1IDAanJoc4LDOQSZkbkh0nNt7dXPY=", + "lastModified": 1765223534, + "narHash": "sha256-I+/V98OMCQExceOjKhVArTitp3sK4gRPFFRMMnKboLQ=", "owner": "helix-editor", "repo": "helix", - "rev": "095227ef2f0308b097f981facc745fae77949c81", + "rev": "900204ebf040ca184ad144abd12bf8effdb66882", "type": "github" }, "original": { @@ -582,36 +507,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1763869804, - "narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=", + "lastModified": 1765461410, + "narHash": "sha256-AVZ1y5tfTGqf5zJx6uY52KHN2pP9gGF9RMQ3meBVKIg=", "owner": "nix-community", "repo": "home-manager", - "rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763963090, - "narHash": "sha256-zR7uDZdQUUC+gBOi4byefMvIZuSBeMC6GswGNsTgQlM=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7702d14879e8f0148fa168e38f3eaa2650fa0d85", + "rev": "7b34e428f31ce52baabda53e52bf14002e1c0625", "type": "github" }, "original": { @@ -635,76 +539,24 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763714684, - "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay_3" + "nixpkgs": "nixpkgs_3", + "pre-commit": "pre-commit", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1765382359, + "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.3", + "ref": "v1.0.0", "repo": "lanzaboote", "type": "github" } @@ -751,16 +603,16 @@ }, "neovim-nightly": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1763942693, - "narHash": "sha256-DvAkXPkSfgColZZ2sBbBl69CxzamyH7Hmi4qVUTP1OU=", + "lastModified": 1765411465, + "narHash": "sha256-rwrGoscS1AXRsiB100JduKO9ySKEjC8zsSBIDfKi1G8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "da647c7ac355d4f8be218ff0466bee9b5c6680ed", + "rev": "d47f5957732f763696803b564eb9c608a486014e", "type": "github" }, "original": { @@ -772,11 +624,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1763931717, - "narHash": "sha256-juqY16KziaFTk4D0Vx06tUlYLiEc6vMlEtjDLIjGn0Q=", + "lastModified": 1765391613, + "narHash": "sha256-6tqSpj8b33kSY/0rYEdQRHsICdkZD/AtXSoC0EH/hFY=", "owner": "neovim", "repo": "neovim", - "rev": "a88c7962a82f1427aa90d1c0a08514423516f9f2", + "rev": "78bbe53f7615e8b38d5289d9ce0579996109579b", "type": "github" }, "original": { @@ -797,11 +649,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763967518, - "narHash": "sha256-Gt0QlWp3r5JF+w2iZMbbot58UIR66fPH8LuHRxmHjsA=", + "lastModified": 1765386897, + "narHash": "sha256-wmHtBM2Iuthw9DsTD9RUkkZqrmsSJYGgflSaskE+Rrc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "69c6216ddacf8a708e4c6e51273772226fab3bc2", + "rev": "be7806f4fe2ead48eaf22e125f535d70a5ff2e3b", "type": "github" }, "original": { @@ -830,11 +682,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763964256, - "narHash": "sha256-TNtOfYXppR5ln5Go8ncQFMs5+xa3LqJWkaQq22ymAcI=", + "lastModified": 1765306956, + "narHash": "sha256-dAnL/EFft88xvKBLSE4pxSD5D945Cjm3E59bSl0feSE=", "owner": "YaLTeR", "repo": "niri", - "rev": "79e41d7d88de44356b48400515076bf5593544e8", + "rev": "4d058e611147803f5188e417943c6653d846542f", "type": "github" }, "original": { @@ -853,11 +705,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1763980357, - "narHash": "sha256-o39Zr+uZ01yq217KAQTUxO8k9gN7PLKYmoK1UTQ7eBc=", + "lastModified": 1765442844, + "narHash": "sha256-ZHCl5kXtohXNdmjJXbzGcoMFYIF7qSk8pD56L8KWSX0=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "817bc5de1ebd1045f591ae1e7cb67e78e098019c", + "rev": "8cf0e6407d6ab7fcefcb1a27979f6d286afc4d3b", "type": "github" }, "original": { @@ -868,15 +720,15 @@ }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_6" + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1763949820, - "narHash": "sha256-nN+Ebv2czqqMFIpH1/VfrjoaHzZTxTE/diuLhw1HqPQ=", + "lastModified": 1765419509, + "narHash": "sha256-77TEVLUAEdFhD6IinObc260YyVmF40kb9eKd4U2kRro=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "faa39649d0ad7e11bfcb7887ccda478515e489e8", + "rev": "ab846ed41d1a9b7f5ec0b36d2ccfbefe7208a330", "type": "github" }, "original": { @@ -885,29 +737,6 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nix4nvchad": { "inputs": { "flake-utils": "flake-utils_2", @@ -919,11 +748,11 @@ ] }, "locked": { - "lastModified": 1763694739, - "narHash": "sha256-zpT3XysPItqHuYvygFfC8ASzKNGExARZCrfDQUul1v4=", + "lastModified": 1765013597, + "narHash": "sha256-++TPRCm1NI5Z8hHEV8zqToJybnBROdgqWn9vdnQWp4Y=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "713a3693da4832c169aa90e8cae6e7a45b8c7949", + "rev": "3ce15d9ae05d9562da5ae6bff750ab19f3cf0862", "type": "github" }, "original": { @@ -934,11 +763,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -950,11 +779,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -964,22 +793,6 @@ "type": "github" } }, - "nixpkgs-fix-awscli2": { - "locked": { - "lastModified": 1763992412, - "narHash": "sha256-XFwKTAj3tgCTtaalfxhOtRcQbnW6+nO7uvWvGharCrI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4eb7329cba579c016e018a5e5dc9fea9cc8ee190", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1761765539, @@ -1012,11 +825,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1765363881, + "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", "type": "github" }, "original": { @@ -1028,53 +841,21 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1765311797, + "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_10": { - "locked": { - "lastModified": 1761236834, - "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1759381078, "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", @@ -1090,29 +871,45 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1754243818, - "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1765270179, + "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1763806073, - "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=", + "lastModified": 1764947035, + "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "878e468e02bfabeda08c79250f7ad583037f2227", + "rev": "a672be65651c80d3f592a89b3945466584a22069", "type": "github" }, "original": { @@ -1124,43 +921,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1765270179, + "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1763618868, - "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", + "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", "type": "github" }, "original": { @@ -1170,13 +951,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -1186,19 +967,34 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_8", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_6" + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_7", + "systems": "systems_5" }, "locked": { - "lastModified": 1763984728, - "narHash": "sha256-i07UsSg+kedev5Bh/p/ERG1xrbRivOztih8laHZR6W8=", + "lastModified": 1765461036, + "narHash": "sha256-g/RNWqXDN8jVZnyAeQzzztldWVesiOzZobTNhONL/no=", "owner": "nix-community", "repo": "nixvim", - "rev": "3dc952d69cd38cdc3ad3ec7570fc4a1caed2bfea", + "rev": "a3098ca665700afa34f9f26106505b7937969e14", "type": "github" }, "original": { @@ -1214,11 +1010,11 @@ ] }, "locked": { - "lastModified": 1763989982, - "narHash": "sha256-fUC13I7HJ6E0+KzkLMD34EpvKopqdwAk2jd31L65AyM=", + "lastModified": 1765420707, + "narHash": "sha256-lX0WxWosQbm3DrZhscVTiLLpJcoZvaQaZoP+eNt75wE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c7116827a4f58dc9f59f5e80f72466774a7c0ca3", + "rev": "298b2f5c794d4641cde21cf20422224bf8a60f99", "type": "github" }, "original": { @@ -1229,15 +1025,15 @@ }, "nur": { "inputs": { - "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_9" + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1763987906, - "narHash": "sha256-KWbfekGOnXBxcvrq0nl3R51jyN+6kVjIbr7m00KvO9c=", + "lastModified": 1765470296, + "narHash": "sha256-bURojPUn8jloR046JNZf6qrYNmEPfFEoDaLTKoP9pg4=", "owner": "nix-community", "repo": "NUR", - "rev": "ddb9f3d65e7d72ecf823b4546dddfc4dc515a5c8", + "rev": "441a70568483c0c48b338cca2030e3d9c7aef3ba", "type": "github" }, "original": { @@ -1258,11 +1054,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -1271,29 +1067,6 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nvchad-starter": { "flake": false, "locked": { @@ -1310,12 +1083,9 @@ "type": "github" } }, - "pre-commit-hooks-nix": { + "pre-commit": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -1323,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1765464257, + "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", "type": "github" }, "original": { @@ -1339,14 +1109,13 @@ "root": { "inputs": { "betterfox-nix": "betterfox-nix", - "chaotic": "chaotic", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "helix": "helix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "lanzaboote": "lanzaboote", "lix-module": "lix-module", "neovim-nightly": "neovim-nightly", @@ -1355,8 +1124,7 @@ "nix-gaming": "nix-gaming", "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", - "nixpkgs-fix-awscli2": "nixpkgs-fix-awscli2", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", @@ -1369,27 +1137,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "helix", @@ -1410,7 +1157,7 @@ "type": "github" } }, - "rust-overlay_3": { + "rust-overlay_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -1438,11 +1185,11 @@ ] }, "locked": { - "lastModified": 1763870012, - "narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=", + "lastModified": 1765231718, + "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3", + "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e", "type": "github" }, "original": { @@ -1454,11 +1201,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1763929057, - "narHash": "sha256-W9n1G1Uv0bKN/5sO4j7bfjopqJQaU7XgRXRaLrZKNc8=", + "lastModified": 1765456519, + "narHash": "sha256-spNknCXqELzNj2sYr6fjLO6CY0i5KdC4nRA44z8wUTc=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "26043e8d14815fadd20ea9a409b4824e1b9198c4", + "rev": "120814a243ff2e0ad5319bd6c83833398295d4f0", "type": "github" }, "original": { @@ -1482,7 +1229,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1490,11 +1237,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763845141, - "narHash": "sha256-o8TKdZluj/yC8qPIVNe2g4qopyFmQglH52+lvQx82kE=", + "lastModified": 1765386911, + "narHash": "sha256-YLjQpnTZCMjCho7ZDs5O1yFVw+fDlXq4lSJDuLWHHeA=", "owner": "nix-community", "repo": "stylix", - "rev": "adc650610085adbe130b9860d5bdb869f96050af", + "rev": "cb6bbed75eaca21deb8950c2ec0036ae5cde18ca", "type": "github" }, "original": { @@ -1593,21 +1340,6 @@ "type": "github" } }, - "systems_7": { - "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": { @@ -1644,11 +1376,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -1660,11 +1392,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -1676,11 +1408,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -1691,7 +1423,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1762938485, @@ -1727,11 +1459,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1763704521, - "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", + "lastModified": 1765343581, + "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", + "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", "type": "github" }, "original": { @@ -1750,11 +1482,11 @@ ] }, "locked": { - "lastModified": 1763958868, - "narHash": "sha256-IOP3fAjawH68FL1RDakySNRK6XNYdZajX538Q3U58Y0=", + "lastModified": 1765430623, + "narHash": "sha256-YfJwnCXF3V+WFedx4RtrIdZ8XxF6zB1Oh2ij/EHzoWk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "15db6bda557066f3525010209bde4ec5f968f2ba", + "rev": "f2881ba36cbfc86ef1fe741cec871fe523aea5bd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5b20f09..f11162e 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/master"; - nixpkgs-fix-awscli2.url = "github:NixOS/nixpkgs/master"; lix-module = { url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; @@ -166,12 +165,6 @@ repo = "treefmt-nix"; }; - chaotic = { - type = "github"; - owner = "chaotic-cx"; - repo = "nyx"; - }; - nur = { type = "github"; owner = "nix-community"; @@ -208,7 +201,7 @@ type = "github"; owner = "nix-community"; repo = "lanzaboote"; - ref = "v0.4.3"; + ref = "v1.0.0"; }; nix-doom = { diff --git a/home/david/modules/programs/alacritty/default.nix b/home/david/modules/programs/alacritty/default.nix index dcefe22..ad72a08 100644 --- a/home/david/modules/programs/alacritty/default.nix +++ b/home/david/modules/programs/alacritty/default.nix @@ -14,7 +14,6 @@ in { config = lib.mkIf cfg.enable { programs.alacritty = { enable = true; - package = pkgs.alacritty_git; settings = ( with lib; diff --git a/home/extra/default.nix b/home/extra/default.nix index bfc3e75..24ddfdb 100644 --- a/home/extra/default.nix +++ b/home/extra/default.nix @@ -7,7 +7,6 @@ (with inputs; [ niri-flake.homeModules.niri stylix.homeManagerModules.stylix - chaotic.homeManagerModules.default ]) ++ (lib.youthlic.loadImports ./.); } diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index fd409c3..41e9eba 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -72,7 +72,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_cachyos; + kernelPackages = pkgs.linuxKernel.packages.linux_zen; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; kernelParams = ["i915.enable_guc=2"]; @@ -83,7 +83,7 @@ }; }; hardware = { - graphics.package = pkgs.mesa_git; + graphics.package = pkgs.mesa; intelgpu = { vaapiDriver = "intel-vaapi-driver"; enableHybridCodec = true; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index fd6b7ad..c6a32e4 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -109,7 +109,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_cachyos-gcc; + kernelPackages = pkgs.linuxKernel.packages.linux_zen; lanzaboote = { enable = true; pkiBundle = "/var/lib/sbctl"; diff --git a/nixos/configurations/Tytonidae/hardware.nix b/nixos/configurations/Tytonidae/hardware.nix index f986409..67e4379 100644 --- a/nixos/configurations/Tytonidae/hardware.nix +++ b/nixos/configurations/Tytonidae/hardware.nix @@ -23,12 +23,14 @@ enable = true; users = ["david"]; }; - graphics.package = pkgs.mesa_git; + graphics.package = pkgs.mesa; intelgpu = { driver = "xe"; vaapiDriver = "intel-media-driver"; }; nvidia = { + # Fix Nvidia API Change, See + package = config.boot.kernelPackages.nvidiaPackages.beta; modesetting.enable = true; open = true; prime = { diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 266e639..b80b30f 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -32,7 +32,6 @@ cudaSupport = false; ncclSupport = false; }; - awscli2 = inputs.nixpkgs-fix-awscli2.legacyPackages.${p.stdenv.hostPlatform.system}.awscli2; }; }; }; diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 7762c37..65ac04a 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -14,7 +14,7 @@ in { config = lib.mkIf cfg.enable { hardware.graphics.enable32Bit = true; environment.systemPackages = with pkgs; [ - gamescope_git + gamescope ]; programs.steam = { enable = true; diff --git a/nixos/modules/top-level/default.nix b/nixos/modules/top-level/default.nix index 4da92ba..40009fb 100644 --- a/nixos/modules/top-level/default.nix +++ b/nixos/modules/top-level/default.nix @@ -10,7 +10,6 @@ stylix.nixosModules.stylix disko.nixosModules.disko lix-module.nixosModules.default - chaotic.nixosModules.default nixvim.nixosModules.nixvim ./..