From c4220bc621074f2c2cd1de55c86a95fb28ca8396 Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Sat, 9 May 2026 21:13:56 -0500 Subject: [PATCH] update inputs, bin cache for cuda, disable cachy kernel, various fixes --- flake.lock | 468 ++++++++++++++-------- flake.nix | 6 +- modules/core/graphics/nvidia.nix | 10 + modules/core/infra/syncthing.nix | 2 +- modules/core/kernel.nix | 7 +- modules/hosts/common.nix | 2 - modules/hosts/nix.nix | 2 + modules/hosts/styx.nix | 2 + modules/services/glances.nix | 2 +- modules/services/mailserver.nix | 21 +- modules/software/compatibility/nix-ld.nix | 3 +- modules/software/gaming/gaming.nix | 4 +- 12 files changed, 341 insertions(+), 188 deletions(-) diff --git a/flake.lock b/flake.lock index 1836e43..934914b 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "beaker-src": { "flake": false, "locked": { - "lastModified": 1773884524, - "narHash": "sha256-1dnlofWaxI/YRID+WPz2jHZNDyloBubDt/bAQk9ePLU=", + "lastModified": 1775244490, + "narHash": "sha256-4TJv7X6D0l4rEbTRKf47gU43L8G5uJgxxtsqMkVixQY=", "ref": "refs/heads/master", - "rev": "abc598baf15d6f8a4de395a27ba34b1e769558e1", - "revCount": 21, + "rev": "3fab89ecf8f4c664477a82add660d28db87357b4", + "revCount": 27, "shallow": false, "type": "git", "url": "https://git.bwaaa.monster/beaker" @@ -86,14 +86,30 @@ "url": "https://git.bwaaa.monster/beaker" } }, + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1773036026, - "narHash": "sha256-hRDSqn5jL0cq4aYTcAS61Jsw2DEqxHkAb01Cyu7jIDc=", + "lastModified": 1778227630, + "narHash": "sha256-IZIpCvjTLn6dzgFa6vOB6rUkMp3gktQy8suVXkPfvSg=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "dd72b90988e22422548f65e1ec8e2b52c8c7e35f", + "rev": "24da68625ce48a4ea1b28996050f1229e7bc78a2", "type": "github" }, "original": { @@ -105,11 +121,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1773035489, - "narHash": "sha256-qsniqHnVIZdhGO6tYyugtWpOtdYofnUcpJAj6YAAvM4=", + "lastModified": 1777876120, + "narHash": "sha256-fdFgVCoua3rsQyyHkgxcnwi0hUktR8UtcI/suS8jcbg=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "d60f37176775b87d3300b333b39ae974adbda381", + "rev": "e80ce8172953b8c199daf6a2850974bb12731ae9", "type": "github" }, "original": { @@ -123,11 +139,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1772153824, - "narHash": "sha256-T65qXmlcD9qFpPTi+mOXsn4dIkO2N8Ls67nqmuzepv0=", + "lastModified": 1778336446, + "narHash": "sha256-axlSmUkHgMSnHitMgIWH8iNfU9Ej39Th50KD8NePjac=", "owner": "catppuccin", "repo": "nix", - "rev": "4b0f5b7bf7b3eeb484d49524f3c9791864ab9362", + "rev": "f656000aa5e6dc2664f71bc57ce00bf68dc65366", "type": "github" }, "original": { @@ -181,11 +197,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1772605780, - "narHash": "sha256-p7IzkFmB1kCtl16+bvLKP1hdP61EFQxj+VSKX2lOWgE=", + "lastModified": 1778198574, + "narHash": "sha256-XzgYoibIH6diZoZ2GzoGeyV2xdXAwBtXdAze+Qu2kR0=", "owner": "9001", "repo": "copyparty", - "rev": "00e821db231d143169236971b50b85b9c9edd298", + "rev": "139ef1851e5d698521a5c2078c56f951d6e54d00", "type": "github" }, "original": { @@ -196,15 +212,16 @@ }, "den": { "locked": { - "lastModified": 1772645664, - "narHash": "sha256-7cf6DEczxIHuUFcfbmbLPznf/R35fyvMjgipO9DUyN0=", + "lastModified": 1774839389, + "narHash": "sha256-gjREeOXMLLMfgqhL0I+cX0RIV1Qn554ajwxf3+Flp8I=", "owner": "vic", "repo": "den", - "rev": "21a1d36a234e7dca490edf1f1de5f1a5033a3652", + "rev": "d03b126aa36035752b6b172f26027d015b5cf70a", "type": "github" }, "original": { "owner": "vic", + "ref": "v0.10.0", "repo": "den", "type": "github" } @@ -212,11 +229,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -227,15 +244,16 @@ }, "flake-aspects": { "locked": { - "lastModified": 1772587379, - "narHash": "sha256-Ftbenlg5Kz8j7dZ2dmsUJJbaYkB35IV41+jyvai0RpE=", + "lastModified": 1771320365, + "narHash": "sha256-t1FKnPRvg/l376pM+hMS0hPMTmxu7S4eVS2s+A25SbU=", "owner": "vic", "repo": "flake-aspects", - "rev": "b0f62449459f91c050db9cd1f7709d488fcef48d", + "rev": "f338a5062628c9b9fda0796a141ca1a6eb4dcf75", "type": "github" }, "original": { "owner": "vic", + "ref": "v0.5.0", "repo": "flake-aspects", "type": "github" } @@ -273,6 +291,22 @@ } }, "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-compat_4": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -286,13 +320,29 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-compat_5": { + "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-file": { "locked": { - "lastModified": 1772343585, - "narHash": "sha256-7jADySzWscA2822JzNbfRdC+R+B7tzDoWavG8DMY1tU=", + "lastModified": 1777679829, + "narHash": "sha256-zQxY90pq7BDbeimAiOfuK2U0huzo6oHOiC8zEpRgsbQ=", "owner": "vic", "repo": "flake-file", - "rev": "0f5c1039860127fa5673d362d68f8b7df29a44bc", + "rev": "04ca28cf570276e70a9a5f694791ab2a60f1f300", "type": "github" }, "original": { @@ -308,11 +358,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -326,11 +376,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -347,11 +397,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -365,11 +415,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -383,11 +433,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1777678872, + "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", "type": "github" }, "original": { @@ -404,11 +454,11 @@ ] }, "locked": { - "lastModified": 1767609335, - "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "250481aafeb741edfe23d29195671c19b36b6dca", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -507,7 +557,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "nix-gaming", @@ -515,11 +565,37 @@ ] }, "locked": { - "lastModified": 1770726378, - "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", + "lastModified": 1776796298, + "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", + "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks_2": { + "inputs": { + "flake-compat": [ + "nixos-mailserver", + "flake-compat" + ], + "gitignore": "gitignore_2", + "nixpkgs": [ + "nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775585728, + "narHash": "sha256-8Psjt+TWvE4thRKktJsXfR6PA/fWWsZ04DVaY6PUhr4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "580633fa3fe5fc0379905986543fd7495481913d", "type": "github" }, "original": { @@ -550,23 +626,43 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "nixos-mailserver", + "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": { - "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "gitlab" + "type": "github" }, "original": { - "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "gnome-49", "repo": "gnome-shell", - "type": "gitlab" + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" } }, "home-manager": { @@ -576,11 +672,11 @@ ] }, "locked": { - "lastModified": 1772633327, - "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=", + "lastModified": 1778365864, + "narHash": "sha256-ImoT/wqmgMImf2dAC+E0MverAdA4QXsedOeES9B7Ezw=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc", + "rev": "2f419037039a152448c5f4ae9494154753d1b399", "type": "github" }, "original": { @@ -594,11 +690,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1773947929, - "narHash": "sha256-flpkAPM3zpMpWoqvVkMTo3ptuBF0QKNi6Raa8rnIq7o=", + "lastModified": 1778254216, + "narHash": "sha256-Zye2Stp1oqwzC4JvIdJevB5/CG0XrEqjNji+3nVvCyo=", "owner": "JPyke3", "repo": "hytale-launcher-nix", - "rev": "a8d0a974b187f0997c03c23000dea552194edf39", + "rev": "6293d33be6a5cd1a763fe00477339b98f72da2b2", "type": "github" }, "original": { @@ -609,11 +705,11 @@ }, "import-tree": { "locked": { - "lastModified": 1772344373, - "narHash": "sha256-OQQ1MhB9t1J71b2wxRRTdH/Qd8UGG0p+dGspfCf5U1c=", + "lastModified": 1773693634, + "narHash": "sha256-BtZ2dtkBdSUnFPPFc+n0kcMbgaTxzFNPv2iaO326Ffg=", "owner": "vic", "repo": "import-tree", - "rev": "10fda59eee7d7970ec443b925f32a1bc7526648c", + "rev": "c41e7d58045f9057880b0d85e1152d6a4430dbf1", "type": "github" }, "original": { @@ -631,11 +727,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1774233481, - "narHash": "sha256-Tnlkkd+2mjp+Yui1mjiqs/inQsvIdBhd0Tjf0ftDLyE=", + "lastModified": 1778297230, + "narHash": "sha256-LrxVQBBMJDKkX/pFwcIjnu69ewMG/1z+O6sso4P69hg=", "owner": "Ninlives", "repo": "minecraft.nix", - "rev": "aead7ec7962d1961ff3762d7001a9307a17cbb8e", + "rev": "c0499d2e1a321644d430b653d011dde92bed4597", "type": "github" }, "original": { @@ -650,11 +746,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1774059698, - "narHash": "sha256-gRJaZ0RShc8dEGvR410WWYXucOePzT+m3pNllION/mo=", + "lastModified": 1778038659, + "narHash": "sha256-YPART7c4s1l7eFMrYgU+b5ZzoY40BRar2okfRHpbVLE=", "owner": "Ninlives", "repo": "minecraft.json", - "rev": "4c4114c57766686c9ddbcd649907fb0326fd2d85", + "rev": "3f8bf450284e2df0df9216b57fbaff64d99053ff", "type": "github" }, "original": { @@ -670,11 +766,11 @@ ] }, "locked": { - "lastModified": 1774047654, - "narHash": "sha256-YFME/138SCI5+ETSwOvKRgwO9Q0Ir3ceEhBLgKmEjzE=", + "lastModified": 1777502784, + "narHash": "sha256-ipkjSav40vAQoziPZPLMXFw+lIUrbAH2mJopPUAYp+I=", "owner": "ricardomaps", "repo": "neu-nix", - "rev": "fe9c0f995efbd263578618d5bd5426d9c5fcfa40", + "rev": "d4b38bfa0112ba1a1359b91404a136a71cafa151", "type": "github" }, "original": { @@ -692,11 +788,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1773166308, - "narHash": "sha256-fkJEQ1rbt/lqsA0+D3+LWtCok9Ofsz8dKDCnbt1MvOs=", + "lastModified": 1778258588, + "narHash": "sha256-24ij+y6nPKH3FAwkykI4Hy2kTiL/sBHSHCoIzlSeQsc=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "2396c36f247f4c1e08f3ffd953b7b958d044e224", + "rev": "8adff7983c2fcb0af530a4ac6165b3431bfbb09c", "type": "github" }, "original": { @@ -708,6 +804,7 @@ }, "nix-citizen": { "inputs": { + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "nix-gaming": [ "nix-gaming" @@ -718,11 +815,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772758266, - "narHash": "sha256-Z6hXOIgFrl1jRVL9UnVf0SIYj7MaMn+0UYpSh3m5VhQ=", + "lastModified": 1778146456, + "narHash": "sha256-RWtBy3vt4fA845/TlAEEx4v/kwqEI/LxvV38rZBlMkM=", "owner": "LovingMelody", "repo": "nix-citizen", - "rev": "68d3aab61b813484ff0d0250139c2cc71872a215", + "rev": "d6f1b0dcb65bc6e75c83b677fbd809d0587fba1a", "type": "github" }, "original": { @@ -754,11 +851,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1772764431, - "narHash": "sha256-Lkj9b2Lajgdnfj42Uhkui5gRYPRnq8DEuCrZH+CRiDI=", + "lastModified": 1778297703, + "narHash": "sha256-EqS67I6LgEpnu/rUO6x+SaMWMN89TTsY1AnThsl84uI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "758f449e9c0b4e8b6f3e8720537fa8d958e1c103", + "rev": "2c1b0276febd6b6cac789a9f3cafe5d6ef4e8f58", "type": "github" }, "original": { @@ -790,16 +887,17 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_9", + "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1772641310, - "narHash": "sha256-Hp3AyU0xX8kiwF5AA8BkziGhQUlUnGUV+P4FAMRG4Kc=", + "lastModified": 1778346777, + "narHash": "sha256-7gpzB8MDCMcRE0wDr7jjxK7/obfeiyAulsfQEsK9pi4=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "02760c85446ac5b457c994b5a2ef3168d9b4dd4f", + "rev": "43930a83206bcdcf3ba4fc10aa4fb9c5f7a677e6", "type": "github" }, "original": { @@ -808,13 +906,34 @@ "type": "github" } }, + "nixos-mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat_5", + "git-hooks": "git-hooks_2", + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1777287493, + "narHash": "sha256-Fj7S91TuZm6+DG/v6SFme/p+sWrYMQICGX6yQ5KD43Q=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "e33fbde199eaad513ef5d0746db19d5878150232", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, "nixpkgs": { "locked": { - "lastModified": 1771848320, - "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fc6539b481e1d2569f25f8799236694180c0993", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -826,11 +945,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -841,11 +960,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -856,11 +975,11 @@ }, "nixpkgs-lib_3": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -869,13 +988,45 @@ "type": "github" } }, + "nixpkgs-nixcord": { + "locked": { + "lastModified": 1777428379, + "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "755f5aa91337890c432639c60b6064bb7fe67769", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { "locked": { - "lastModified": 1772615108, - "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=", + "lastModified": 1776475594, + "narHash": "sha256-mxLieVl5lqjd+QUvgHbvpVrvb9d8zox7m+MiRO6FHu8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9a3a5b8400951b3497d2ef8f239f8451175cf3a1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1778274207, + "narHash": "sha256-I4puXmX1iovcCHZlRmztO3vW0mAbbRvq4F8wgIMQ1MM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0c39f3b5a9a234421d4ad43ab9c7cf64840172d0", + "rev": "b3da656039dc7a6240f27b2ef8cc6a3ef3bccae7", "type": "github" }, "original": { @@ -902,11 +1053,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -918,11 +1069,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1774232173, - "narHash": "sha256-T3eZ0qmTBHf8/RDRcqjokzxRs7zNg4Jy6vqzL95RTmo=", + "lastModified": 1778296267, + "narHash": "sha256-FOc7+Y8FNOJp3uTDm2GCYuta9YfayjnUcIcSQuSq3KU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "609808cb49c288b0006dbefa69f788f09284799b", + "rev": "e87f2714ac889e984d4fa12c4bc0e852e2621c10", "type": "github" }, "original": { @@ -933,11 +1084,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1774053289, - "narHash": "sha256-U+wnCEgsGdRqXfUlt1yZffhLMGbUnkb4MYmisBI+KcU=", + "lastModified": 1778036283, + "narHash": "sha256-62EWg6lI0qyzm7oAx5cAnGkLutvJsRBe0KkEW2JDZCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "28afc93f3c091ae6cacfba64d8a486fab9c9af07", + "rev": "ed67bc86e84e51d4a88e73c7fd36006dc876476f", "type": "github" }, "original": { @@ -948,11 +1099,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1773148319, - "narHash": "sha256-Yr9ej3uSDycQZHWB5HslVgryLkdSBN2fODAqURv/1wQ=", + "lastModified": 1778228972, + "narHash": "sha256-L34YTBob9sdjnc+rd7nMC2X8ddw0LT4RfufnlFyArRU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8da79c289ee165139257335eab0733d98c4ad458", + "rev": "1c5503ba41146fb6b49ed9706823b30de7f3a78f", "type": "github" }, "original": { @@ -964,11 +1115,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -980,11 +1131,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1772173633, - "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", + "lastModified": 1777641297, + "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0f3d81a7ddbc2b1332be0d8481a672b4f6004d6", + "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", "type": "github" }, "original": { @@ -996,11 +1147,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1772465433, - "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=", + "lastModified": 1777428379, + "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c581273b8d5bdf1c6ce7e0a54da9841e6a763913", + "rev": "755f5aa91337890c432639c60b6064bb7fe67769", "type": "github" }, "original": { @@ -1022,11 +1173,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -1043,11 +1194,11 @@ ] }, "locked": { - "lastModified": 1774184185, - "narHash": "sha256-uxvwbXjpJUpWgXLi3Oadd+PqR3UV5MC7B/lm45oluLc=", + "lastModified": 1777508256, + "narHash": "sha256-K+tTlkGEruE/LrGpykxa7yaDg3Z6V+Tmo6YprUMSzKg=", "ref": "refs/heads/master", - "rev": "bcee71cbbb0282d84841ba9b8908773ab56decf2", - "revCount": 66, + "rev": "a9db276fd872951769451142137a5e0f88ed15bc", + "revCount": 122, "type": "git", "url": "https://git.bwaaa.monster/omnisearch" }, @@ -1076,7 +1227,8 @@ "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_10", + "nixos-mailserver": "nixos-mailserver", + "nixpkgs": "nixpkgs_11", "nixpkgs-lib": [ "nixpkgs" ], @@ -1099,18 +1251,17 @@ ], "nur": "nur", "systems": "systems_5", - "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1772296853, - "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", + "lastModified": 1778104276, + "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=", "owner": "nix-community", "repo": "stylix", - "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", + "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c", "type": "github" }, "original": { @@ -1209,23 +1360,6 @@ "type": "github" } }, - "tinted-foot": { - "flake": false, - "locked": { - "lastModified": 1726913040, - "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-foot", - "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", - "type": "github" - } - }, "tinted-kitty": { "flake": false, "locked": { @@ -1245,11 +1379,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -1261,11 +1395,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -1277,11 +1411,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { @@ -1298,11 +1432,11 @@ ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4c58938..9880dc1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); inputs = { - den.url = "github:vic/den"; + den.url = "github:vic/den/v0.10.0"; - flake-aspects.url = "github:vic/flake-aspects"; + flake-aspects.url = "github:vic/flake-aspects/v0.5.0"; flake-file.url = "github:vic/flake-file"; @@ -69,5 +69,7 @@ url = "github:ricardomaps/neu-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; }; } diff --git a/modules/core/graphics/nvidia.nix b/modules/core/graphics/nvidia.nix index 2341779..4cf1138 100644 --- a/modules/core/graphics/nvidia.nix +++ b/modules/core/graphics/nvidia.nix @@ -40,6 +40,16 @@ cudaSupport = true; nvidia.acceptLicense = true; }; + + nix.settings = { + substituters = [ + "https://cache.nixos-cuda.org" + ]; + + trusted-public-keys = [ + "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" + ]; + }; }; }; } diff --git a/modules/core/infra/syncthing.nix b/modules/core/infra/syncthing.nix index f2aea0b..bb2d8d8 100644 --- a/modules/core/infra/syncthing.nix +++ b/modules/core/infra/syncthing.nix @@ -32,7 +32,7 @@ "Downloads" = mkFolder "/home/bug/Downloads"; "Pictures" = mkFolder "/home/bug/Pictures"; "Videos" = mkFolder "/home/bug/Videos"; - "Music" = mkFolder "/home/bug/Music"; + # "Music" = mkFolder "/home/bug/Music"; "nix" = mkFolder "/home/bug/nix"; "hytale" = mkFolder "/home/bug/.local/share/Hytale/UserData/Saves"; "ssh" = mkFolder "/home/bug/.ssh"; diff --git a/modules/core/kernel.nix b/modules/core/kernel.nix index ae14f10..41c8c44 100644 --- a/modules/core/kernel.nix +++ b/modules/core/kernel.nix @@ -1,9 +1,12 @@ { inputs, ... }: { den.aspects.kernel = { nixos = { pkgs, ... }: { - nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.default ]; + nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.pinned ]; - boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; + # boot.kernelPackages = pkgs.cachyosKernels.linuxPackages-cachyos-latest; + + nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ]; + nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ]; }; }; } diff --git a/modules/hosts/common.nix b/modules/hosts/common.nix index 5a31d04..f060a5b 100644 --- a/modules/hosts/common.nix +++ b/modules/hosts/common.nix @@ -1,8 +1,6 @@ { den, ... }: { den.aspects.common = { includes = with den.aspects; [ - den.default - cosmic audio diff --git a/modules/hosts/nix.nix b/modules/hosts/nix.nix index a20b607..8ccc6ad 100644 --- a/modules/hosts/nix.nix +++ b/modules/hosts/nix.nix @@ -1,6 +1,8 @@ { den, ... }: { den.aspects.nix = { includes = with den.aspects; [ + den.default + common nvidia diff --git a/modules/hosts/styx.nix b/modules/hosts/styx.nix index 235345f..f342bed 100644 --- a/modules/hosts/styx.nix +++ b/modules/hosts/styx.nix @@ -1,6 +1,8 @@ { den, ... }: { den.aspects.styx = { includes = with den.aspects; [ + den.default + common amdgpu diff --git a/modules/services/glances.nix b/modules/services/glances.nix index ffb02b6..5f74001 100644 --- a/modules/services/glances.nix +++ b/modules/services/glances.nix @@ -16,7 +16,7 @@ systemd.services.glances-web = { description = "glances web interface"; - after = [ "network-online.target" ]; + #after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/modules/services/mailserver.nix b/modules/services/mailserver.nix index 15d53df..7625d13 100644 --- a/modules/services/mailserver.nix +++ b/modules/services/mailserver.nix @@ -1,12 +1,7 @@ -{ +{ inputs, ... }: { den.aspects.mailserver = { nixos = { - imports = [ - (fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/master.tar.gz"; - sha256 = "0mfc8xkpy6hrfwyhjjnfna8b54s2h01lzsw4mw3yym6ccacc75r8"; - }) - ]; + imports = [ inputs.nixos-mailserver.nixosModules.default ]; security.acme = { acceptTerms = true; @@ -20,14 +15,20 @@ mailserver = { enable = true; - stateVersion = 3; + stateVersion = 4; fqdn = "mail.bug.tools"; domains = [ "bug.tools" ]; x509.useACMEHost = "mail.bug.tools"; - loginAccounts = { + fullTextSearch = { + enable = true; + autoIndex = true; + fallback = false; + }; + + accounts = { "bug@bug.tools" = { hashedPasswordFile = "/home/bug/mailserver/bug.passwd"; aliases = [ @@ -41,8 +42,6 @@ "matrix@bug.tools" "git@bug.tools" "contact@bug.tools" - "fc2@bug.tools" - "counter@bug.tools" "claude@bug.tools" "rumble@bug.tools" ]; diff --git a/modules/software/compatibility/nix-ld.nix b/modules/software/compatibility/nix-ld.nix index b147ec3..8727361 100644 --- a/modules/software/compatibility/nix-ld.nix +++ b/modules/software/compatibility/nix-ld.nix @@ -16,8 +16,9 @@ libXcursor libXrandr libXi + libxcb ]); }; }; }; -} \ No newline at end of file +} diff --git a/modules/software/gaming/gaming.nix b/modules/software/gaming/gaming.nix index 67c7f4a..d98dd25 100644 --- a/modules/software/gaming/gaming.nix +++ b/modules/software/gaming/gaming.nix @@ -1,5 +1,7 @@ { den, ... }: { den.aspects.gaming = { - includes = with den.aspects; [ steam roblox polytoria game-tools emulators star-citizen minecraft ]; + includes = with den.aspects; [ steam roblox polytoria game-tools emulators + #star-citizen + minecraft ]; }; }