From e5d94609bc11e1736e2b7f2d3f323e2d2c2b168e Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 4 Mar 2026 02:04:16 +0800 Subject: [PATCH] chore: Update fleka inputs --- flake.lock | 405 +++++++++++---------- flake.nix | 13 +- nixos/configurations/Tytonidae/default.nix | 1 + nixos/modules/documentation.nix | 144 +------- nixos/modules/lix.nix | 31 ++ nixos/modules/nix.nix | 1 - nixos/modules/programs/asusd.nix | 1 - nixos/modules/top-level/default.nix | 1 - overlays/modifications/default.nix | 2 + overlays/modifications/fix-guix.nix | 5 + 10 files changed, 271 insertions(+), 333 deletions(-) create mode 100644 nixos/modules/lix.nix create mode 100644 overlays/modifications/fix-guix.nix diff --git a/flake.lock b/flake.lock index ddf98be..bb459a4 100644 --- a/flake.lock +++ b/flake.lock @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1771469470, - "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", + "lastModified": 1772420042, + "narHash": "sha256-naZz40TUFMa0E0CutvwWsSPhgD5JldyTUDEgP9ADpfU=", "owner": "nix-community", "repo": "disko", - "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", + "rev": "5af7af10f14706e4095bd6bc0d9373eb097283c6", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1771392781, - "narHash": "sha256-OfN1elxo/JUjz4n8blH/CEdgaqzS30Q0+IvGhuH+Bek=", + "lastModified": 1772433867, + "narHash": "sha256-0dm0Oc5yd1vwqQoa3lAJznnocyCLkOC7zHkUTqCVI94=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "74d1b871b75fb19feefa2722628aecfe0b828e79", + "rev": "470e653f08cfe85bbc02516af65e44d3b9c735b8", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1771555584, - "narHash": "sha256-49AMd9XWR4bLT2UJDKOH+z84SDdtCE3JwJYwB+zqfCo=", + "lastModified": 1772556483, + "narHash": "sha256-F68hfvbcOLFQQ0rSWzNu8tP3/2UW2aatY4iX8lLegLQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "02d5bd9d7e65bee8fbc28022b31b0c56bc1cc605", + "rev": "56072ed54f7f64e358dc629a0e422bbf000b5d0e", "type": "github" }, "original": { @@ -193,11 +193,11 @@ ] }, "locked": { - "lastModified": 1771490669, - "narHash": "sha256-b/QygK+woUZs3k2vNqfsKtBx/YwEOTGXQS4W2SPON0c=", + "lastModified": 1772441140, + "narHash": "sha256-onJLEHVadNXPKc/5hQ8bt9ksyW+quBqLrZjPnW7D3hw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9b5c1f819cc45c6ec00e32e73608e0d6721bec1d", + "rev": "29ea7ebe3d19bf60ad8e9127c02b9aecd6075c2d", "type": "github" }, "original": { @@ -254,6 +254,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -282,11 +298,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -303,11 +319,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -378,7 +394,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -394,39 +410,6 @@ "type": "github" } }, - "flake-utils_2": { - "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, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -443,6 +426,29 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "nix-gaming", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770726378, + "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -465,6 +471,28 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "nix-gaming", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -490,11 +518,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1771429468, - "narHash": "sha256-blgdyxA7Ih6jwrp12uSfOylelRHrs9FgP8Mh5GBKG6E=", + "lastModified": 1772550393, + "narHash": "sha256-m5+TRl4Vfc4lf/Z5PlrOgl0xuPLbGZzYIjNeCal7RYo=", "owner": "helix-editor", "repo": "helix", - "rev": "1a38979aaa53ea96425a04413c871600ee5845e7", + "rev": "b22c117a2757552488fa0ff5ad63835f2a7fe449", "type": "github" }, "original": { @@ -511,11 +539,11 @@ ] }, "locked": { - "lastModified": 1771531206, - "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=", + "lastModified": 1772516620, + "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=", "owner": "nix-community", "repo": "home-manager", - "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77", + "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9", "type": "github" }, "original": { @@ -561,44 +589,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1753306924, - "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=", - "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756125859, - "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=", - "ref": "release-2.93", - "rev": "d3292125035b04df00d01549a26e948631fabe1e", - "revCount": 156, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - }, - "original": { - "ref": "release-2.93", - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - } - }, "neovim-nightly": { "inputs": { "flake-parts": "flake-parts_3", @@ -606,11 +596,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1771545891, - "narHash": "sha256-aaVUfc/9q2pCsELZmYhf+uvYRMCUlBvccgL1VS27R+o=", + "lastModified": 1772496284, + "narHash": "sha256-pDGgYqXFU5cY1Jn11R7N/Q6DFazg6CQq8KDlqvyl/XE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "917b72d5e27bc217440655b81f701d7062bdd198", + "rev": "fc9e6626baffb5b577810269713aedc37e95ef60", "type": "github" }, "original": { @@ -622,11 +612,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1771541613, - "narHash": "sha256-1Rpt5B4pNW/MNkWoEamqwCa5I4/9G84dSqp4eHS5zsA=", + "lastModified": 1772473891, + "narHash": "sha256-E/0dAqFsUm4DggmHBl8rfI67yK227RXpzbEkZ7729bM=", "owner": "neovim", "repo": "neovim", - "rev": "e3d46a63375c84b7bd409f1f07ef56eb985eae50", + "rev": "a8361c3afc5b9281814e9f16a9d4291e095b38fa", "type": "github" }, "original": { @@ -647,11 +637,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771514840, - "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=", + "lastModified": 1772519138, + "narHash": "sha256-qMdIWc5NrRR3tllBZgeaq3QJke3fsf08wl0e5f2RcFg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56", + "rev": "62832e6abed7e060e832fd7be5413c07047dd6fd", "type": "github" }, "original": { @@ -680,11 +670,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1771305475, - "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=", + "lastModified": 1772207631, + "narHash": "sha256-Jkkg+KqshFO3CbTszVVpkKN2AOObYz+wMsM3ONo1z5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "a2a52911757cb3b497db9407592f9b4c439571ea", + "rev": "e708f546153f74acf33eb183b3b2992587a701e5", "type": "github" }, "original": { @@ -700,14 +690,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { - "lastModified": 1771491986, - "narHash": "sha256-VKR4E2Li3xPAyCgnPGK04qMebvyHjgMnc7Ly18bOy68=", + "lastModified": 1772442198, + "narHash": "sha256-ygRCY/7MtTATquYFh2dadiOF17Wh7aiYvkD6jTFNvdw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "e3f0afe382a24ad02cd6348d8ccb7c73bed726f4", + "rev": "94230f71afa2caf576d9d852f5ed46a6050e8b0b", "type": "github" }, "original": { @@ -719,14 +709,15 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_4", + "git-hooks": "git-hooks", "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1771504976, - "narHash": "sha256-E6vYsfrmSugowvC30inu7cpChPXYl68Sjs+p7/3ZitY=", + "lastModified": 1772505577, + "narHash": "sha256-HzpMlxPScGSLDAoOZHA09Pndd4d1s6uNomYK3GoJjAg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "06154d726ba4eb01c9b2d18edcc3d2476c83d3bc", + "rev": "3ea17e15ca87c740e75f4ecf0ad3e3f4c16d7c7d", "type": "github" }, "original": { @@ -737,7 +728,7 @@ }, "nix4nvchad": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], @@ -746,11 +737,11 @@ ] }, "locked": { - "lastModified": 1771479716, - "narHash": "sha256-px2OOCb6VDEGNSVpFEbVLnocz34qrfAarx28lTzrWsw=", + "lastModified": 1772187015, + "narHash": "sha256-8UA+HVKxRqyv1wuAln4gxskq8ZbW5ttKZg5kDp0R154=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "5098052557a36a148c84740733c4ac5b1bc566a5", + "rev": "cde302611dfdcaece9756b48f68eb808645929b5", "type": "github" }, "original": { @@ -761,11 +752,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -777,11 +768,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -791,6 +782,22 @@ "type": "github" } }, + "nixpkgs-0182a361324364ae3f436a63005877674cf45efb": { + "locked": { + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0182a361324364ae3f436a63005877674cf45efb", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1769909678, @@ -851,11 +858,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1771419570, - "narHash": "sha256-bxAlQgre3pcQcaRUm/8A0v/X8d2nhfraWSFqVmMcBcU=", + "lastModified": 1772465433, + "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6d41bc27aaf7b6a3ba6b169db3bd5d6159cfaa47", + "rev": "c581273b8d5bdf1c6ce7e0a54da9841e6a763913", "type": "github" }, "original": { @@ -915,11 +922,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1771207753, - "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", + "lastModified": 1772419343, + "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", + "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9", "type": "github" }, "original": { @@ -931,11 +938,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1770843696, - "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", + "lastModified": 1772173633, + "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", + "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6", "type": "github" }, "original": { @@ -947,11 +954,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -979,11 +986,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -995,32 +1002,29 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", - "type": "github" + "lastModified": 1772198003, + "narHash": "sha256-UCaQQ8zmHUocQIgCl+53Jj6NuwqrVKtmv7obE9r6wnw=", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre955442.dd9b079222d4/nixexprs.tar.xz" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, "nixvim": { "inputs": { "flake-parts": "flake-parts_5", "nixpkgs": "nixpkgs_7", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { - "lastModified": 1771135771, - "narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=", + "lastModified": 1772402258, + "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", "owner": "nix-community", "repo": "nixvim", - "rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba", + "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", "type": "github" }, "original": { @@ -1033,14 +1037,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1771554771, - "narHash": "sha256-atFYM8h8fgnXW/i/zM3yZnhsbVxlsIQ6eq/FcC6uZ6k=", + "lastModified": 1772555156, + "narHash": "sha256-L89QxbDuYdPhl7DNrqXsNtDhJgH2pXKV4lWXgOO9IuE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "8eef8ef71d64a7ad0144eb79221cdfcc568848cf", + "rev": "0a2ce3bac7d7a93b7fd361c0aefa614de73c718b", "type": "github" }, "original": { @@ -1049,17 +1054,38 @@ "type": "github" } }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772227064, + "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts_6", "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1771564473, - "narHash": "sha256-tQauHR8v8+YwOeO86bjAuSNjUq+I5bzI++yKKEwJkHQ=", + "lastModified": 1772558837, + "narHash": "sha256-rGA3gynruWorwIAiudxczr72VLvFe3oDVwCO35EYOQ0=", "owner": "nix-community", "repo": "NUR", - "rev": "d9c9b43346416771c85c1833f1d539539329e6c8", + "rev": "af814a1a85896dcb827bfb241a2cf6c8e014e964", "type": "github" }, "original": { @@ -1142,7 +1168,6 @@ "helix": "helix", "home-manager": "home-manager", "lanzaboote": "lanzaboote", - "lix-module": "lix-module", "neovim-nightly": "neovim-nightly", "niri-flake": "niri-flake", "nix-doom": "nix-doom", @@ -1150,6 +1175,7 @@ "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", + "nixpkgs-0182a361324364ae3f436a63005877674cf45efb": "nixpkgs-0182a361324364ae3f436a63005877674cf45efb", "nixpkgs-patch-rqbit-bump": "nixpkgs-patch-rqbit-bump", "nixpkgs-patcher": "nixpkgs-patcher", "nixvim": "nixvim", @@ -1213,11 +1239,11 @@ ] }, "locked": { - "lastModified": 1771524872, - "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", + "lastModified": 1772495394, + "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", + "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", "type": "github" }, "original": { @@ -1229,11 +1255,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1770670534, - "narHash": "sha256-QzsrjOnCvHSIEqQaH+xcgz4R8HFqMMjC3oe9aiuNRI8=", + "lastModified": 1771631033, + "narHash": "sha256-NlhRJh+ORSZNDNRBebuKefrF7JbZB1wbUYbZeoqwVdU=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "690889139ab12b3b08b5efabbb93d52c86065fcf", + "rev": "4d7c01d3ef3502f964f3bf827560e167cbd1a3c5", "type": "github" }, "original": { @@ -1245,14 +1271,14 @@ "spicetify-nix": { "inputs": { "nixpkgs": "nixpkgs_9", - "systems": "systems_7" + "systems": "systems_6" }, "locked": { - "lastModified": 1771268051, - "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", + "lastModified": 1772494187, + "narHash": "sha256-6ksgNAFXVK+Cg/6ww7bB2nJUPZlnS75UwZC7G+L03EE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", + "rev": "915ab06b046d05613041780c575c62a32fe67cea", "type": "github" }, "original": { @@ -1276,7 +1302,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_8", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1284,11 +1310,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1771541829, - "narHash": "sha256-jtrIUcFoZuS6R4P18907H0pPyHaGoF5Tomez7j3KIHs=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "nix-community", "repo": "stylix", - "rev": "cb73f89d3ecef7e790c42f828e2228ff82975de5", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { @@ -1402,21 +1428,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1554,11 +1565,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1771195969, - "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", + "lastModified": 1772429643, + "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", + "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2", "type": "github" }, "original": { @@ -1577,11 +1588,11 @@ ] }, "locked": { - "lastModified": 1771562861, - "narHash": "sha256-6oT3rF68W8HERLXvFfEkpz8xpAVLKZsY1ZuR/BbDTO8=", + "lastModified": 1772517053, + "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7783a3adf3d5a9599a82c75a44c7482e70398ac2", + "rev": "32e9673aee2ae994ced561247918952398a3e933", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f6ba68f..5313ff1 100644 --- a/flake.nix +++ b/flake.nix @@ -60,13 +60,12 @@ owner = "gepbird"; repo = "nixpkgs-patcher"; }; - - lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; - # url = "git+https://git.lix.systems/lix-project/nixos-module"; - inputs = { - nixpkgs.follows = "nixpkgs"; - }; + ## fix guix/guile-zlib + nixpkgs-0182a361324364ae3f436a63005877674cf45efb = { + type = "github"; + owner = "nixos"; + repo = "nixpkgs"; + rev = "0182a361324364ae3f436a63005877674cf45efb"; }; helix = { diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 6820ad3..a57b32f 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -22,6 +22,7 @@ ++ (lib.youthlic.loadImports ./.); youthlic = { + lix.enable = true; home-manager = { enable = true; unixName = "david"; diff --git a/nixos/modules/documentation.nix b/nixos/modules/documentation.nix index 54759cf..568bee1 100644 --- a/nixos/modules/documentation.nix +++ b/nixos/modules/documentation.nix @@ -1,129 +1,21 @@ -{ - pkgs, - config, - lib, - ... -}: -lib.mkMerge [ - { - environment.systemPackages = with pkgs; [ +{pkgs, ...}: { + environment.systemPackages = builtins.attrValues { + inherit + (pkgs) man-pages man-pages-posix - ]; - documentation = { - info.enable = true; - nixos.enable = true; - dev.enable = true; - }; - } - ( - let - inherit (pkgs.writers) writeFish; - cfg = config.documentation.man.man-db; - cachePath = "/var/cache/man/nixos"; - in { - documentation.man.generateCaches = false; - - systemd.services."man-db" = { - requires = ["sysinit-reactivation.target"]; - after = ["sysinit-reactivation.target"]; - partOf = ["sysinit-reactivation.target"]; - wantedBy = ["default.target"]; - path = [ - cfg.package - pkgs.gawk - ]; - - serviceConfig = { - Nice = 19; - IOSchedulingClass = "idle"; - IOSchedulingPrioriry = 7; - ExecStart = - writeFish "mandbsvc" # fish - - '' - set -l SystemManLoc "/run/current-system/sw/share/man" - set -l ContentRecord "${cachePath}/man-db-state" - - if [ ! -d "${cachePath}" ] - mkdir -pv "${cachePath}" || exit 1 - end - - if [ ! -f "$ContentRecord" ] - touch "$ContentRecord" || exit 1 - end - # 1) Collect list of all manpage files and calculate hashes - # of them - # - # man1/ls.1.gz - # man3/func.3.gz - # - # hash -> - # - # bbbbbbbbbbbb (man1/ls.1.gz) - # aaaaaaaaaaaa (man3/func.3.gz) - set -l hashes "$( - find -L "$SystemManLoc" -type f -iname "*.gz" \ - -exec sha256sum "{}" "+" \ - | awk '{ print $1 }' - or exit 1 - )" - - # 2) Sort the hashes to make them "stable", - # and then join them toghther into a big long string, - # and then hash this big string to get the hash of the directory - # - # bbbbbbbbbbbb - # aaaaaaaaaaaa - # - # sort -> - # - # aaaaaaaaaaaa - # bbbbbbbbbbbb - # - # join -> - # - # aaaaaaaaaaaabbbbbbbbbbbb - # - # hash -> - # - # cccccccccccc - set -l ultimate_hash ( - echo $hashes \ - | sort \ - | string join "" \ - | sha256sum - \ - | awk '{ print $1 }' - or exit 1 - ) - - set -l old_hash "$( string collect < "$ContentRecord" )" - - echo "Old hash: $old_hash" - echo "New hash: $ultimate_hash" - - if [ "$old_hash" != "$ultimate_hash" ] - echo "Hash changed, do a full man-db rebuild" - mandb -psc || exit 1 - echo "Write new hash" - echo "$ultimate_hash" > "$ContentRecord" - else - echo "Hash not changed, skip" - end - ''; - }; + ; + }; + documentation = { + info.enable = true; + nixos.enable = true; + dev.enable = true; + man = { + enable = true; + cache = { + enable = true; + generateAtRuntime = true; }; - - environment.extraSetup = - # bash - '' - find "$out/share/man" \ - -mindepth 1 -maxdepth 1 \ - -not -name "man[1-8]" \ - -exec rm -r "{}" ";" - - rm -r "$out/share/man/man3" - ''; - } - ) -] + }; + }; +} diff --git a/nixos/modules/lix.nix b/nixos/modules/lix.nix new file mode 100644 index 0000000..1cb7fd8 --- /dev/null +++ b/nixos/modules/lix.nix @@ -0,0 +1,31 @@ +{ + pkgs, + lib, + config, + ... +}: let + cfg = config.youthlic.lix; +in { + options = { + youthlic.lix = { + enable = lib.mkEnableOption "lix"; + }; + }; + config = lib.mkIf cfg.enable { + nixpkgs.overlays = [ + (lib.mkBefore (final: _prev: { + inherit + (final.lixPackageSets.latest) + nixpkgs-review + nixpkgs-reviewFull + nurl + nix-update + nix-eval-jobs + nix-fast-build + colmena + ; + })) + ]; + nix.package = pkgs.lixPackageSets.latest.lix; + }; +} diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index becc392..a49ee35 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -62,7 +62,6 @@ use-xdg-base-directories = true; builders-use-substitutes = true; }; - package = pkgs.nix; registry = with lib; pipe inputs [ (filterAttrs (name: _value: name != "nixpkgs")) diff --git a/nixos/modules/programs/asusd.nix b/nixos/modules/programs/asusd.nix index c116c39..cd8e042 100644 --- a/nixos/modules/programs/asusd.nix +++ b/nixos/modules/programs/asusd.nix @@ -13,7 +13,6 @@ in { config = lib.mkIf cfg.enable { services.asusd = { enable = true; - enableUserService = true; }; }; } diff --git a/nixos/modules/top-level/default.nix b/nixos/modules/top-level/default.nix index bca18a1..95d7c30 100644 --- a/nixos/modules/top-level/default.nix +++ b/nixos/modules/top-level/default.nix @@ -9,7 +9,6 @@ sops-nix.nixosModules.sops stylix.nixosModules.stylix disko.nixosModules.disko - lix-module.nixosModules.default nixvim.nixosModules.nixvim ./.. diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 1173520..8630ab1 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -15,6 +15,8 @@ in ./vim.nix ./prismlauncher.nix + ./fix-guix.nix + # Nur ./nur.nix ] diff --git a/overlays/modifications/fix-guix.nix b/overlays/modifications/fix-guix.nix new file mode 100644 index 0000000..c2479ea --- /dev/null +++ b/overlays/modifications/fix-guix.nix @@ -0,0 +1,5 @@ +{inputs, ...}: _final: prev: let + inherit (prev.stdenv.hostPlatform) system; +in { + guix = inputs.nixpkgs-0182a361324364ae3f436a63005877674cf45efb.legacyPackages.${system}.guix; +}