From 3185f43ff70b75be2f0c19972440d5c69bf9a05c Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Mon, 8 Dec 2025 13:42:42 +0800 Subject: [PATCH 1/9] feat: Add prismlauncher and customize jdk versions --- nixos/configurations/Tytonidae/default.nix | 1 + overlays/modifications/default.nix | 1 + overlays/modifications/prismlauncher.nix | 5 +++++ pkgs/prismlauncher'.nix | 10 ++++++++++ 4 files changed, 17 insertions(+) create mode 100644 overlays/modifications/prismlauncher.nix create mode 100644 pkgs/prismlauncher'.nix diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 1ad9914..fd6b7ad 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -95,6 +95,7 @@ doom-emacs neovide osu-lazer-bin # typochecker: disable-line + prismlauncher sbctl ]; diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 663f1c1..e7126e5 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -15,6 +15,7 @@ in ./nautilus.nix ./neovim-nightly.nix ./vim.nix + ./prismlauncher.nix # Nur ./nur.nix diff --git a/overlays/modifications/prismlauncher.nix b/overlays/modifications/prismlauncher.nix new file mode 100644 index 0000000..bcf1b4d --- /dev/null +++ b/overlays/modifications/prismlauncher.nix @@ -0,0 +1,5 @@ +{outputs, ...}: _final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + prismlauncher = outputs.packages.${system}.prismlauncher'; +} diff --git a/pkgs/prismlauncher'.nix b/pkgs/prismlauncher'.nix new file mode 100644 index 0000000..59733a3 --- /dev/null +++ b/pkgs/prismlauncher'.nix @@ -0,0 +1,10 @@ +{ + prismlauncher, + jdk17, + jdk21, + jdk8, + jdk25, +}: +prismlauncher.override { + jdks = [jdk17 jdk21 jdk8 jdk25]; +} From cee982f17f82034f3a22fef272d4b4e5fe988211 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 12 Dec 2025 00:56:26 +0800 Subject: [PATCH 2/9] 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 ./.. From d9c7e3fc2cad72fa9c83c6086c90254769748666 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 12 Dec 2025 00:56:26 +0800 Subject: [PATCH 3/9] fix: Disable stylix for zen-browser --- home/david/modules/programs/zen-browser.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/david/modules/programs/zen-browser.nix b/home/david/modules/programs/zen-browser.nix index dc5a958..1a78233 100644 --- a/home/david/modules/programs/zen-browser.nix +++ b/home/david/modules/programs/zen-browser.nix @@ -12,6 +12,7 @@ in { }; }; config = lib.mkIf cfg.enable { + stylix.targets.zen-browser.enable = false; programs.zen-browser = { enable = true; profiles.default = { From c2f2eacc729fc4525678962e280f93960c7d7f97 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 12 Dec 2025 00:56:26 +0800 Subject: [PATCH 4/9] fix: Disable osu-lazer for building bug --- nixos/configurations/Tytonidae/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index c6a32e4..3a20f04 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -94,7 +94,7 @@ neovim-nightly doom-emacs neovide - osu-lazer-bin # typochecker: disable-line + # osu-lazer-bin # typochecker: disable-line prismlauncher sbctl From be185a893c87c5aa7e3d74608bfb56f983573353 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 11 Dec 2025 21:50:08 +0800 Subject: [PATCH 5/9] chore: Modify dae config --- nixos/modules/programs/dae/config.dae | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/dae/config.dae b/nixos/modules/programs/dae/config.dae index 7133c7e..6aa935c 100644 --- a/nixos/modules/programs/dae/config.dae +++ b/nixos/modules/programs/dae/config.dae @@ -65,7 +65,7 @@ routing { pname(juicity-client) -> must_direct # pname(systemd-resolve) -> must_direct - dip(107.174.145.140) -> must_direct + # dip(107.174.145.140) -> must_direct domain(full: time.windows.com) -> must_direct domain(regex: ".*wgetcloud.*v2ray.*") -> must_direct domain(suffix: "hit.edu.cn") -> must_direct From 24caa95d846f6c2a73fe8f38a56c6911f168a8e8 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Fri, 26 Dec 2025 23:32:59 +0800 Subject: [PATCH 6/9] chore: Update flake inptus and pkg upstream sources --- _sources/generated.json | 38 +-- _sources/generated.nix | 44 +--- flake.lock | 266 ++++++++++----------- home/david/modules/programs/noctalia.nix | 1 + nixos/configurations/Tytonidae/default.nix | 2 +- nixos/modules/top-level/default.nix | 1 - 6 files changed, 152 insertions(+), 200 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 9f19bbd..0fc8749 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-11-11", + "date": "2025-12-27", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de", - "sha256": "sha256-jijgOp6SLzoIB3Vt94brwF316HwqYU8JppwTpXF+Y+A=", + "rev": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9", + "sha256": "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de" + "version": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9" }, "cliphist": { "cargoLocks": null, @@ -64,26 +64,6 @@ }, "version": "efb61cb5b5a28d896c05a24ac83b9c39c96575f2" }, - "juicity": { - "cargoLocks": null, - "date": "2025-06-30", - "extract": null, - "name": "juicity", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "412dbe43e091788c5464eb2d6e9c169bdf39f19c", - "sha256": "sha256-FU4+PXIyZS0RINEFD7Wylz9SOVEW9EnolaPGgZfhj9Y=", - "sparseCheckout": [], - "type": "git", - "url": "https://githuh.com/juicity/juicity" - }, - "version": "412dbe43e091788c5464eb2d6e9c169bdf39f19c" - }, "noto-sans-cjk": { "cargoLocks": null, "date": null, @@ -168,7 +148,7 @@ }, "spotx": { "cargoLocks": null, - "date": "2025-11-07", + "date": "2025-12-26", "extract": null, "name": "spotx", "passthru": null, @@ -180,12 +160,12 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "a2bd8479a2a80a068e749530aa5a78b2918358b8", - "sha256": "sha256-pQgXi6AU0OlJgOe3GB+m1fivchzbfTp6UWF54hx+QNU=", + "rev": "7c016872bf24ee5357f9621f1136955443f0a8a3", + "sha256": "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8=", "sparseCheckout": [], "type": "github" }, - "version": "a2bd8479a2a80a068e749530aa5a78b2918358b8" + "version": "7c016872bf24ee5357f9621f1136955443f0a8a3" }, "tree-sitter-idris": { "cargoLocks": null, @@ -275,4 +255,4 @@ }, "version": "184f55dbc5320c34a56d02353410ad35a0f3e090" } -} +} \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index fc916a1..7eb74a4 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de"; + version = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "732ee83a7f9fc03a527e2b3e6dbb05e94335a3de"; + rev = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-jijgOp6SLzoIB3Vt94brwF316HwqYU8JppwTpXF+Y+A="; + sha256 = "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg="; }; - date = "2025-11-11"; + date = "2025-12-27"; }; cliphist = { pname = "cliphist"; @@ -40,20 +40,6 @@ }; date = "2025-10-11"; }; - juicity = { - pname = "juicity"; - version = "412dbe43e091788c5464eb2d6e9c169bdf39f19c"; - src = fetchgit { - url = "https://githuh.com/juicity/juicity"; - rev = "412dbe43e091788c5464eb2d6e9c169bdf39f19c"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ ]; - sha256 = "sha256-FU4+PXIyZS0RINEFD7Wylz9SOVEW9EnolaPGgZfhj9Y="; - }; - date = "2025-06-30"; - }; noto-sans-cjk = { pname = "noto-sans-cjk"; version = "Serif2.003"; @@ -103,31 +89,17 @@ sha256 = "sha256-fw4DxYyONb1ZkoIiLc/TRPw5jBy7RcM1JLF4HfEvgrQ="; }; }; - spotifyd = { - pname = "spotifyd"; - version = "f1acee9c6160db92dcd4214e96654cbbaed0e38a"; - src = fetchgit { - url = "https://github.com/ulic-youthlic/spotifyd.git"; - rev = "f1acee9c6160db92dcd4214e96654cbbaed0e38a"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ ]; - sha256 = "sha256-dcc+sklPJvV34U1A/eTD1kfIey4o5/kPq4yd72ey7LE="; - }; - date = "2025-09-04"; - }; spotx = { pname = "spotx"; - version = "a2bd8479a2a80a068e749530aa5a78b2918358b8"; + version = "7c016872bf24ee5357f9621f1136955443f0a8a3"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "a2bd8479a2a80a068e749530aa5a78b2918358b8"; + rev = "7c016872bf24ee5357f9621f1136955443f0a8a3"; fetchSubmodules = false; - sha256 = "sha256-pQgXi6AU0OlJgOe3GB+m1fivchzbfTp6UWF54hx+QNU="; + sha256 = "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8="; }; - date = "2025-11-07"; + date = "2025-12-26"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; diff --git a/flake.lock b/flake.lock index 6c75b85..f3761f1 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -78,11 +78,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1763946419, - "narHash": "sha256-bcgbx3Ps7dL9hE+op6OSMVAMkXcidZHVNsFuBKbCy0w=", + "lastModified": 1765765778, + "narHash": "sha256-w7nVSCFHEcTcrbQEzVdx5MaE+7iTaAtLHjV2jfOTSCI=", "owner": "HeitorAugustoLN", "repo": "betterfox-nix", - "rev": "9c394344f04e0bb89eeeb1ed36917e1dbfa59bab", + "rev": "b3dae410c6f9e632955c67d77791ae231a7dd3c3", "type": "github" }, "original": { @@ -93,11 +93,11 @@ }, "crane": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1765145449, + "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", "type": "github" }, "original": { @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1762286984, - "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", + "lastModified": 1766051518, + "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", "owner": "serokell", "repo": "deploy-rs", - "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", + "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1765326679, - "narHash": "sha256-fTLX9kDwLr9Y0rH/nG+h1XG5UU+jBcy0PFYn5eneRX8=", + "lastModified": 1766150702, + "narHash": "sha256-P0kM+5o+DKnB6raXgFEk3azw8Wqg5FL6wyl9jD+G5a4=", "owner": "nix-community", "repo": "disko", - "rev": "d64e5cdca35b5fad7c504f615357a7afe6d9c49e", + "rev": "916506443ecd0d0b4a0f4cf9d40a3c22ce39b378", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1765413096, - "narHash": "sha256-ADJNz84TCmcEScOeibny6/NmGXjV6BylbDD1xZnm7bE=", + "lastModified": 1766618641, + "narHash": "sha256-/zLb6YzJJ3ZnTCjmakOOt83qtQiF9+GJ2NesFk+c8WM=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "008a539d628c8c4c4e895b8f5166b390e988dbfb", + "rev": "21682009b155c0b67ec47100e09cad3b298aa52f", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1765441709, - "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", + "lastModified": 1766740527, + "narHash": "sha256-PCRYcskcLxgf8ps22hy5YebppdFix9N/WB1PMFePwU8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", + "rev": "c4ba4e54eb1055ba63465fe6752d400ada36c724", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1765441709, - "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", + "lastModified": 1766737834, + "narHash": "sha256-/tlBtwpFzr2c49EfzMEiwycAS7WGZSTdM488QB9tlgg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", + "rev": "f4f94ced63b1ba7c1fe5a8d0612b5c2c4c44b0bc", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -490,11 +490,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765223534, - "narHash": "sha256-I+/V98OMCQExceOjKhVArTitp3sK4gRPFFRMMnKboLQ=", + "lastModified": 1765989342, + "narHash": "sha256-lpNWO7lV/GzkWwWYuAkAkEpWylsYComA7IntWPScYq0=", "owner": "helix-editor", "repo": "helix", - "rev": "900204ebf040ca184ad144abd12bf8effdb66882", + "rev": "b74e2694124b9d269d05f6aace42d4756c3bb724", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1765461410, - "narHash": "sha256-AVZ1y5tfTGqf5zJx6uY52KHN2pP9gGF9RMQ3meBVKIg=", + "lastModified": 1766682973, + "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b34e428f31ce52baabda53e52bf14002e1c0625", + "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", "type": "github" }, "original": { @@ -608,11 +608,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1765411465, - "narHash": "sha256-rwrGoscS1AXRsiB100JduKO9ySKEjC8zsSBIDfKi1G8=", + "lastModified": 1766707499, + "narHash": "sha256-Lmn0DYvFOdAV5lMLCODSOPmvjJYPxS19d9fu3VtZ2ng=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "d47f5957732f763696803b564eb9c608a486014e", + "rev": "bcdaa959f18326bccf889cfd1bd49e9d39d5f91c", "type": "github" }, "original": { @@ -624,11 +624,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1765391613, - "narHash": "sha256-6tqSpj8b33kSY/0rYEdQRHsICdkZD/AtXSoC0EH/hFY=", + "lastModified": 1766651930, + "narHash": "sha256-kTaJ3AQ+yPvk1vs5wNHaw8uNxLKp4e2t49ZM7t4QZuE=", "owner": "neovim", "repo": "neovim", - "rev": "78bbe53f7615e8b38d5289d9ce0579996109579b", + "rev": "5a1a92cc7a3d3a338fe5f610190910e220f074f6", "type": "github" }, "original": { @@ -649,11 +649,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765386897, - "narHash": "sha256-wmHtBM2Iuthw9DsTD9RUkkZqrmsSJYGgflSaskE+Rrc=", + "lastModified": 1766757237, + "narHash": "sha256-KzxXihL0UAaUyFcywtEEBTTNn7gIdtN6Z+Gd0X0jkHw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "be7806f4fe2ead48eaf22e125f535d70a5ff2e3b", + "rev": "d72c111814489ae4f549cd194598138128550847", "type": "github" }, "original": { @@ -682,11 +682,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765306956, - "narHash": "sha256-dAnL/EFft88xvKBLSE4pxSD5D945Cjm3E59bSl0feSE=", + "lastModified": 1766751930, + "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=", "owner": "YaLTeR", "repo": "niri", - "rev": "4d058e611147803f5188e417943c6653d846542f", + "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1", "type": "github" }, "original": { @@ -705,11 +705,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1765442844, - "narHash": "sha256-ZHCl5kXtohXNdmjJXbzGcoMFYIF7qSk8pD56L8KWSX0=", + "lastModified": 1766738714, + "narHash": "sha256-7kIfulmTW1aHEYVF8jLACdzbUJPrYerMXrcUB1NSyDk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8cf0e6407d6ab7fcefcb1a27979f6d286afc4d3b", + "rev": "726300f3861897c2e5519acd3dd74ca8aea16b62", "type": "github" }, "original": { @@ -724,11 +724,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1765419509, - "narHash": "sha256-77TEVLUAEdFhD6IinObc260YyVmF40kb9eKd4U2kRro=", + "lastModified": 1766541727, + "narHash": "sha256-fvzdJMWM3Nisav0AYbCO9yQ0LbM2Od8Ulp6YBw2r3Ac=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ab846ed41d1a9b7f5ec0b36d2ccfbefe7208a330", + "rev": "4e3926b98be61b018915ded9f8f8706a4ce1a267", "type": "github" }, "original": { @@ -748,11 +748,11 @@ ] }, "locked": { - "lastModified": 1765013597, - "narHash": "sha256-++TPRCm1NI5Z8hHEV8zqToJybnBROdgqWn9vdnQWp4Y=", + "lastModified": 1766128535, + "narHash": "sha256-a9/fO9HTkBIW6MRr4peNUBj/4HnIURnBoSQGpdTude0=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "3ce15d9ae05d9562da5ae6bff750ab19f3cf0862", + "rev": "30dbf95272d15db9562419dd516620d8c1b355b7", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1766568855, + "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", "type": "github" }, "original": { @@ -779,11 +779,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -795,11 +795,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -810,11 +810,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1761765539, - "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "lastModified": 1765674936, + "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", "type": "github" }, "original": { @@ -825,11 +825,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1765363881, - "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", + "lastModified": 1766687554, + "narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", + "rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136", "type": "github" }, "original": { @@ -841,11 +841,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1766622938, + "narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f", "type": "github" }, "original": { @@ -873,11 +873,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -889,11 +889,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1765270179, - "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", + "lastModified": 1766653575, + "narHash": "sha256-TPgxCS7+hWc4kPhzkU5dD2M5UuPhLuuaMNZ/IpwKQvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", + "rev": "3c1016e6acd16ad96053116d0d3043029c9e2649", "type": "github" }, "original": { @@ -905,11 +905,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "type": "github" }, "original": { @@ -921,11 +921,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -937,11 +937,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1765270179, - "narHash": "sha256-g2a4MhRKu4ymR4xwo+I+auTknXt/+j37Lnf0Mvfl1rE=", + "lastModified": 1766471942, + "narHash": "sha256-Wv+xrUNXgtxAXAMZE3EDzzeRgN1MEw+PnKr8zDozeLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "677fbe97984e7af3175b6c121f3c39ee5c8d62c9", + "rev": "cfc52a405c6e85462364651a8f11e28ae8065c91", "type": "github" }, "original": { @@ -953,11 +953,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -990,11 +990,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1765461036, - "narHash": "sha256-g/RNWqXDN8jVZnyAeQzzztldWVesiOzZobTNhONL/no=", + "lastModified": 1766721995, + "narHash": "sha256-2qZLSojZFP3AzbC6UNF3ASCIDLahNniR2XP7l/qINm4=", "owner": "nix-community", "repo": "nixvim", - "rev": "a3098ca665700afa34f9f26106505b7937969e14", + "rev": "66a5dc70e2d8433034bccdbb9c3c7bcecd86f9a6", "type": "github" }, "original": { @@ -1010,11 +1010,11 @@ ] }, "locked": { - "lastModified": 1765420707, - "narHash": "sha256-lX0WxWosQbm3DrZhscVTiLLpJcoZvaQaZoP+eNt75wE=", + "lastModified": 1766762674, + "narHash": "sha256-mP3eq1nYKz61PnTbdk4AmDbjp01tT7fjeTOjDI4mANo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "298b2f5c794d4641cde21cf20422224bf8a60f99", + "rev": "35eccc54a37c94a6da56d4509312c640a3c11978", "type": "github" }, "original": { @@ -1029,11 +1029,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1765470296, - "narHash": "sha256-bURojPUn8jloR046JNZf6qrYNmEPfFEoDaLTKoP9pg4=", + "lastModified": 1766762418, + "narHash": "sha256-yso1qtTpUzOlozZZrZi3WHFszXFOvnC44DkSaUoEbuI=", "owner": "nix-community", "repo": "NUR", - "rev": "441a70568483c0c48b338cca2030e3d9c7aef3ba", + "rev": "4b60f506ed8576ff8ddf6c6480199644008d4ea6", "type": "github" }, "original": { @@ -1093,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1765464257, - "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -1185,11 +1185,11 @@ ] }, "locked": { - "lastModified": 1765231718, - "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=", + "lastModified": 1766289575, + "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e", + "rev": "9836912e37aef546029e48c8749834735a6b9dad", "type": "github" }, "original": { @@ -1201,11 +1201,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1765456519, - "narHash": "sha256-spNknCXqELzNj2sYr6fjLO6CY0i5KdC4nRA44z8wUTc=", + "lastModified": 1766604293, + "narHash": "sha256-mcSwY9xIF0FIc81JBf185HKUqjTUwoD4pS9E+1ydUbg=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "120814a243ff2e0ad5319bd6c83833398295d4f0", + "rev": "acffc3741fbda483889d059083298b4a52a5807f", "type": "github" }, "original": { @@ -1237,11 +1237,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765386911, - "narHash": "sha256-YLjQpnTZCMjCho7ZDs5O1yFVw+fDlXq4lSJDuLWHHeA=", + "lastModified": 1766603026, + "narHash": "sha256-J2DDdRqSU4w9NNgkMfmMeaLIof5PXtS9RG7y6ckDvQE=", "owner": "nix-community", "repo": "stylix", - "rev": "cb6bbed75eaca21deb8950c2ec0036ae5cde18ca", + "rev": "551df12ee3ebac52c5712058bd97fd9faa4c3430", "type": "github" }, "original": { @@ -1426,11 +1426,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { @@ -1459,11 +1459,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765343581, - "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", + "lastModified": 1766429945, + "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", + "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", "type": "github" }, "original": { @@ -1482,11 +1482,11 @@ ] }, "locked": { - "lastModified": 1765430623, - "narHash": "sha256-YfJwnCXF3V+WFedx4RtrIdZ8XxF6zB1Oh2ij/EHzoWk=", + "lastModified": 1766697593, + "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f2881ba36cbfc86ef1fe741cec871fe523aea5bd", + "rev": "98d8f48ba80a4b6e3b56addad850d57132301075", "type": "github" }, "original": { diff --git a/home/david/modules/programs/noctalia.nix b/home/david/modules/programs/noctalia.nix index 769235a..14b70dd 100644 --- a/home/david/modules/programs/noctalia.nix +++ b/home/david/modules/programs/noctalia.nix @@ -58,6 +58,7 @@ in { }; }; config = lib.mkIf cfg.enable { + stylix.targets.noctalia-shell.enable = false; home.packages = [pkgs.app2unit]; programs.noctalia-shell = { enable = true; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 3a20f04..c6a32e4 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -94,7 +94,7 @@ neovim-nightly doom-emacs neovide - # osu-lazer-bin # typochecker: disable-line + osu-lazer-bin # typochecker: disable-line prismlauncher sbctl diff --git a/nixos/modules/top-level/default.nix b/nixos/modules/top-level/default.nix index 40009fb..bca18a1 100644 --- a/nixos/modules/top-level/default.nix +++ b/nixos/modules/top-level/default.nix @@ -22,7 +22,6 @@ additions ]; }; - system.rebuild.enableNg = true; environment.systemPackages = with pkgs; [ deploy-rs ]; From de798188e5c57393f2d4333f6d618e86d4200578 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 1 Jan 2026 18:57:02 +0800 Subject: [PATCH 7/9] feat: Add kdeconnect module --- nixos/configurations/Tytonidae/default.nix | 1 + nixos/modules/programs/kdeconnect.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/modules/programs/kdeconnect.nix diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index c6a32e4..352a1a6 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -51,6 +51,7 @@ garage.enable = true; # emacs.enable = true; sunshine.enable = true; + kdeconnect.enable = true; }; }; diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix new file mode 100644 index 0000000..44e4acd --- /dev/null +++ b/nixos/modules/programs/kdeconnect.nix @@ -0,0 +1,18 @@ +{ + lib, + config, + ... +}: let + cfg = config.youthlic.programs.kdeconnect; +in { + options = { + youthlic.programs.kdeconnect = { + enable = lib.mkEnableOption "kdeconnect"; + }; + }; + config = lib.mkIf cfg.enable { + programs.kdeconnect = { + enable = true; + }; + }; +} From 367f683bded0b79dea129386de9e7a6972d657f0 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 1 Jan 2026 18:57:02 +0800 Subject: [PATCH 8/9] chore: Use original ghostty flake and update flake inputs --- flake.lock | 553 +++++++++++++++--------- flake.nix | 6 + home/david/modules/programs/ghostty.nix | 3 +- 3 files changed, 364 insertions(+), 198 deletions(-) diff --git a/flake.lock b/flake.lock index f3761f1..6d09dea 100644 --- a/flake.lock +++ b/flake.lock @@ -153,11 +153,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1766618641, - "narHash": "sha256-/zLb6YzJJ3ZnTCjmakOOt83qtQiF9+GJ2NesFk+c8WM=", + "lastModified": 1767229380, + "narHash": "sha256-Uc6qONH3jjUVDgW+pPBCGC7mh88ZY05u1y37fQrsxq0=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "21682009b155c0b67ec47100e09cad3b298aa52f", + "rev": "38d94da67dc84897a4318714dcc48494c016d8c4", "type": "github" }, "original": { @@ -172,11 +172,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1766740527, - "narHash": "sha256-PCRYcskcLxgf8ps22hy5YebppdFix9N/WB1PMFePwU8=", + "lastModified": 1767261384, + "narHash": "sha256-oFEcPMYlQOZXR5Iy98f/mZ4nUqHcSqOreZWphtuyUMY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c4ba4e54eb1055ba63465fe6752d400ada36c724", + "rev": "d013f3560d0037f9c21c5407110907711aead6c9", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1766737834, - "narHash": "sha256-/tlBtwpFzr2c49EfzMEiwycAS7WGZSTdM488QB9tlgg=", + "lastModified": 1767256309, + "narHash": "sha256-T7PO06R7kIY66JbtLUQvN1csCpwDkjMfVNSDAvMoIRU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f4f94ced63b1ba7c1fe5a8d0612b5c2c4c44b0bc", + "rev": "a7538b95565487617873a3b7183ed9d81b83ff6d", "type": "github" }, "original": { @@ -256,6 +256,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -396,7 +412,25 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" + }, + "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": 1731533236, @@ -443,6 +477,29 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs_2", + "zig": "zig", + "zon2nix": "zon2nix" + }, + "locked": { + "lastModified": 1767987612, + "narHash": "sha256-tRpbQ5W+Asz9qtBVRRBesRwS4TXBxnjQdlwgfghM8Ik=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "ec2912dbafe50cc32b786d2327dcd0213c83ecc6", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -486,15 +543,15 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765989342, - "narHash": "sha256-lpNWO7lV/GzkWwWYuAkAkEpWylsYComA7IntWPScYq0=", + "lastModified": 1767104824, + "narHash": "sha256-B/5myvheUJGXwNkeGIS5xgeZisxR5lELi4YqhXykFa4=", "owner": "helix-editor", "repo": "helix", - "rev": "b74e2694124b9d269d05f6aace42d4756c3bb724", + "rev": "496f0e1b41e6735873c1376ac10a6a722767f328", "type": "github" }, "original": { @@ -507,15 +564,37 @@ "home-manager": { "inputs": { "nixpkgs": [ + "ghostty", "nixpkgs" ] }, "locked": { - "lastModified": 1766682973, - "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.05", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -542,7 +621,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit": "pre-commit", "rust-overlay": "rust-overlay_2" }, @@ -605,14 +684,14 @@ "inputs": { "flake-parts": "flake-parts_3", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1766707499, - "narHash": "sha256-Lmn0DYvFOdAV5lMLCODSOPmvjJYPxS19d9fu3VtZ2ng=", + "lastModified": 1767225850, + "narHash": "sha256-gmoKSWO4DM/VnlskS9UmQnXyZTm0xcl4cDx3e/CJZeY=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "bcdaa959f18326bccf889cfd1bd49e9d39d5f91c", + "rev": "dfbb35b3cf396ead65028b7023f07f51927f86e3", "type": "github" }, "original": { @@ -624,11 +703,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1766651930, - "narHash": "sha256-kTaJ3AQ+yPvk1vs5wNHaw8uNxLKp4e2t49ZM7t4QZuE=", + "lastModified": 1767222005, + "narHash": "sha256-SewYGH53QWyiHBNCxJuyESu/D7v0tXi2oq3NREI/AeA=", "owner": "neovim", "repo": "neovim", - "rev": "5a1a92cc7a3d3a338fe5f610190910e220f074f6", + "rev": "170992c8d218f28dcffd967ecc2bae3fb3c46545", "type": "github" }, "original": { @@ -649,11 +728,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766757237, - "narHash": "sha256-KzxXihL0UAaUyFcywtEEBTTNn7gIdtN6Z+Gd0X0jkHw=", + "lastModified": 1767257541, + "narHash": "sha256-eAZD0o5eC85jES3k8S0e1NlJJv+rTgofhl0QajhFjyM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d72c111814489ae4f549cd194598138128550847", + "rev": "0eb70f38f02923ff59743a0978fed88f04c98c7d", "type": "github" }, "original": { @@ -682,11 +761,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1766751930, - "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=", + "lastModified": 1767160009, + "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=", "owner": "YaLTeR", "repo": "niri", - "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1", + "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3", "type": "github" }, "original": { @@ -702,14 +781,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { - "lastModified": 1766738714, - "narHash": "sha256-7kIfulmTW1aHEYVF8jLACdzbUJPrYerMXrcUB1NSyDk=", + "lastModified": 1767257180, + "narHash": "sha256-RR30MPbCJw1mTYjYjnCHe3+xO82pW+l3AJEIMmcwxYw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "726300f3861897c2e5519acd3dd74ca8aea16b62", + "rev": "2e42b934c69d3b049693954fd0a3aabf3747e360", "type": "github" }, "original": { @@ -721,14 +800,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1766541727, - "narHash": "sha256-fvzdJMWM3Nisav0AYbCO9yQ0LbM2Od8Ulp6YBw2r3Ac=", + "lastModified": 1767060285, + "narHash": "sha256-E8oSyoOQnqVCSg7+D0512fnL8JeltFqWaKETJrmo1Q8=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "4e3926b98be61b018915ded9f8f8706a4ce1a267", + "rev": "45ce6a5470514514079e2d65eea7dddafba6bfc8", "type": "github" }, "original": { @@ -739,7 +818,7 @@ }, "nix4nvchad": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ], @@ -748,11 +827,11 @@ ] }, "locked": { - "lastModified": 1766128535, - "narHash": "sha256-a9/fO9HTkBIW6MRr4peNUBj/4HnIURnBoSQGpdTude0=", + "lastModified": 1767244872, + "narHash": "sha256-nrLLrBW9MkZTvT39TjkooVnl/7Se47xp5fJP5iQbHaY=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "30dbf95272d15db9562419dd516620d8c1b355b7", + "rev": "64bbb6516895cfd2ca806ded0d57b40c28aa7ab4", "type": "github" }, "original": { @@ -763,11 +842,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -779,11 +858,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -825,11 +904,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1766687554, - "narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=", + "lastModified": 1767051569, + "narHash": "sha256-0MnuWoN+n1UYaGBIpqpPs9I9ZHW4kynits4mrnh1Pk4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136", + "rev": "40ee5e1944bebdd128f9fbada44faefddfde29bd", "type": "github" }, "original": { @@ -841,11 +920,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1766622938, - "narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=", + "lastModified": 1767047869, + "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f", + "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a", "type": "github" }, "original": { @@ -855,119 +934,7 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1766653575, - "narHash": "sha256-TPgxCS7+hWc4kPhzkU5dD2M5UuPhLuuaMNZ/IpwKQvI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3c1016e6acd16ad96053116d0d3043029c9e2649", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1766125104, - "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1766471942, - "narHash": "sha256-Wv+xrUNXgtxAXAMZE3EDzzeRgN1MEw+PnKr8zDozeLU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cfc52a405c6e85462364651a8f11e28ae8065c91", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { + "nixpkgs_10": { "locked": { "lastModified": 1761236834, "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", @@ -983,18 +950,143 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1763191728, + "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f61125a668a320878494449750330ca58b78c557", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1767151656, + "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f665af0cdb70ed27e1bd8f9fdfecaf451260fc55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1766840161, + "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3edc4a30ed3903fdf6f90c837f961fa6b49582d1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1767026758, + "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "346dd96ad74dc4457a9db9de4f4f57dab2e5731d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_7", - "systems": "systems_5" + "nixpkgs": "nixpkgs_8", + "systems": "systems_6" }, "locked": { - "lastModified": 1766721995, - "narHash": "sha256-2qZLSojZFP3AzbC6UNF3ASCIDLahNniR2XP7l/qINm4=", + "lastModified": 1767185101, + "narHash": "sha256-gyNczVfQMoi+OQghxBik6wx8XLsCelok9SMl1bMLUoc=", "owner": "nix-community", "repo": "nixvim", - "rev": "66a5dc70e2d8433034bccdbb9c3c7bcecd86f9a6", + "rev": "df9d3637e80b98c5b937fc73a465d0eea2c3aa88", "type": "github" }, "original": { @@ -1010,11 +1102,11 @@ ] }, "locked": { - "lastModified": 1766762674, - "narHash": "sha256-mP3eq1nYKz61PnTbdk4AmDbjp01tT7fjeTOjDI4mANo=", + "lastModified": 1767236403, + "narHash": "sha256-psQ9bfjYzt3nMj3fiwPXrEOPwTRl8MXM/CY9nOzgeBs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "35eccc54a37c94a6da56d4509312c640a3c11978", + "rev": "17dd7f9a0ec4a98c079035bad8abf3c65b4bc436", "type": "github" }, "original": { @@ -1026,14 +1118,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1766762418, - "narHash": "sha256-yso1qtTpUzOlozZZrZi3WHFszXFOvnC44DkSaUoEbuI=", + "lastModified": 1767260184, + "narHash": "sha256-oROZyKoiFeIUccTgWTsFsS6OlXegwF6CzJluaZI6vyA=", "owner": "nix-community", "repo": "NUR", - "rev": "4b60f506ed8576ff8ddf6c6480199644008d4ea6", + "rev": "e7b58a546da0ba434418023cb1dba057c9d9d7bc", "type": "github" }, "original": { @@ -1085,7 +1177,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -1114,8 +1206,9 @@ "emacs-overlay": "emacs-overlay", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", + "ghostty": "ghostty", "helix": "helix", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", "lix-module": "lix-module", "neovim-nightly": "neovim-nightly", @@ -1124,7 +1217,7 @@ "nix-gaming": "nix-gaming", "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", @@ -1185,11 +1278,11 @@ ] }, "locked": { - "lastModified": 1766289575, - "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", + "lastModified": 1766894905, + "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9836912e37aef546029e48c8749834735a6b9dad", + "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7", "type": "github" }, "original": { @@ -1201,11 +1294,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1766604293, - "narHash": "sha256-mcSwY9xIF0FIc81JBf185HKUqjTUwoD4pS9E+1ydUbg=", + "lastModified": 1767034774, + "narHash": "sha256-vD6mT0B9Wlx//KS4ZSgykhTrBdHkOYdj/6m5SJ8b17k=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "acffc3741fbda483889d059083298b4a52a5807f", + "rev": "4d5fa081b59549082039561c52c875bee56e4ae0", "type": "github" }, "original": { @@ -1229,7 +1322,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1340,6 +1433,21 @@ "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": { @@ -1423,14 +1531,14 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1766000401, - "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", + "lastModified": 1767122417, + "narHash": "sha256-yOt/FTB7oSEKQH9EZMFMeuldK1HGpQs2eAzdS9hNS/o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", + "rev": "dec15f37015ac2e774c84d0952d57fcdf169b54d", "type": "github" }, "original": { @@ -1482,11 +1590,11 @@ ] }, "locked": { - "lastModified": 1766697593, - "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=", + "lastModified": 1767239595, + "narHash": "sha256-QUfbe5AJP2f190ugNNb4y12ZzOWTnCi66yuM3iYRBzE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "98d8f48ba80a4b6e3b56addad850d57132301075", + "rev": "5776ae08801a16562b5626a64dedc57032f9a430", "type": "github" }, "original": { @@ -1494,6 +1602,57 @@ "repo": "zen-browser-flake", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty", + "flake-compat" + ], + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763295135, + "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zon2nix": { + "inputs": { + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758405547, + "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=", + "owner": "jcollie", + "repo": "zon2nix", + "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", + "type": "github" + }, + "original": { + "owner": "jcollie", + "repo": "zon2nix", + "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f11162e..82fbdd4 100644 --- a/flake.nix +++ b/flake.nix @@ -236,5 +236,11 @@ nixpkgs.follows = "nixpkgs"; }; }; + + ghostty = { + type = "github"; + owner = "ghostty-org"; + repo = "ghostty"; + }; }; } diff --git a/home/david/modules/programs/ghostty.nix b/home/david/modules/programs/ghostty.nix index cbe230b..4a4583f 100644 --- a/home/david/modules/programs/ghostty.nix +++ b/home/david/modules/programs/ghostty.nix @@ -2,6 +2,7 @@ pkgs, config, lib, + inputs, ... }: { options = { @@ -15,7 +16,7 @@ programs.ghostty = lib.mkMerge [ { enable = true; - package = pkgs.ghostty; + package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default; settings = { # font-family = "Maple Mono NF CN"; font-feature = [ From 299b0621ade6d536dfc3625f2aadb2ea66ea6df4 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 1 Jan 2026 18:57:02 +0800 Subject: [PATCH 9/9] chore: Use regular network settings instead of bond --- nixos/configurations/Tytonidae/networking.nix | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/nixos/configurations/Tytonidae/networking.nix b/nixos/configurations/Tytonidae/networking.nix index f840de5..3ad400c 100644 --- a/nixos/configurations/Tytonidae/networking.nix +++ b/nixos/configurations/Tytonidae/networking.nix @@ -20,49 +20,56 @@ }; }; }; - netdevs = { - "20-bond0" = { - netdevConfig = { - Kind = "bond"; - Name = "bond0"; - }; - bondConfig = { - Mode = "balance-alb"; - MIIMonitorSec = "1s"; - PrimaryReselectPolicy = "better"; - }; - }; - }; + # netdevs = { + # "20-bond0" = { + # netdevConfig = { + # Kind = "bond"; + # Name = "bond0"; + # }; + # bondConfig = { + # Mode = "balance-alb"; + # MIIMonitorSec = "1s"; + # PrimaryReselectPolicy = "better"; + # }; + # }; + # }; networks = { "20-eno2" = { networkConfig = { - Bond = "bond0"; - PrimarySlave = true; - }; - matchConfig = { - Name = "eno2"; - }; - }; - "20-wlan0" = { - networkConfig = { - Bond = "bond0"; - }; - matchConfig = { - Name = "wlan0"; - }; - }; - "20-bond0" = { - networkConfig = { - DHCP = "yes"; + # Bond = "bond0"; + # PrimarySlave = true; + + DHCP = "ipv4"; IPv6AcceptRA = true; }; linkConfig = { RequiredForOnline = "routable"; }; matchConfig = { - Name = "bond0"; + Name = "eno2"; }; }; + # "20-wlan0" = { + # networkConfig = { + # # Bond = "bond0"; + # }; + # matchConfig = { + # Name = "wlan0"; + # }; + # }; + + # "20-bond0" = { + # networkConfig = { + # DHCP = "yes"; + # IPv6AcceptRA = true; + # }; + # linkConfig = { + # RequiredForOnline = "routable"; + # }; + # matchConfig = { + # Name = "bond0"; + # }; + # }; }; }; @@ -80,7 +87,8 @@ Enabled = true; }; General = { - EnableNetworkConfiguration = false; + # EnableNetworkConfiguration = false; + EnableNetworkConfiguration = true; }; Settings = { AutoConnect = true;