From 7309074f25a641007e38bdbca3bca2e9d342a44b Mon Sep 17 00:00:00 2001 From: William Date: Thu, 12 Feb 2026 17:16:01 -0300 Subject: [PATCH 01/39] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/fcdea223397448d35d9b31f798479227e80183f6?narHash=sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L%2BVSybPfiIgzU8lbQ%3D' (2025-11-08) → 'github:ryantm/agenix/b027ee29d959fda4b60b57566d64c98a202e0feb?narHash=sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I%3D' (2026-02-04) • Updated input 'disko': 'github:nix-community/disko/00395d188e3594a1507f214a2f15d4ce5c07cb28?narHash=sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q%3D' (2026-01-20) → 'github:nix-community/disko/71a3fc97d80881e91710fe721f1158d3b96ae14d?narHash=sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE%3D' (2026-01-27) • Updated input 'disko/nixpkgs': 'github:NixOS/nixpkgs/3327b113f2ef698d380df83fbccefad7e83d7769?narHash=sha256-MJwOjrIISfOpdI9x4C%2B5WFQXvHtOuj5mqLZ4TMEtk1M%3D' (2026-01-17) → 'github:NixOS/nixpkgs/48698d12cc10555a4f3e3222d9c669b884a49dfe?narHash=sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv%2B6jcvA212M%3D' (2026-01-25) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/80daad04eddbbf5a4d883996a73f3f542fa437ac?narHash=sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY%3D' (2026-01-11) → 'github:hercules-ci/flake-parts/57928607ea566b5db3ad13af0e57e921e6b12381?narHash=sha256-AnYjnFWgS49RlqX7LrC4uA%2BsCCDBj0Ry/WOJ5XWAsa0%3D' (2026-02-02) • Updated input 'flake-parts/nixpkgs-lib': 'github:nix-community/nixpkgs.lib/2075416fcb47225d9b68ac469a5c4801a9c4dd85?narHash=sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo%3D' (2025-12-14) → 'github:nix-community/nixpkgs.lib/72716169fe93074c333e8d0173151350670b824c?narHash=sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ%2BQDT/KDuyHXVJOpM%3D' (2026-02-01) • Updated input 'home-manager': 'github:nix-community/home-manager/63a87808f5f9b6e4195a1d33f6ea25d23f4aa0df?narHash=sha256-zyMpWHqcpKVmRc1W2NEK7DAuyVJZV62Jdjqudg70b1k%3D' (2026-01-20) → 'github:nix-community/home-manager/6a1f7101d2c3ee87d485a87880d73b4665c6a4bd?narHash=sha256-ZwU5wXKNqpOQvjNz6aBp1j5peiBZow1%2B%2B6pLnk5VAhs%3D' (2026-02-12) • Updated input 'impermanence': 'github:nix-community/impermanence/0d633a69480bb3a3e2f18c080d34a8fa81da6395?narHash=sha256-6nY0ixjGjPQCL%2B/sUC1B1MRiO1LOI3AkRSIywm3i3bE%3D' (2026-01-19) → 'github:nix-community/impermanence/7b1d382faf603b6d264f58627330f9faa5cba149?narHash=sha256-03%2BJxvzmfwRu%2B5JafM0DLbxgHttOQZkUtDWBmeUkN8Y%3D' (2026-01-27) • Updated input 'niri-flake': 'github:sodiboo/niri-flake/6581f5458309233622c1b73c8902dcaea7be16eb?narHash=sha256-ct4qxmFJeJbaJKiOnXOZmRmVmk7TpT%2BlohuTgTr%2BkYQ%3D' (2026-01-20) → 'github:sodiboo/niri-flake/7634add8bf2dd225d04f535de4bd0ee60982f367?narHash=sha256-QgJZ%2BW6YE6nAzO/m7ezamAzr9DTflIEXRozMivL0%2Bhc%3D' (2026-02-11) • Updated input 'niri-flake/niri-unstable': 'github:YaLTeR/niri/d7184a04b904e07113f4623610775ae78d32394c?narHash=sha256-Ub8eed4DsfIDWyg30xEe%2B8bSxL/z5Af/gCjmvJ0V/Hs%3D' (2026-01-17) → 'github:YaLTeR/niri/41b5de87692b8262fbdbff7faab93f04ff0be453?narHash=sha256-8GzUa8bCyQ688jYW2waXrOqetTr7oV8UPTO2He%2B5Hsg%3D' (2026-02-10) • Updated input 'niri-flake/nixpkgs': 'github:NixOS/nixpkgs/e4bae1bd10c9c57b2cf517953ab70060a828ee6f?narHash=sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc%3D' (2026-01-16) → 'github:NixOS/nixpkgs/d6c71932130818840fc8fe9509cf50be8c64634f?narHash=sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84%3D' (2026-02-08) • Updated input 'niri-flake/nixpkgs-stable': 'github:NixOS/nixpkgs/77ef7a29d276c6d8303aece3444d61118ef71ac2?narHash=sha256-XsM7GP3jHlephymxhDE%2B/TKKO1Q16phz/vQiLBGhpF4%3D' (2026-01-18) → 'github:NixOS/nixpkgs/6c5e707c6b5339359a9a9e215c5e66d6d802fd7a?narHash=sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs%3D' (2026-02-11) • Updated input 'niri-flake/xwayland-satellite-unstable': 'github:Supreeeme/xwayland-satellite/ed1cef792b4def3321ff9ab5479df09609f17a69?narHash=sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg%3D' (2026-01-18) → 'github:Supreeeme/xwayland-satellite/86f5bd5d867ad6e120935dfe825f6b903ebbeddd?narHash=sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ%3D' (2026-02-08) • Updated input 'nix-ai-tools': 'github:numtide/llm-agents.nix/78f3fdc13ef903475aa5bfc0f85eeefaa36af837?narHash=sha256-gFoGvnW2YDWsxKD56kdiXbhh9vBPAU3yusssbXF0UMo%3D' (2026-01-20) → 'github:numtide/llm-agents.nix/266d4d8a55eef6dd23cd0adced301053d8fc23c9?narHash=sha256-HQXK2CXAhBuTBw99Ip018Vp9MMAPfJVywgRrkwMUgMc%3D' (2026-02-12) • Updated input 'nix-ai-tools/blueprint': 'github:numtide/blueprint/0ed984d51a3031065925ab08812a5434f40b93d4?narHash=sha256-BJDu7dIMauO2nYRSL4aI8wDNtEm2KOb7lDKP3hxdrpo%3D' (2026-01-02) → 'github:numtide/blueprint/c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c?narHash=sha256-zI%2B7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0%3D' (2026-01-25) • Updated input 'nix-ai-tools/nixpkgs': 'github:NixOS/nixpkgs/bde09022887110deb780067364a0818e89258968?narHash=sha256-tLj4KcRDLakrlpvboTJDKsrp6z2XLwyQ4Zmo%2Bw8KsY4%3D' (2026-01-19) → 'github:NixOS/nixpkgs/2343bbb58f99267223bc2aac4fc9ea301a155a16?narHash=sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8%3D' (2026-02-11) • Updated input 'nix-ai-tools/treefmt-nix': 'github:numtide/treefmt-nix/e96d59dff5c0d7fddb9d113ba108f03c3ef99eca?narHash=sha256-67vyT1%2BxClLldnumAzCTBvU0jLZ1YBcf4vANRWP3%2BAk%3D' (2026-01-11) → 'github:numtide/treefmt-nix/337a4fe074be1042a35086f15481d763b8ddc0e7?narHash=sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD%2BFyxk%3D' (2026-02-04) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/82befcf7dc77c909b0f2a09f5da910ec95c5b78f?narHash=sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws%3D' (2025-12-09) → 'github:nix-community/nix-index-database/2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb?narHash=sha256-hy0gcAgAcxrnSWKGuNO%2BOb0x6jQ2xkR6hoaR0qJBHYs%3D' (2026-02-05) • Updated input 'nixos-cli': 'github:nix-community/nixos-cli/5e79001c7a8b556c3c61d4ef38f0f0fa1187ee90?narHash=sha256-6w1Mhg6%2B46LlaheCa1O/jIk02ukerZ7DdUf9GlQVGxc%3D' (2026-01-18) → 'github:nix-community/nixos-cli/9a2e97e8832b211df22c5cb21a55ebf1c3eb2be1?narHash=sha256-TFRhwVzPg3ly388J3CYYvjrma/dWjsBVpNE437bWeHk%3D' (2026-02-12) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/e4bae1bd10c9c57b2cf517953ab70060a828ee6f?narHash=sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc%3D' (2026-01-16) → 'github:nixos/nixpkgs/d6c71932130818840fc8fe9509cf50be8c64634f?narHash=sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84%3D' (2026-02-08) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/77ef7a29d276c6d8303aece3444d61118ef71ac2?narHash=sha256-XsM7GP3jHlephymxhDE%2B/TKKO1Q16phz/vQiLBGhpF4%3D' (2026-01-18) → 'github:nixos/nixpkgs/6c5e707c6b5339359a9a9e215c5e66d6d802fd7a?narHash=sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs%3D' (2026-02-11) • Updated input 'noctalia': 'github:noctalia-dev/noctalia-shell/1ef5c0eb307e8a4f30dfa6bcc75cf90ae8c6af46?narHash=sha256-T4H/VMjGwBuHEIrPYWfXQ73XV0foCuFGgH7k3SNSJDo%3D' (2026-01-20) → 'github:noctalia-dev/noctalia-shell/d87364964948b9d691f8363f85a5e23bee154df9?narHash=sha256-xg40mnp5KKBepACmvlPzmn5iPyUBxktfv50saSVUn0M%3D' (2026-02-12) • Updated input 'stylix': 'github:danth/stylix/06684f00cfbee14da96fd4307b966884de272d3a?narHash=sha256-3%2Bh7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p%2BS6BA%3D' (2026-01-18) → 'github:danth/stylix/db03fed72e5ca02be34e1d24789345a943329738?narHash=sha256-QHFYyngohNhih4w%2B3IqQty5DV%2Bp1txsx1kkk6XJWar8%3D' (2026-02-12) • Updated input 'vicinae': 'github:vicinaehq/vicinae/934bc0ad47be6dbd6498a0dac655c4613fd0ab27?narHash=sha256-u5bWDuwk6oieTnvm1YjNotcYK8iJSddH5%2BS68%2BX4TSc%3D' (2026-01-19) → 'github:vicinaehq/vicinae/0c70267ab7e07d7972012fcf8ae58808a32a2e86?narHash=sha256-21lurBRyHgJbVD3E0/i7Fhxi4rBUxyznGfKpdGVtEdc%3D' (2026-02-12) • Updated input 'zen-browser': 'github:0xc000022070/zen-browser-flake/37149a5b77e8fd2b5332e8cec9edf39ca5b8e8bc?narHash=sha256-w10iy/aqd5LtD78NDWWG%2BeKGzkb%2BcGhAAo7PVciLbWE%3D' (2026-01-20) → 'github:0xc000022070/zen-browser-flake/0078cf2d5e81eb56a9356d51f2738f7141194de1?narHash=sha256-iJ9c0ZewfRRYUflaEOj43n5TWaB6Ezygn2UA/ZHGQJA%3D' (2026-02-12) • Updated input 'zen-browser/home-manager': 'github:nix-community/home-manager/b4d88c9ac42ae1a745283f6547701da43b6e9f9b?narHash=sha256-cJbFn17oyg6qAraLr%2BNVeNJrXsrzJdrudkzI4H2iTcg%3D' (2026-01-14) → 'github:nix-community/home-manager/f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7?narHash=sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI%3D' (2026-01-31) • Updated input 'zen-browser/nixpkgs': 'github:nixos/nixpkgs/ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38?narHash=sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs%3D' (2026-01-11) → 'github:nixos/nixpkgs/bfc1b8a4574108ceef22f02bafcf6611380c100d?narHash=sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI%3D' (2026-01-26) --- flake.lock | 156 ++++++++++++++++++++++++++--------------------------- 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/flake.lock b/flake.lock index 05b233b..806550a 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762618334, - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", + "lastModified": 1770165109, + "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", "owner": "ryantm", "repo": "agenix", - "rev": "fcdea223397448d35d9b31f798479227e80183f6", + "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1767386128, - "narHash": "sha256-BJDu7dIMauO2nYRSL4aI8wDNtEm2KOb7lDKP3hxdrpo=", + "lastModified": 1769353768, + "narHash": "sha256-zI+7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0=", "owner": "numtide", "repo": "blueprint", - "rev": "0ed984d51a3031065925ab08812a5434f40b93d4", + "rev": "c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c", "type": "github" }, "original": { @@ -140,11 +140,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768923567, - "narHash": "sha256-GVJ0jKsyXLuBzRMXCDY6D5J8wVdwP1DuQmmvYL/Vw/Q=", + "lastModified": 1769524058, + "narHash": "sha256-zygdD6X1PcVNR2PsyK4ptzrVEiAdbMqLos7utrMDEWE=", "owner": "nix-community", "repo": "disko", - "rev": "00395d188e3594a1507f214a2f15d4ce5c07cb28", + "rev": "71a3fc97d80881e91710fe721f1158d3b96ae14d", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -342,11 +342,11 @@ ] }, "locked": { - "lastModified": 1768927746, - "narHash": "sha256-zyMpWHqcpKVmRc1W2NEK7DAuyVJZV62Jdjqudg70b1k=", + "lastModified": 1770915843, + "narHash": "sha256-ZwU5wXKNqpOQvjNz6aBp1j5peiBZow1++6pLnk5VAhs=", "owner": "nix-community", "repo": "home-manager", - "rev": "63a87808f5f9b6e4195a1d33f6ea25d23f4aa0df", + "rev": "6a1f7101d2c3ee87d485a87880d73b4665c6a4bd", "type": "github" }, "original": { @@ -385,11 +385,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1769872935, + "narHash": "sha256-07HMIGQ/WJeAQJooA7Kkg1SDKxhAiV6eodvOwTX6WKI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "f4ad5068ee8e89e4a7c2e963e10dd35cd77b37b7", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1768835187, - "narHash": "sha256-6nY0ixjGjPQCL+/sUC1B1MRiO1LOI3AkRSIywm3i3bE=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d633a69480bb3a3e2f18c080d34a8fa81da6395", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -462,11 +462,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768877436, - "narHash": "sha256-ct4qxmFJeJbaJKiOnXOZmRmVmk7TpT+lohuTgTr+kYQ=", + "lastModified": 1770844822, + "narHash": "sha256-QgJZ+W6YE6nAzO/m7ezamAzr9DTflIEXRozMivL0+hc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6581f5458309233622c1b73c8902dcaea7be16eb", + "rev": "7634add8bf2dd225d04f535de4bd0ee60982f367", "type": "github" }, "original": { @@ -495,11 +495,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1768678265, - "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", + "lastModified": 1770735554, + "narHash": "sha256-8GzUa8bCyQ688jYW2waXrOqetTr7oV8UPTO2He+5Hsg=", "owner": "YaLTeR", "repo": "niri", - "rev": "d7184a04b904e07113f4623610775ae78d32394c", + "rev": "41b5de87692b8262fbdbff7faab93f04ff0be453", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1768922080, - "narHash": "sha256-gFoGvnW2YDWsxKD56kdiXbhh9vBPAU3yusssbXF0UMo=", + "lastModified": 1770907059, + "narHash": "sha256-HQXK2CXAhBuTBw99Ip018Vp9MMAPfJVywgRrkwMUgMc=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "78f3fdc13ef903475aa5bfc0f85eeefaa36af837", + "rev": "266d4d8a55eef6dd23cd0adced301053d8fc23c9", "type": "github" }, "original": { @@ -551,11 +551,11 @@ ] }, "locked": { - "lastModified": 1765267181, - "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", + "lastModified": 1770315571, + "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", + "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb", "type": "github" }, "original": { @@ -572,11 +572,11 @@ "optnix": "optnix" }, "locked": { - "lastModified": 1768778579, - "narHash": "sha256-6w1Mhg6+46LlaheCa1O/jIk02ukerZ7DdUf9GlQVGxc=", + "lastModified": 1770862985, + "narHash": "sha256-TFRhwVzPg3ly388J3CYYvjrma/dWjsBVpNE437bWeHk=", "owner": "nix-community", "repo": "nixos-cli", - "rev": "5e79001c7a8b556c3c61d4ef38f0f0fa1187ee90", + "rev": "9a2e97e8832b211df22c5cb21a55ebf1c3eb2be1", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768661221, - "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=", + "lastModified": 1769330179, + "narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3327b113f2ef698d380df83fbccefad7e83d7769", + "rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe", "type": "github" }, "original": { @@ -603,11 +603,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1765674936, - "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -633,11 +633,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1768773494, - "narHash": "sha256-XsM7GP3jHlephymxhDE+/TKKO1Q16phz/vQiLBGhpF4=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "77ef7a29d276c6d8303aece3444d61118ef71ac2", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { @@ -649,11 +649,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1768773494, - "narHash": "sha256-XsM7GP3jHlephymxhDE+/TKKO1Q16phz/vQiLBGhpF4=", + "lastModified": 1770770419, + "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77ef7a29d276c6d8303aece3444d61118ef71ac2", + "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", "type": "github" }, "original": { @@ -681,11 +681,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -729,11 +729,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -745,11 +745,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1768783163, - "narHash": "sha256-tLj4KcRDLakrlpvboTJDKsrp6z2XLwyQ4Zmo+w8KsY4=", + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bde09022887110deb780067364a0818e89258968", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", "type": "github" }, "original": { @@ -793,11 +793,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -830,11 +830,11 @@ ] }, "locked": { - "lastModified": 1768924718, - "narHash": "sha256-T4H/VMjGwBuHEIrPYWfXQ73XV0foCuFGgH7k3SNSJDo=", + "lastModified": 1770922006, + "narHash": "sha256-xg40mnp5KKBepACmvlPzmn5iPyUBxktfv50saSVUn0M=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1ef5c0eb307e8a4f30dfa6bcc75cf90ae8c6af46", + "rev": "d87364964948b9d691f8363f85a5e23bee154df9", "type": "github" }, "original": { @@ -950,11 +950,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768744881, - "narHash": "sha256-3+h7OxqfrPIB/tRsiZXWE9sCbTm7NQN5Ie428p+S6BA=", + "lastModified": 1770914701, + "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=", "owner": "danth", "repo": "stylix", - "rev": "06684f00cfbee14da96fd4307b966884de272d3a", + "rev": "db03fed72e5ca02be34e1d24789345a943329738", "type": "github" }, "original": { @@ -1149,11 +1149,11 @@ ] }, "locked": { - "lastModified": 1768158989, - "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -1168,11 +1168,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1768856963, - "narHash": "sha256-u5bWDuwk6oieTnvm1YjNotcYK8iJSddH5+S68+X4TSc=", + "lastModified": 1770912475, + "narHash": "sha256-21lurBRyHgJbVD3E0/i7Fhxi4rBUxyznGfKpdGVtEdc=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "934bc0ad47be6dbd6498a0dac655c4613fd0ab27", + "rev": "0c70267ab7e07d7972012fcf8ae58808a32a2e86", "type": "github" }, "original": { @@ -1201,11 +1201,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1768765571, - "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", + "lastModified": 1770583271, + "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", + "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", "type": "github" }, "original": { @@ -1220,11 +1220,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1768919538, - "narHash": "sha256-w10iy/aqd5LtD78NDWWG+eKGzkb+cGhAAo7PVciLbWE=", + "lastModified": 1770919290, + "narHash": "sha256-iJ9c0ZewfRRYUflaEOj43n5TWaB6Ezygn2UA/ZHGQJA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "37149a5b77e8fd2b5332e8cec9edf39ca5b8e8bc", + "rev": "0078cf2d5e81eb56a9356d51f2738f7141194de1", "type": "github" }, "original": { From 8f98f7d420f4ee6747d839160b8275d1581c2626 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 12 Feb 2026 18:50:38 -0300 Subject: [PATCH 02/39] nixfmt --- aspects/ai.nix | 20 +- aspects/bluetooth.nix | 13 +- aspects/cli/btop.nix | 23 +- aspects/cli/comma.nix | 16 +- aspects/cli/direnv.nix | 17 +- aspects/cli/helix.nix | 89 +++-- aspects/cli/hm-cli.nix | 19 +- aspects/cli/starship.nix | 77 ++-- aspects/cli/tmux.nix | 23 +- aspects/common/boot.nix | 28 +- aspects/common/console.nix | 12 +- aspects/common/firewall.nix | 12 +- aspects/common/locale.nix | 34 +- aspects/common/nix.nix | 62 +-- aspects/common/openssh.nix | 18 +- aspects/common/services.nix | 14 +- aspects/common/tailscale.nix | 12 +- aspects/constants.nix | 26 +- aspects/desktop/boot.nix | 51 +-- aspects/desktop/desktop.nix | 541 +++++++++++++------------- aspects/desktop/niri.nix | 10 +- aspects/desktop/nix.nix | 25 +- aspects/desktop/services.nix | 27 +- aspects/dev.nix | 37 +- aspects/ephemeral.nix | 23 +- aspects/fwupd.nix | 13 +- aspects/gaming/flatpak.nix | 40 +- aspects/gaming/hardware.nix | 14 +- aspects/gaming/launchers.nix | 16 +- aspects/gaming/mangohud.nix | 72 ++-- aspects/gaming/steam.nix | 22 +- aspects/hosts/_alexandria/unbound.nix | 3 +- aspects/hosts/_trantor/nginx.nix | 4 +- aspects/hosts/alexandria.nix | 1 + aspects/libvirtd.nix | 35 +- aspects/networkmanager.nix | 21 +- aspects/server/boot.nix | 13 +- aspects/server/nix.nix | 25 +- aspects/server/tailscale.nix | 25 +- aspects/shell/bash.nix | 17 +- aspects/shell/fish.nix | 65 ++-- packages/claude-desktop.nix | 3 +- packages/overlays.nix | 19 +- terranix/kernelpanic.space.nix | 9 +- terranix/terminus.nix | 9 +- 45 files changed, 932 insertions(+), 723 deletions(-) diff --git a/aspects/ai.nix b/aspects/ai.nix index 6befeae..f67bbbc 100644 --- a/aspects/ai.nix +++ b/aspects/ai.nix @@ -1,12 +1,14 @@ { ... }: { - flake.modules.nixos.ai = { inputs, pkgs, ... }: { - environment.systemPackages = - (with pkgs; [claude-desktop]) ++ - (with inputs.nix-ai-tools.packages.${pkgs.system}; [ - claude-code - claudebox - opencode - ]); - }; + flake.modules.nixos.ai = + { inputs, pkgs, ... }: + { + environment.systemPackages = + (with pkgs; [ claude-desktop ]) + ++ (with inputs.nix-ai-tools.packages.${pkgs.system}; [ + claude-code + claudebox + opencode + ]); + }; } diff --git a/aspects/bluetooth.nix b/aspects/bluetooth.nix index 222bdf2..2027ac1 100644 --- a/aspects/bluetooth.nix +++ b/aspects/bluetooth.nix @@ -1,6 +1,13 @@ { ... }: { - flake.modules.nixos.bluetooth = { config, lib, pkgs, ... }: { - hardware.bluetooth.enable = true; - }; + flake.modules.nixos.bluetooth = + { + config, + lib, + pkgs, + ... + }: + { + hardware.bluetooth.enable = true; + }; } diff --git a/aspects/cli/btop.nix b/aspects/cli/btop.nix index 09a815e..2b9c3fc 100644 --- a/aspects/cli/btop.nix +++ b/aspects/cli/btop.nix @@ -1,13 +1,20 @@ { ... }: { - flake.modules.homeManager.cli-btop = { config, lib, pkgs, ... }: { - programs.btop = { - enable = true; - settings = { - theme_background = false; - proc_sorting = "cpu direct"; - update_ms = 500; + flake.modules.homeManager.cli-btop = + { + config, + lib, + pkgs, + ... + }: + { + programs.btop = { + enable = true; + settings = { + theme_background = false; + proc_sorting = "cpu direct"; + update_ms = 500; + }; }; }; - }; } diff --git a/aspects/cli/comma.nix b/aspects/cli/comma.nix index b8e6c2a..71ddb9c 100644 --- a/aspects/cli/comma.nix +++ b/aspects/cli/comma.nix @@ -1,8 +1,16 @@ { ... }: { - flake.modules.homeManager.cli-comma = { config, lib, pkgs, inputs, ... }: { - imports = [ inputs.nix-index-database.homeModules.nix-index ]; + flake.modules.homeManager.cli-comma = + { + config, + lib, + pkgs, + inputs, + ... + }: + { + imports = [ inputs.nix-index-database.homeModules.nix-index ]; - programs.nix-index-database.comma.enable = true; - }; + programs.nix-index-database.comma.enable = true; + }; } diff --git a/aspects/cli/direnv.nix b/aspects/cli/direnv.nix index 4399283..60ea7ad 100644 --- a/aspects/cli/direnv.nix +++ b/aspects/cli/direnv.nix @@ -1,9 +1,16 @@ { ... }: { - flake.modules.homeManager.cli-direnv = { config, lib, pkgs, ... }: { - programs.direnv = { - enable = true; - nix-direnv.enable = true; + flake.modules.homeManager.cli-direnv = + { + config, + lib, + pkgs, + ... + }: + { + programs.direnv = { + enable = true; + nix-direnv.enable = true; + }; }; - }; } diff --git a/aspects/cli/helix.nix b/aspects/cli/helix.nix index 1fa2baf..fe0cf74 100644 --- a/aspects/cli/helix.nix +++ b/aspects/cli/helix.nix @@ -1,50 +1,57 @@ { ... }: { - flake.modules.homeManager.cli-helix = { config, lib, pkgs, ... }: { - home.sessionVariables = { - EDITOR = "hx"; - }; + flake.modules.homeManager.cli-helix = + { + config, + lib, + pkgs, + ... + }: + { + home.sessionVariables = { + EDITOR = "hx"; + }; - programs.helix = { - enable = true; - settings = { - editor = { - file-picker.hidden = false; - idle-timeout = 0; - line-number = "relative"; - cursor-shape = { - normal = "underline"; - insert = "bar"; - select = "underline"; + programs.helix = { + enable = true; + settings = { + editor = { + file-picker.hidden = false; + idle-timeout = 0; + line-number = "relative"; + cursor-shape = { + normal = "underline"; + insert = "bar"; + select = "underline"; + }; + soft-wrap.enable = true; + auto-format = true; + indent-guides.render = true; }; - soft-wrap.enable = true; - auto-format = true; - indent-guides.render = true; - }; - keys.normal = { - space = { - o = "file_picker_in_current_buffer_directory"; - esc = [ - "collapse_selection" - "keep_primary_selection" - ]; + keys.normal = { + space = { + o = "file_picker_in_current_buffer_directory"; + esc = [ + "collapse_selection" + "keep_primary_selection" + ]; + }; }; }; - }; - languages = { - language = [ - { - name = "nix"; - auto-format = true; - formatter.command = "nixfmt"; - } - { - name = "typst"; - auto-format = true; - formatter.command = "typstyle -c 1000 -i"; - } - ]; + languages = { + language = [ + { + name = "nix"; + auto-format = true; + formatter.command = "nixfmt"; + } + { + name = "typst"; + auto-format = true; + formatter.command = "typstyle -c 1000 -i"; + } + ]; + }; }; }; - }; } diff --git a/aspects/cli/hm-cli.nix b/aspects/cli/hm-cli.nix index acee59d..7064a3f 100644 --- a/aspects/cli/hm-cli.nix +++ b/aspects/cli/hm-cli.nix @@ -1,11 +1,18 @@ { ... }: { - flake.modules.homeManager.cli-base = { config, lib, pkgs, ... }: { - home = { - packages = with pkgs; [ hm-cli ]; - sessionVariables = { - HM_PATH = "/etc/nixos"; + flake.modules.homeManager.cli-base = + { + config, + lib, + pkgs, + ... + }: + { + home = { + packages = with pkgs; [ hm-cli ]; + sessionVariables = { + HM_PATH = "/etc/nixos"; + }; }; }; - }; } diff --git a/aspects/cli/starship.nix b/aspects/cli/starship.nix index e9884a7..7ba3a54 100644 --- a/aspects/cli/starship.nix +++ b/aspects/cli/starship.nix @@ -1,41 +1,48 @@ { ... }: { - flake.modules.homeManager.cli-starship = { config, lib, pkgs, ... }: { - programs.starship = { - enable = true; - enableBashIntegration = true; - enableFishIntegration = true; - settings = { - add_newline = false; - format = '' - $hostname$directory$git_branch$git_status$nix_shell - [ ❯ ](bold green) - ''; - right_format = "$cmd_duration$character"; - hostname = { - ssh_symbol = "󰖟 "; - }; - character = { - error_symbol = "[](red)"; - success_symbol = "[󱐋](green)"; - }; - cmd_duration = { - format = "[󰄉 $duration ]($style)"; - style = "yellow"; - min_time = 500; - }; - git_branch = { - symbol = " "; - style = "purple"; - }; - git_status.style = "red"; - nix_shell = { - format = "via [$symbol$state]($style)"; - heuristic = true; - style = "blue"; - symbol = "󱄅 "; + flake.modules.homeManager.cli-starship = + { + config, + lib, + pkgs, + ... + }: + { + programs.starship = { + enable = true; + enableBashIntegration = true; + enableFishIntegration = true; + settings = { + add_newline = false; + format = '' + $hostname$directory$git_branch$git_status$nix_shell + [ ❯ ](bold green) + ''; + right_format = "$cmd_duration$character"; + hostname = { + ssh_symbol = "󰖟 "; + }; + character = { + error_symbol = "[](red)"; + success_symbol = "[󱐋](green)"; + }; + cmd_duration = { + format = "[󰄉 $duration ]($style)"; + style = "yellow"; + min_time = 500; + }; + git_branch = { + symbol = " "; + style = "purple"; + }; + git_status.style = "red"; + nix_shell = { + format = "via [$symbol$state]($style)"; + heuristic = true; + style = "blue"; + symbol = "󱄅 "; + }; }; }; }; - }; } diff --git a/aspects/cli/tmux.nix b/aspects/cli/tmux.nix index 078a6aa..1238501 100644 --- a/aspects/cli/tmux.nix +++ b/aspects/cli/tmux.nix @@ -1,12 +1,19 @@ { ... }: { - flake.modules.homeManager.cli-tmux = { config, lib, pkgs, ... }: { - programs.tmux = { - enable = true; - clock24 = true; - terminal = "xterm-256color"; - mouse = true; - keyMode = "vi"; + flake.modules.homeManager.cli-tmux = + { + config, + lib, + pkgs, + ... + }: + { + programs.tmux = { + enable = true; + clock24 = true; + terminal = "xterm-256color"; + mouse = true; + keyMode = "vi"; + }; }; - }; } diff --git a/aspects/common/boot.nix b/aspects/common/boot.nix index 109d6f2..b74b68c 100644 --- a/aspects/common/boot.nix +++ b/aspects/common/boot.nix @@ -1,21 +1,23 @@ { ... }: { - flake.modules.nixos.common-boot = { pkgs, ... }: { - boot = { - loader = { - timeout = 1; - efi.canTouchEfiVariables = true; - systemd-boot = { - enable = true; - editor = false; - consoleMode = "max"; - sortKey = "aa"; - netbootxyz = { + flake.modules.nixos.common-boot = + { pkgs, ... }: + { + boot = { + loader = { + timeout = 1; + efi.canTouchEfiVariables = true; + systemd-boot = { enable = true; - sortKey = "zz"; + editor = false; + consoleMode = "max"; + sortKey = "aa"; + netbootxyz = { + enable = true; + sortKey = "zz"; + }; }; }; }; }; - }; } diff --git a/aspects/common/console.nix b/aspects/common/console.nix index 6f6be9f..128b914 100644 --- a/aspects/common/console.nix +++ b/aspects/common/console.nix @@ -1,9 +1,11 @@ { ... }: { - flake.modules.nixos.common-console = { ... }: { - console = { - useXkbConfig = true; - earlySetup = true; + flake.modules.nixos.common-console = + { ... }: + { + console = { + useXkbConfig = true; + earlySetup = true; + }; }; - }; } diff --git a/aspects/common/firewall.nix b/aspects/common/firewall.nix index af1a8f7..0e5297d 100644 --- a/aspects/common/firewall.nix +++ b/aspects/common/firewall.nix @@ -1,9 +1,11 @@ { ... }: { - flake.modules.nixos.common-firewall = { ... }: { - networking = { - firewall.enable = true; - nftables.enable = true; + flake.modules.nixos.common-firewall = + { ... }: + { + networking = { + firewall.enable = true; + nftables.enable = true; + }; }; - }; } diff --git a/aspects/common/locale.nix b/aspects/common/locale.nix index 2b91759..a6b5754 100644 --- a/aspects/common/locale.nix +++ b/aspects/common/locale.nix @@ -1,22 +1,24 @@ { ... }: { - flake.modules.nixos.common-locale = { ... }: { - time.timeZone = "America/Bahia"; + flake.modules.nixos.common-locale = + { ... }: + { + time.timeZone = "America/Bahia"; - i18n = { - defaultLocale = "en_US.UTF-8"; - extraLocaleSettings = { - LC_ADDRESS = "pt_BR.utf8"; - LC_COLLATE = "pt_BR.utf8"; - LC_IDENTIFICATION = "pt_BR.utf8"; - LC_MEASUREMENT = "pt_BR.utf8"; - LC_MONETARY = "pt_BR.utf8"; - LC_NAME = "pt_BR.utf8"; - LC_NUMERIC = "pt_BR.utf8"; - LC_PAPER = "pt_BR.utf8"; - LC_TELEPHONE = "pt_BR.utf8"; - LC_TIME = "en_IE.utf8"; + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "pt_BR.utf8"; + LC_COLLATE = "pt_BR.utf8"; + LC_IDENTIFICATION = "pt_BR.utf8"; + LC_MEASUREMENT = "pt_BR.utf8"; + LC_MONETARY = "pt_BR.utf8"; + LC_NAME = "pt_BR.utf8"; + LC_NUMERIC = "pt_BR.utf8"; + LC_PAPER = "pt_BR.utf8"; + LC_TELEPHONE = "pt_BR.utf8"; + LC_TIME = "en_IE.utf8"; + }; }; }; - }; } diff --git a/aspects/common/nix.nix b/aspects/common/nix.nix index 414c315..cd76f62 100644 --- a/aspects/common/nix.nix +++ b/aspects/common/nix.nix @@ -1,39 +1,41 @@ { ... }: { - flake.modules.nixos.common-nix = { inputs, ... }: { - imports = [ inputs.nixos-cli.nixosModules.nixos-cli ]; + flake.modules.nixos.common-nix = + { inputs, ... }: + { + imports = [ inputs.nixos-cli.nixosModules.nixos-cli ]; - nix = { - settings = { - auto-optimise-store = true; - connect-timeout = 10; - log-lines = 25; - min-free = 128000000; - max-free = 1000000000; - trusted-users = [ "@wheel" ]; + nix = { + settings = { + auto-optimise-store = true; + connect-timeout = 10; + log-lines = 25; + min-free = 128000000; + max-free = 1000000000; + trusted-users = [ "@wheel" ]; + }; + extraOptions = "experimental-features = nix-command flakes"; + gc = { + automatic = true; + options = "--delete-older-than 8d"; + }; }; - extraOptions = "experimental-features = nix-command flakes"; - gc = { - automatic = true; - options = "--delete-older-than 8d"; + + nixpkgs.config = { + allowUnfree = true; + enableParallelBuilding = true; + buildManPages = false; + buildDocs = false; }; - }; - nixpkgs.config = { - allowUnfree = true; - enableParallelBuilding = true; - buildManPages = false; - buildDocs = false; - }; - - services.nixos-cli = { - enable = true; - config = { - use_nvd = true; - ignore_dirty_tree = true; + services.nixos-cli = { + enable = true; + config = { + use_nvd = true; + ignore_dirty_tree = true; + }; }; - }; - system.stateVersion = "22.11"; - }; + system.stateVersion = "22.11"; + }; } diff --git a/aspects/common/openssh.nix b/aspects/common/openssh.nix index c515d81..b8179f2 100644 --- a/aspects/common/openssh.nix +++ b/aspects/common/openssh.nix @@ -1,12 +1,14 @@ { ... }: { - flake.modules.nixos.common-openssh = { ... }: { - services.openssh = { - enable = true; - settings.PermitRootLogin = "no"; - extraConfig = '' - PrintLastLog no - ''; + flake.modules.nixos.common-openssh = + { ... }: + { + services.openssh = { + enable = true; + settings.PermitRootLogin = "no"; + extraConfig = '' + PrintLastLog no + ''; + }; }; - }; } diff --git a/aspects/common/services.nix b/aspects/common/services.nix index befdbb9..e05dcf0 100644 --- a/aspects/common/services.nix +++ b/aspects/common/services.nix @@ -1,10 +1,12 @@ { ... }: { - flake.modules.nixos.common-services = { ... }: { - services = { - dbus.implementation = "broker"; - irqbalance.enable = true; - fstrim.enable = true; + flake.modules.nixos.common-services = + { ... }: + { + services = { + dbus.implementation = "broker"; + irqbalance.enable = true; + fstrim.enable = true; + }; }; - }; } diff --git a/aspects/common/tailscale.nix b/aspects/common/tailscale.nix index 13eb82a..74381ac 100644 --- a/aspects/common/tailscale.nix +++ b/aspects/common/tailscale.nix @@ -1,9 +1,11 @@ { ... }: { - flake.modules.nixos.common-tailscale = { ... }: { - services.tailscale = { - enable = true; - extraUpFlags = [ "--operator=user" ]; + flake.modules.nixos.common-tailscale = + { ... }: + { + services.tailscale = { + enable = true; + extraUpFlags = [ "--operator=user" ]; + }; }; - }; } diff --git a/aspects/constants.nix b/aspects/constants.nix index 2d980e1..7d77098 100644 --- a/aspects/constants.nix +++ b/aspects/constants.nix @@ -54,12 +54,15 @@ let sharedData = import ../data/services.nix; # Enrich services with host IP information - enrichServices = hosts: services: - map (svc: + enrichServices = + hosts: services: + map ( + svc: let - hostInfo = hosts.${svc.host} or {}; + hostInfo = hosts.${svc.host} or { }; in - svc // { + svc + // { lanIP = hostInfo.lanIP or null; tailscaleIP = hostInfo.tailscaleIP or null; } @@ -70,19 +73,19 @@ in options.flake = { hosts = lib.mkOption { type = lib.types.attrsOf hostType; - default = {}; + default = { }; description = "Host definitions with IP addresses"; }; services = lib.mkOption { type = lib.types.listOf serviceType; - default = []; + default = [ ]; description = "Service definitions with enriched host information"; }; lib = lib.mkOption { type = lib.types.attrsOf lib.types.raw; - default = {}; + default = { }; description = "Utility functions for flake configuration"; }; }; @@ -94,9 +97,11 @@ in lib = { # Nginx virtual host utilities - mkNginxVHosts = { domains }: + mkNginxVHosts = + { domains }: let - mkVHostConfig = domain: vhostConfig: + mkVHostConfig = + domain: vhostConfig: lib.recursiveUpdate { useACMEHost = domain; forceSSL = true; @@ -107,7 +112,8 @@ in # Split DNS utilities for unbound # Generates unbound view config from a list of DNS entries - mkSplitDNS = entries: + mkSplitDNS = + entries: let tailscaleData = map (e: ''"${e.domain}. IN A ${e.tailscaleIP}"'') entries; lanData = map (e: ''"${e.domain}. IN A ${e.lanIP}"'') entries; diff --git a/aspects/desktop/boot.nix b/aspects/desktop/boot.nix index 48f879d..cd0fa9c 100644 --- a/aspects/desktop/boot.nix +++ b/aspects/desktop/boot.nix @@ -1,27 +1,34 @@ { ... }: { - flake.modules.nixos.desktop-boot = { config, lib, pkgs, ... }: { - boot = { - plymouth.enable = true; - initrd.systemd.enable = true; - loader.efi.efiSysMountPoint = "/boot/efi"; - kernelPackages = pkgs.linuxPackages_xanmod_latest; - extraModprobeConfig = '' - options bluetooth disable_ertm=1 - ''; - kernel.sysctl = { - "net.ipv4.tcp_mtu_probing" = 1; + flake.modules.nixos.desktop-boot = + { + config, + lib, + pkgs, + ... + }: + { + boot = { + plymouth.enable = true; + initrd.systemd.enable = true; + loader.efi.efiSysMountPoint = "/boot/efi"; + kernelPackages = pkgs.linuxPackages_xanmod_latest; + extraModprobeConfig = '' + options bluetooth disable_ertm=1 + ''; + kernel.sysctl = { + "net.ipv4.tcp_mtu_probing" = 1; + }; + kernelParams = [ + "quiet" + "splash" + "i2c-dev" + "i2c-piix4" + "loglevel=3" + "udev.log_priority=3" + "rd.udev.log_level=3" + "rd.systemd.show_status=false" + ]; }; - kernelParams = [ - "quiet" - "splash" - "i2c-dev" - "i2c-piix4" - "loglevel=3" - "udev.log_priority=3" - "rd.udev.log_level=3" - "rd.systemd.show_status=false" - ]; }; - }; } diff --git a/aspects/desktop/desktop.nix b/aspects/desktop/desktop.nix index f2298e7..fb54f55 100644 --- a/aspects/desktop/desktop.nix +++ b/aspects/desktop/desktop.nix @@ -4,289 +4,304 @@ }: { flake.modules = { - nixos.desktop-desktop = { config, lib, pkgs, ... }: { - imports = [ - inputs.niri-flake.nixosModules.niri - inputs.nix-flatpak.nixosModules.nix-flatpak - ]; - - environment = { - sessionVariables = { - KDEHOME = "$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir - NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland - }; - systemPackages = with pkgs; [ - ### Web ### - bitwarden-desktop - fragments - nextcloud-client - tor-browser - vesktop - inputs.zen-browser.packages."${system}".default - ### Office & Productivity ### - aspell - aspellDicts.de - aspellDicts.en - aspellDicts.en-computers - aspellDicts.pt_BR - papers - presenterm - rnote - ### Graphics & Design ### - gimp - inkscape - plasticity - ### System Utilities ### - adwaita-icon-theme - ghostty - gnome-disk-utility - junction - libfido2 - mission-center - nautilus - p7zip - rclone - toggleaudiosink - unrar - ### Media ### - decibels - loupe - obs-studio - showtime + nixos.desktop-desktop = + { + config, + lib, + pkgs, + ... + }: + { + imports = [ + inputs.niri-flake.nixosModules.niri + inputs.nix-flatpak.nixosModules.nix-flatpak ]; - }; - services = { - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - wireplumber.enable = true; - }; - greetd = { - enable = true; - settings = { - default_session = { - command = "${lib.getExe pkgs.tuigreet} --user-menu --time --remember --asterisks --cmd ${config.programs.niri.package}/bin/niri-session"; - user = "greeter"; - }; - } - // lib.optionalAttrs (config.networking.hostName == "io") { - initial_session = { - command = "${config.programs.niri.package}/bin/niri-session"; - user = "user"; - }; + environment = { + sessionVariables = { + KDEHOME = "$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir + NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland }; - }; - flatpak = { - enable = true; - packages = [ + systemPackages = with pkgs; [ + ### Web ### + bitwarden-desktop + fragments + nextcloud-client + tor-browser + vesktop + inputs.zen-browser.packages."${system}".default ### Office & Productivity ### - "com.collabora.Office" + aspell + aspellDicts.de + aspellDicts.en + aspellDicts.en-computers + aspellDicts.pt_BR + papers + presenterm + rnote ### Graphics & Design ### - "com.boxy_svg.BoxySVG" - rec { - appId = "io.github.softfever.OrcaSlicer"; - sha256 = "0hdx5sg6fknj1pfnfxvlfwb5h6y1vjr6fyajbsnjph5gkp97c6p1"; - bundle = "${pkgs.fetchurl { - url = "https://github.com/SoftFever/OrcaSlicer/releases/download/v2.3.0/OrcaSlicer-Linux-flatpak_V2.3.0_x86_64.flatpak"; - inherit sha256; - }}"; - } + gimp + inkscape + plasticity ### System Utilities ### - "com.github.tchx84.Flatseal" - "com.rustdesk.RustDesk" - ]; - uninstallUnmanaged = true; - update.auto.enable = true; - }; - gvfs.enable = true; - }; - - security.rtkit.enable = true; # Needed for pipewire to acquire realtime priority - - users = { - users.greeter = { - isSystemUser = true; - group = "greeter"; - }; - groups.greeter = { }; - }; - - programs = { - niri = { - enable = true; - package = inputs.niri.packages.${pkgs.system}.niri; - }; - kdeconnect = { - enable = true; - package = pkgs.valent; - }; - dconf.enable = true; - appimage = { - enable = true; - binfmt = true; - }; - }; - - niri-flake.cache.enable = false; - - fonts = { - fontDir.enable = true; - packages = with pkgs; [ - corefonts - inter - nerd-fonts.fira-code - noto-fonts-cjk-sans - noto-fonts-color-emoji - roboto - ]; - }; - - xdg.portal = { - extraPortals = with pkgs; [ - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk - ]; - config = { - common.default = "*"; - niri.default = [ - "gtk" - "gnome" + adwaita-icon-theme + ghostty + gnome-disk-utility + junction + libfido2 + mission-center + nautilus + p7zip + rclone + toggleaudiosink + unrar + ### Media ### + decibels + loupe + obs-studio + showtime ]; }; - }; - }; - homeManager.desktop-desktop = { config, lib, pkgs, inputs, ... }: { - imports = [ inputs.vicinae.homeManagerModules.default ]; - - fonts.fontconfig.enable = true; - - home.packages = with pkgs; [ xwayland-satellite ]; - - services.vicinae = { - enable = true; - systemd = { - enable = true; - autoStart = true; + services = { + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + jack.enable = true; + wireplumber.enable = true; + }; + greetd = { + enable = true; + settings = { + default_session = { + command = "${lib.getExe pkgs.tuigreet} --user-menu --time --remember --asterisks --cmd ${config.programs.niri.package}/bin/niri-session"; + user = "greeter"; + }; + } + // lib.optionalAttrs (config.networking.hostName == "io") { + initial_session = { + command = "${config.programs.niri.package}/bin/niri-session"; + user = "user"; + }; + }; + }; + flatpak = { + enable = true; + packages = [ + ### Office & Productivity ### + "com.collabora.Office" + ### Graphics & Design ### + "com.boxy_svg.BoxySVG" + rec { + appId = "io.github.softfever.OrcaSlicer"; + sha256 = "0hdx5sg6fknj1pfnfxvlfwb5h6y1vjr6fyajbsnjph5gkp97c6p1"; + bundle = "${pkgs.fetchurl { + url = "https://github.com/SoftFever/OrcaSlicer/releases/download/v2.3.0/OrcaSlicer-Linux-flatpak_V2.3.0_x86_64.flatpak"; + inherit sha256; + }}"; + } + ### System Utilities ### + "com.github.tchx84.Flatseal" + "com.rustdesk.RustDesk" + ]; + uninstallUnmanaged = true; + update.auto.enable = true; + }; + gvfs.enable = true; }; - }; - programs = { - ghostty = { - enable = true; - settings = { - cursor-style = "block"; - shell-integration-features = "no-cursor"; - cursor-style-blink = false; - custom-shader = "${builtins.fetchurl { - url = "https://raw.githubusercontent.com/hackr-sh/ghostty-shaders/cb6eb4b0d1a3101c869c62e458b25a826f9dcde3/cursor_blaze.glsl"; - sha256 = "sha256:0g2lgqjdrn3c51glry7x2z30y7ml0y61arl5ykmf4yj0p85s5f41"; - }}"; - bell-features = ""; - gtk-titlebar-style = "tabs"; - keybind = [ "shift+enter=text:\\x1b\\r" ]; + security.rtkit.enable = true; # Needed for pipewire to acquire realtime priority + + users = { + users.greeter = { + isSystemUser = true; + group = "greeter"; + }; + groups.greeter = { }; + }; + + programs = { + niri = { + enable = true; + package = inputs.niri.packages.${pkgs.system}.niri; + }; + kdeconnect = { + enable = true; + package = pkgs.valent; + }; + dconf.enable = true; + appimage = { + enable = true; + binfmt = true; }; }; - password-store = { - enable = true; - package = pkgs.pass-wayland; - }; - }; + niri-flake.cache.enable = false; - xdg = { - enable = true; - userDirs.enable = true; - mimeApps = { - enable = true; - defaultApplications = { - "text/html" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" + fonts = { + fontDir.enable = true; + packages = with pkgs; [ + corefonts + inter + nerd-fonts.fira-code + noto-fonts-cjk-sans + noto-fonts-color-emoji + roboto + ]; + }; + + xdg.portal = { + extraPortals = with pkgs; [ + xdg-desktop-portal-gnome + xdg-desktop-portal-gtk + ]; + config = { + common.default = "*"; + niri.default = [ + "gtk" + "gnome" ]; - "x-scheme-handler/http" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "x-scheme-handler/https" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "x-scheme-handler/about" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "x-scheme-handler/unknown" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "image/jpeg" = "org.gnome.Loupe.desktop"; - "image/png" = "org.gnome.Loupe.desktop"; - "image/gif" = "org.gnome.Loupe.desktop"; - "image/webp" = "org.gnome.Loupe.desktop"; - "image/bmp" = "org.gnome.Loupe.desktop"; - "image/svg+xml" = "org.gnome.Loupe.desktop"; - "image/tiff" = "org.gnome.Loupe.desktop"; - "video/mp4" = "io.bassi.Showtime.desktop"; - "video/x-matroska" = "io.bassi.Showtime.desktop"; - "video/webm" = "io.bassi.Showtime.desktop"; - "video/mpeg" = "io.bassi.Showtime.desktop"; - "video/x-msvideo" = "io.bassi.Showtime.desktop"; - "video/quicktime" = "io.bassi.Showtime.desktop"; - "video/x-flv" = "io.bassi.Showtime.desktop"; - "audio/mpeg" = "io.bassi.Showtime.desktop"; - "audio/flac" = "io.bassi.Showtime.desktop"; - "audio/ogg" = "io.bassi.Showtime.desktop"; - "audio/wav" = "io.bassi.Showtime.desktop"; - "audio/mp4" = "io.bassi.Showtime.desktop"; - "audio/x-opus+ogg" = "io.bassi.Showtime.desktop"; - "application/pdf" = [ - "org.gnome.Papers.desktop" - "zen-browser.desktop" - ]; - "text/plain" = "Helix.desktop"; - "text/markdown" = "Helix.desktop"; - "text/x-log" = "Helix.desktop"; - "application/x-shellscript" = "Helix.desktop"; - "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = - "com.collabora.Office.desktop"; # DOCX - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = - "com.collabora.Office.desktop"; # XLSX - "application/vnd.openxmlformats-officedocument.presentationml.presentation" = - "com.collabora.Office.desktop"; # PPTX - "application/vnd.oasis.opendocument.text" = "com.collabora.Office.desktop"; # ODT - "application/vnd.oasis.opendocument.spreadsheet" = "com.collabora.Office.desktop"; # ODS - "application/vnd.oasis.opendocument.presentation" = "com.collabora.Office.desktop"; # ODP - "application/msword" = "com.collabora.Office.desktop"; # DOC - "application/vnd.ms-excel" = "com.collabora.Office.desktop"; # XLS - "application/vnd.ms-powerpoint" = "com.collabora.Office.desktop"; # PPT - "application/zip" = "org.gnome.FileRoller.desktop"; - "application/x-tar" = "org.gnome.FileRoller.desktop"; - "application/x-compressed-tar" = "org.gnome.FileRoller.desktop"; - "application/x-bzip-compressed-tar" = "org.gnome.FileRoller.desktop"; - "application/x-xz-compressed-tar" = "org.gnome.FileRoller.desktop"; - "application/x-7z-compressed" = "org.gnome.FileRoller.desktop"; - "application/x-rar" = "org.gnome.FileRoller.desktop"; - "application/gzip" = "org.gnome.FileRoller.desktop"; - "application/x-bzip" = "org.gnome.FileRoller.desktop"; - "inode/directory" = "org.gnome.Nautilus.desktop"; }; }; }; - # Set Ghostty as default terminal - home.sessionVariables = { - TERMINAL = "ghostty"; + homeManager.desktop-desktop = + { + config, + lib, + pkgs, + inputs, + ... + }: + { + imports = [ inputs.vicinae.homeManagerModules.default ]; + + fonts.fontconfig.enable = true; + + home.packages = with pkgs; [ xwayland-satellite ]; + + services.vicinae = { + enable = true; + systemd = { + enable = true; + autoStart = true; + }; + }; + + programs = { + ghostty = { + enable = true; + settings = { + cursor-style = "block"; + shell-integration-features = "no-cursor"; + cursor-style-blink = false; + custom-shader = "${builtins.fetchurl { + url = "https://raw.githubusercontent.com/hackr-sh/ghostty-shaders/cb6eb4b0d1a3101c869c62e458b25a826f9dcde3/cursor_blaze.glsl"; + sha256 = "sha256:0g2lgqjdrn3c51glry7x2z30y7ml0y61arl5ykmf4yj0p85s5f41"; + }}"; + bell-features = ""; + gtk-titlebar-style = "tabs"; + keybind = [ "shift+enter=text:\\x1b\\r" ]; + }; + }; + + password-store = { + enable = true; + package = pkgs.pass-wayland; + }; + }; + + xdg = { + enable = true; + userDirs.enable = true; + mimeApps = { + enable = true; + defaultApplications = { + "text/html" = [ + "re.sonny.Junction.desktop" + "zen-browser.desktop" + "torbrowser.desktop" + ]; + "x-scheme-handler/http" = [ + "re.sonny.Junction.desktop" + "zen-browser.desktop" + "torbrowser.desktop" + ]; + "x-scheme-handler/https" = [ + "re.sonny.Junction.desktop" + "zen-browser.desktop" + "torbrowser.desktop" + ]; + "x-scheme-handler/about" = [ + "re.sonny.Junction.desktop" + "zen-browser.desktop" + "torbrowser.desktop" + ]; + "x-scheme-handler/unknown" = [ + "re.sonny.Junction.desktop" + "zen-browser.desktop" + "torbrowser.desktop" + ]; + "image/jpeg" = "org.gnome.Loupe.desktop"; + "image/png" = "org.gnome.Loupe.desktop"; + "image/gif" = "org.gnome.Loupe.desktop"; + "image/webp" = "org.gnome.Loupe.desktop"; + "image/bmp" = "org.gnome.Loupe.desktop"; + "image/svg+xml" = "org.gnome.Loupe.desktop"; + "image/tiff" = "org.gnome.Loupe.desktop"; + "video/mp4" = "io.bassi.Showtime.desktop"; + "video/x-matroska" = "io.bassi.Showtime.desktop"; + "video/webm" = "io.bassi.Showtime.desktop"; + "video/mpeg" = "io.bassi.Showtime.desktop"; + "video/x-msvideo" = "io.bassi.Showtime.desktop"; + "video/quicktime" = "io.bassi.Showtime.desktop"; + "video/x-flv" = "io.bassi.Showtime.desktop"; + "audio/mpeg" = "io.bassi.Showtime.desktop"; + "audio/flac" = "io.bassi.Showtime.desktop"; + "audio/ogg" = "io.bassi.Showtime.desktop"; + "audio/wav" = "io.bassi.Showtime.desktop"; + "audio/mp4" = "io.bassi.Showtime.desktop"; + "audio/x-opus+ogg" = "io.bassi.Showtime.desktop"; + "application/pdf" = [ + "org.gnome.Papers.desktop" + "zen-browser.desktop" + ]; + "text/plain" = "Helix.desktop"; + "text/markdown" = "Helix.desktop"; + "text/x-log" = "Helix.desktop"; + "application/x-shellscript" = "Helix.desktop"; + "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = + "com.collabora.Office.desktop"; # DOCX + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = + "com.collabora.Office.desktop"; # XLSX + "application/vnd.openxmlformats-officedocument.presentationml.presentation" = + "com.collabora.Office.desktop"; # PPTX + "application/vnd.oasis.opendocument.text" = "com.collabora.Office.desktop"; # ODT + "application/vnd.oasis.opendocument.spreadsheet" = "com.collabora.Office.desktop"; # ODS + "application/vnd.oasis.opendocument.presentation" = "com.collabora.Office.desktop"; # ODP + "application/msword" = "com.collabora.Office.desktop"; # DOC + "application/vnd.ms-excel" = "com.collabora.Office.desktop"; # XLS + "application/vnd.ms-powerpoint" = "com.collabora.Office.desktop"; # PPT + "application/zip" = "org.gnome.FileRoller.desktop"; + "application/x-tar" = "org.gnome.FileRoller.desktop"; + "application/x-compressed-tar" = "org.gnome.FileRoller.desktop"; + "application/x-bzip-compressed-tar" = "org.gnome.FileRoller.desktop"; + "application/x-xz-compressed-tar" = "org.gnome.FileRoller.desktop"; + "application/x-7z-compressed" = "org.gnome.FileRoller.desktop"; + "application/x-rar" = "org.gnome.FileRoller.desktop"; + "application/gzip" = "org.gnome.FileRoller.desktop"; + "application/x-bzip" = "org.gnome.FileRoller.desktop"; + "inode/directory" = "org.gnome.Nautilus.desktop"; + }; + }; + }; + + # Set Ghostty as default terminal + home.sessionVariables = { + TERMINAL = "ghostty"; + }; }; - }; }; } diff --git a/aspects/desktop/niri.nix b/aspects/desktop/niri.nix index 6458ab0..cdd02ac 100644 --- a/aspects/desktop/niri.nix +++ b/aspects/desktop/niri.nix @@ -1,6 +1,14 @@ { ... }: { - flake.modules.homeManager.desktop-niri = { config, lib, pkgs, inputs, hostname ? null, ... }: + flake.modules.homeManager.desktop-niri = + { + config, + lib, + pkgs, + inputs, + hostname ? null, + ... + }: let isRotterdam = hostname == "rotterdam"; in diff --git a/aspects/desktop/nix.nix b/aspects/desktop/nix.nix index a3aa421..3a9e71e 100644 --- a/aspects/desktop/nix.nix +++ b/aspects/desktop/nix.nix @@ -1,14 +1,21 @@ { inputs, ... }: { - flake.modules.nixos.desktop-nix = { config, lib, pkgs, ... }: { - environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath; + flake.modules.nixos.desktop-nix = + { + config, + lib, + pkgs, + ... + }: + { + environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath; - nix = { - registry.nixpkgs.flake = inputs.nixpkgs; - nixPath = [ - "nixpkgs=${inputs.nixpkgs}" - "/nix/var/nix/profiles/per-user/root/channels" - ]; + nix = { + registry.nixpkgs.flake = inputs.nixpkgs; + nixPath = [ + "nixpkgs=${inputs.nixpkgs}" + "/nix/var/nix/profiles/per-user/root/channels" + ]; + }; }; - }; } diff --git a/aspects/desktop/services.nix b/aspects/desktop/services.nix index 8ebbb6b..eb9482a 100644 --- a/aspects/desktop/services.nix +++ b/aspects/desktop/services.nix @@ -1,16 +1,23 @@ { ... }: { - flake.modules.nixos.desktop-services = { config, lib, pkgs, ... }: { - services = { - printing.enable = true; - udev.packages = with pkgs; [ yubikey-personalization ]; - keyd = { - enable = true; - keyboards.all = { - ids = [ "*" ]; - settings.main.capslock = "overload(meta, esc)"; + flake.modules.nixos.desktop-services = + { + config, + lib, + pkgs, + ... + }: + { + services = { + printing.enable = true; + udev.packages = with pkgs; [ yubikey-personalization ]; + keyd = { + enable = true; + keyboards.all = { + ids = [ "*" ]; + settings.main.capslock = "overload(meta, esc)"; + }; }; }; }; - }; } diff --git a/aspects/dev.nix b/aspects/dev.nix index cc84646..89a1026 100644 --- a/aspects/dev.nix +++ b/aspects/dev.nix @@ -1,19 +1,26 @@ { ... }: { - flake.modules.nixos.dev = { config, lib, pkgs, ... }: { - environment.systemPackages = with pkgs; [ - android-tools - bat - lazygit - fd - fzf - glow - nixfmt - nix-init - nix-output-monitor - ripgrep - ]; + flake.modules.nixos.dev = + { + config, + lib, + pkgs, + ... + }: + { + environment.systemPackages = with pkgs; [ + android-tools + bat + lazygit + fd + fzf + glow + nixfmt + nix-init + nix-output-monitor + ripgrep + ]; - users.users.user.extraGroups = [ "adbusers" ]; - }; + users.users.user.extraGroups = [ "adbusers" ]; + }; } diff --git a/aspects/ephemeral.nix b/aspects/ephemeral.nix index 724f931..90c03c6 100644 --- a/aspects/ephemeral.nix +++ b/aspects/ephemeral.nix @@ -3,7 +3,8 @@ { inputs, ... }: { # Base module with options (for external flakes or direct use) - flake.modules.nixos.ephemeral = { lib, config, ... }: + flake.modules.nixos.ephemeral = + { lib, config, ... }: let cfg = config.ephemeral; in @@ -89,18 +90,19 @@ # Factory function that generates configured modules flake.factory.ephemeral = - { rootDevice - , rootSubvolume ? "@root" - , retentionDays ? 30 - , persistentStoragePath ? "/persistent" - , persistentFiles ? [ + { + rootDevice, + rootSubvolume ? "@root", + retentionDays ? 30, + persistentStoragePath ? "/persistent", + persistentFiles ? [ "/etc/machine-id" "/etc/ssh/ssh_host_ed25519_key" "/etc/ssh/ssh_host_ed25519_key.pub" "/etc/ssh/ssh_host_rsa_key" "/etc/ssh/ssh_host_rsa_key.pub" - ] - , persistentDirectories ? [ + ], + persistentDirectories ? [ "/etc/NetworkManager/system-connections" "/etc/nixos" "/var/lib/bluetooth" @@ -111,9 +113,10 @@ "/var/lib/systemd/timers" "/var/lib/tailscale" "/var/log" - ] + ], }: - { ... }: { + { ... }: + { imports = [ inputs.impermanence.nixosModules.impermanence inputs.self.modules.nixos.ephemeral diff --git a/aspects/fwupd.nix b/aspects/fwupd.nix index 746f1d0..217f1eb 100644 --- a/aspects/fwupd.nix +++ b/aspects/fwupd.nix @@ -1,6 +1,13 @@ { ... }: { - flake.modules.nixos.fwupd = { config, lib, pkgs, ... }: { - services.fwupd.enable = true; - }; + flake.modules.nixos.fwupd = + { + config, + lib, + pkgs, + ... + }: + { + services.fwupd.enable = true; + }; } diff --git a/aspects/gaming/flatpak.nix b/aspects/gaming/flatpak.nix index ad50c7c..cc4d0ee 100644 --- a/aspects/gaming/flatpak.nix +++ b/aspects/gaming/flatpak.nix @@ -1,23 +1,25 @@ { ... }: { - flake.modules.nixos.gaming-flatpak = { pkgs, ... }: { - services.flatpak.packages = [ - "com.github.k4zmu2a.spacecadetpinball" - "com.steamgriddb.SGDBoop" - "io.github.Foldex.AdwSteamGtk" - "io.itch.itch" - "io.mrarm.mcpelauncher" - "net.retrodeck.retrodeck" - "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/25.08" - rec { - appId = "com.hypixel.HytaleLauncher"; - sha256 = "01307s44bklc1ldcigcn9n4lm8hf8q793v9fv7w4w04xd5zyh4rv"; - bundle = "${pkgs.fetchurl { - url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak"; - inherit sha256; - }}"; - } - ]; - }; + flake.modules.nixos.gaming-flatpak = + { pkgs, ... }: + { + services.flatpak.packages = [ + "com.github.k4zmu2a.spacecadetpinball" + "com.steamgriddb.SGDBoop" + "io.github.Foldex.AdwSteamGtk" + "io.itch.itch" + "io.mrarm.mcpelauncher" + "net.retrodeck.retrodeck" + "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/25.08" + rec { + appId = "com.hypixel.HytaleLauncher"; + sha256 = "01307s44bklc1ldcigcn9n4lm8hf8q793v9fv7w4w04xd5zyh4rv"; + bundle = "${pkgs.fetchurl { + url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak"; + inherit sha256; + }}"; + } + ]; + }; } diff --git a/aspects/gaming/hardware.nix b/aspects/gaming/hardware.nix index f1bd75b..e3b5c4b 100644 --- a/aspects/gaming/hardware.nix +++ b/aspects/gaming/hardware.nix @@ -1,11 +1,13 @@ { ... }: { - flake.modules.nixos.gaming-hardware = { ... }: { - hardware = { - xpadneo.enable = true; - steam-hardware.enable = true; # Allow steam client to manage controllers - graphics.enable32Bit = true; # For OpenGL games + flake.modules.nixos.gaming-hardware = + { ... }: + { + hardware = { + xpadneo.enable = true; + steam-hardware.enable = true; # Allow steam client to manage controllers + graphics.enable32Bit = true; # For OpenGL games + }; }; - }; } diff --git a/aspects/gaming/launchers.nix b/aspects/gaming/launchers.nix index 5684f9f..1fd3bb4 100644 --- a/aspects/gaming/launchers.nix +++ b/aspects/gaming/launchers.nix @@ -1,11 +1,13 @@ { ... }: { - flake.modules.nixos.gaming-launchers = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ - clonehero - heroic - prismlauncher - ]; - }; + flake.modules.nixos.gaming-launchers = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + clonehero + heroic + prismlauncher + ]; + }; } diff --git a/aspects/gaming/mangohud.nix b/aspects/gaming/mangohud.nix index 7f83644..2856b8f 100644 --- a/aspects/gaming/mangohud.nix +++ b/aspects/gaming/mangohud.nix @@ -2,42 +2,46 @@ { flake.modules = { - nixos.gaming-mangohud = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ - mangohud - ]; - }; + nixos.gaming-mangohud = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + mangohud + ]; + }; - homeManager.gaming-mangohud = { config, ... }: { - programs.mangohud = { - enable = true; - enableSessionWide = true; - settings = { - position = "top-left"; - fps = true; - frametime = false; - frame_timing = false; - gpu_stats = true; - gpu_temp = true; - gpu_power = true; - cpu_stats = true; - cpu_temp = true; - cpu_power = true; - ram = true; - vram = true; - gamemode = false; - vkbasalt = false; - version = false; - engine_version = false; - vulkan_driver = false; - wine = false; - time = false; - fps_sampling_period = 500; - toggle_hud = "Shift_L+F12"; - toggle_logging = "Ctrl_L+F2"; - output_folder = "${config.home.homeDirectory}/.local/share/mangohud"; + homeManager.gaming-mangohud = + { config, ... }: + { + programs.mangohud = { + enable = true; + enableSessionWide = true; + settings = { + position = "top-left"; + fps = true; + frametime = false; + frame_timing = false; + gpu_stats = true; + gpu_temp = true; + gpu_power = true; + cpu_stats = true; + cpu_temp = true; + cpu_power = true; + ram = true; + vram = true; + gamemode = false; + vkbasalt = false; + version = false; + engine_version = false; + vulkan_driver = false; + wine = false; + time = false; + fps_sampling_period = 500; + toggle_hud = "Shift_L+F12"; + toggle_logging = "Ctrl_L+F2"; + output_folder = "${config.home.homeDirectory}/.local/share/mangohud"; + }; }; }; - }; }; } diff --git a/aspects/gaming/steam.nix b/aspects/gaming/steam.nix index e0ab9a8..530c99b 100644 --- a/aspects/gaming/steam.nix +++ b/aspects/gaming/steam.nix @@ -1,17 +1,19 @@ { ... }: { - flake.modules.nixos.gaming-steam = { pkgs, ... }: { - environment.systemPackages = with pkgs; [ - steam-run - ]; + flake.modules.nixos.gaming-steam = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + steam-run + ]; - programs = { - steam = { - enable = true; - extraCompatPackages = [ pkgs.proton-ge-bin ]; + programs = { + steam = { + enable = true; + extraCompatPackages = [ pkgs.proton-ge-bin ]; + }; + gamemode.enable = true; }; - gamemode.enable = true; }; - }; } diff --git a/aspects/hosts/_alexandria/unbound.nix b/aspects/hosts/_alexandria/unbound.nix index 07c8850..8aedc37 100644 --- a/aspects/hosts/_alexandria/unbound.nix +++ b/aspects/hosts/_alexandria/unbound.nix @@ -34,8 +34,7 @@ in # LAN-only DNS records local-zone = ''"baduhai.dev." transparent''; - local-data = map (e: ''"${e.domain}. IN A ${e.lanIP}"'') - (lib.filter (e: e.lanIP != null) services); + local-data = map (e: ''"${e.domain}. IN A ${e.lanIP}"'') (lib.filter (e: e.lanIP != null) services); }; forward-zone = [ diff --git a/aspects/hosts/_trantor/nginx.nix b/aspects/hosts/_trantor/nginx.nix index 5522e24..899666e 100644 --- a/aspects/hosts/_trantor/nginx.nix +++ b/aspects/hosts/_trantor/nginx.nix @@ -9,9 +9,7 @@ let services = inputs.self.services; # Get all unique domains from shared services on trantor (host = "trantor") - localDomains = lib.unique ( - map (s: s.domain) (lib.filter (s: s.host == "trantor") services) - ); + localDomains = lib.unique (map (s: s.domain) (lib.filter (s: s.host == "trantor") services)); # Generate ACME cert configs for all local domains acmeCerts = lib.genAttrs localDomains (domain: { diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index 28c333e..aacf3b0 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -1,4 +1,5 @@ { inputs, self, ... }: + { flake.nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem { system = "x86_64-linux"; diff --git a/aspects/libvirtd.nix b/aspects/libvirtd.nix index 6487999..1135306 100644 --- a/aspects/libvirtd.nix +++ b/aspects/libvirtd.nix @@ -1,18 +1,25 @@ { ... }: { - flake.modules.nixos.libvirtd = { config, lib, pkgs, ... }: { - virtualisation = { - libvirtd.enable = true; - spiceUSBRedirection.enable = true; + flake.modules.nixos.libvirtd = + { + config, + lib, + pkgs, + ... + }: + { + virtualisation = { + libvirtd.enable = true; + spiceUSBRedirection.enable = true; + }; + + programs.virt-manager.enable = true; + + networking.firewall.trustedInterfaces = [ "virbr0" ]; + + users.users.user.extraGroups = [ + "libvirt" + "libvirtd" + ]; }; - - programs.virt-manager.enable = true; - - networking.firewall.trustedInterfaces = [ "virbr0" ]; - - users.users.user.extraGroups = [ - "libvirt" - "libvirtd" - ]; - }; } diff --git a/aspects/networkmanager.nix b/aspects/networkmanager.nix index 74c9260..8bcb1f2 100644 --- a/aspects/networkmanager.nix +++ b/aspects/networkmanager.nix @@ -1,11 +1,18 @@ { ... }: { - flake.modules.nixos.networkmanager = { config, lib, pkgs, ... }: { - networking.networkmanager = { - enable = true; - wifi.backend = "iwd"; - }; + flake.modules.nixos.networkmanager = + { + config, + lib, + pkgs, + ... + }: + { + networking.networkmanager = { + enable = true; + wifi.backend = "iwd"; + }; - users.users.user.extraGroups = [ "networkmanager" ]; - }; + users.users.user.extraGroups = [ "networkmanager" ]; + }; } diff --git a/aspects/server/boot.nix b/aspects/server/boot.nix index ff5ef25..38634d1 100644 --- a/aspects/server/boot.nix +++ b/aspects/server/boot.nix @@ -1,7 +1,14 @@ # aspects/server/boot.nix { ... }: { - flake.modules.nixos.server-boot = { config, lib, pkgs, ... }: { - boot.kernelPackages = pkgs.linuxPackages_hardened; - }; + flake.modules.nixos.server-boot = + { + config, + lib, + pkgs, + ... + }: + { + boot.kernelPackages = pkgs.linuxPackages_hardened; + }; } diff --git a/aspects/server/nix.nix b/aspects/server/nix.nix index 84bec67..1cb8e8b 100644 --- a/aspects/server/nix.nix +++ b/aspects/server/nix.nix @@ -1,15 +1,22 @@ # aspects/server/nix.nix { inputs, ... }: { - flake.modules.nixos.server-nix = { config, lib, pkgs, ... }: { - environment.etc."channels/nixpkgs".source = inputs.nixpkgs-stable.outPath; + flake.modules.nixos.server-nix = + { + config, + lib, + pkgs, + ... + }: + { + environment.etc."channels/nixpkgs".source = inputs.nixpkgs-stable.outPath; - nix = { - registry.nixpkgs.flake = inputs.nixpkgs-stable; - nixPath = [ - "nixpkgs=/etc/channels/nixpkgs" - "/nix/var/nix/profiles/per-user/root/channels" - ]; + nix = { + registry.nixpkgs.flake = inputs.nixpkgs-stable; + nixPath = [ + "nixpkgs=/etc/channels/nixpkgs" + "/nix/var/nix/profiles/per-user/root/channels" + ]; + }; }; - }; } diff --git a/aspects/server/tailscale.nix b/aspects/server/tailscale.nix index 5a48799..cf2fa4b 100644 --- a/aspects/server/tailscale.nix +++ b/aspects/server/tailscale.nix @@ -1,15 +1,22 @@ # aspects/server/tailscale.nix { ... }: { - flake.modules.nixos.server-tailscale = { config, lib, pkgs, ... }: { - services.tailscale = { - extraSetFlags = [ "--advertise-exit-node" ]; - useRoutingFeatures = "server"; - }; + flake.modules.nixos.server-tailscale = + { + config, + lib, + pkgs, + ... + }: + { + services.tailscale = { + extraSetFlags = [ "--advertise-exit-node" ]; + useRoutingFeatures = "server"; + }; - boot.kernel.sysctl = { - "net.ipv4.ip_forward" = 1; - "net.ipv6.conf.all.forwarding" = 1; + boot.kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; }; - }; } diff --git a/aspects/shell/bash.nix b/aspects/shell/bash.nix index 3ec7237..e451148 100644 --- a/aspects/shell/bash.nix +++ b/aspects/shell/bash.nix @@ -1,9 +1,16 @@ { ... }: { - flake.modules.homeManager.shell-bash = { config, lib, pkgs, ... }: { - programs.bash = { - enable = true; - historyFile = "~/.cache/bash_history"; + flake.modules.homeManager.shell-bash = + { + config, + lib, + pkgs, + ... + }: + { + programs.bash = { + enable = true; + historyFile = "~/.cache/bash_history"; + }; }; - }; } diff --git a/aspects/shell/fish.nix b/aspects/shell/fish.nix index e2ae9cf..22c0f5c 100644 --- a/aspects/shell/fish.nix +++ b/aspects/shell/fish.nix @@ -1,33 +1,40 @@ { ... }: { - flake.modules.homeManager.shell-fish = { config, lib, pkgs, ... }: { - programs.fish = { - enable = true; - interactiveShellInit = '' - set fish_greeting - ${lib.getExe pkgs.nix-your-shell} fish | source - ''; - loginShellInit = "${lib.getExe pkgs.nix-your-shell} fish | source"; - plugins = [ - { - name = "bang-bang"; - src = pkgs.fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-bang-bang"; - rev = "f969c618301163273d0a03d002614d9a81952c1e"; - sha256 = "sha256-A8ydBX4LORk+nutjHurqNNWFmW6LIiBPQcxS3x4nbeQ="; - }; - } - { - name = "z"; - src = pkgs.fetchFromGitHub { - owner = "jethrokuan"; - repo = "z"; - rev = "067e867debee59aee231e789fc4631f80fa5788e"; - sha256 = "sha256-emmjTsqt8bdI5qpx1bAzhVACkg0MNB/uffaRjjeuFxU="; - }; - } - ]; + flake.modules.homeManager.shell-fish = + { + config, + lib, + pkgs, + ... + }: + { + programs.fish = { + enable = true; + interactiveShellInit = '' + set fish_greeting + ${lib.getExe pkgs.nix-your-shell} fish | source + ''; + loginShellInit = "${lib.getExe pkgs.nix-your-shell} fish | source"; + plugins = [ + { + name = "bang-bang"; + src = pkgs.fetchFromGitHub { + owner = "oh-my-fish"; + repo = "plugin-bang-bang"; + rev = "f969c618301163273d0a03d002614d9a81952c1e"; + sha256 = "sha256-A8ydBX4LORk+nutjHurqNNWFmW6LIiBPQcxS3x4nbeQ="; + }; + } + { + name = "z"; + src = pkgs.fetchFromGitHub { + owner = "jethrokuan"; + repo = "z"; + rev = "067e867debee59aee231e789fc4631f80fa5788e"; + sha256 = "sha256-emmjTsqt8bdI5qpx1bAzhVACkg0MNB/uffaRjjeuFxU="; + }; + } + ]; + }; }; - }; } diff --git a/packages/claude-desktop.nix b/packages/claude-desktop.nix index e93f3af..c21ec8e 100644 --- a/packages/claude-desktop.nix +++ b/packages/claude-desktop.nix @@ -18,7 +18,8 @@ }; src = - srcs.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system: ${pkgs.stdenv.hostPlatform.system}"); + srcs.${pkgs.stdenv.hostPlatform.system} + or (throw "Unsupported system: ${pkgs.stdenv.hostPlatform.system}"); claudeNativeStub = '' // Stub implementation of claude-native using KeyboardKey enum values diff --git a/packages/overlays.nix b/packages/overlays.nix index a36ed60..169a67b 100644 --- a/packages/overlays.nix +++ b/packages/overlays.nix @@ -4,19 +4,20 @@ let packageDir = builtins.readDir ./.; # Filter to .nix files, excluding overlays.nix - isPackageFile = name: - name != "overlays.nix" && builtins.match ".*\\.nix$" name != null; + isPackageFile = name: name != "overlays.nix" && builtins.match ".*\\.nix$" name != null; # Extract package name from filename (e.g., "foo-bar.nix" -> "foo-bar") - toPackageName = filename: - builtins.head (builtins.match "(.+)\\.nix$" filename); + toPackageName = filename: builtins.head (builtins.match "(.+)\\.nix$" filename); packageNames = map toPackageName (builtins.filter isPackageFile (builtins.attrNames packageDir)); in { - flake.overlays.default = final: prev: - builtins.listToAttrs (map (name: { - inherit name; - value = inputs.self.packages.${final.system}.${name}; - }) packageNames); + flake.overlays.default = + final: prev: + builtins.listToAttrs ( + map (name: { + inherit name; + value = inputs.self.packages.${final.system}.${name}; + }) packageNames + ); } diff --git a/terranix/kernelpanic.space.nix b/terranix/kernelpanic.space.nix index 01e5c08..91b615e 100644 --- a/terranix/kernelpanic.space.nix +++ b/terranix/kernelpanic.space.nix @@ -8,9 +8,12 @@ terranix.terranixConfigurations.cloudflare-kernelpanicspace = { terraformWrapper.package = pkgs.opentofu; modules = [ - ({ config, ... }: { - # Terraform config goes here - }) + ( + { config, ... }: + { + # Terraform config goes here + } + ) ]; }; }; diff --git a/terranix/terminus.nix b/terranix/terminus.nix index 7a0fa5b..d7689f9 100644 --- a/terranix/terminus.nix +++ b/terranix/terminus.nix @@ -8,9 +8,12 @@ terranix.terranixConfigurations.oci-terminus = { terraformWrapper.package = pkgs.opentofu; modules = [ - ({ config, ... }: { - # Terraform config goes here - }) + ( + { config, ... }: + { + # Terraform config goes here + } + ) ]; }; }; From c1dcb7e31636ecd730710f1349e825c5bc5d768b Mon Sep 17 00:00:00 2001 From: William Date: Thu, 12 Feb 2026 19:04:34 -0300 Subject: [PATCH 03/39] kanidm upgrade process is a pain I currenty have two other possible oauth providers running: forgejo & nextcloud --- aspects/hosts/_alexandria/kanidm.nix | 82 ---------------------------- aspects/hosts/alexandria.nix | 1 - 2 files changed, 83 deletions(-) delete mode 100644 aspects/hosts/_alexandria/kanidm.nix diff --git a/aspects/hosts/_alexandria/kanidm.nix b/aspects/hosts/_alexandria/kanidm.nix deleted file mode 100644 index 35e08c8..0000000 --- a/aspects/hosts/_alexandria/kanidm.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ - config, - lib, - inputs, - pkgs, - ... -}: - -let - mkNginxVHosts = inputs.self.lib.mkNginxVHosts; - kanidmCertDir = "/var/lib/kanidm/certs"; -in - -{ - services.kanidm = { - enableServer = true; - enableClient = true; - package = pkgs.kanidm; - - serverSettings = { - domain = "auth.baduhai.dev"; - origin = "https://auth.baduhai.dev"; - bindaddress = "127.0.0.1:8443"; - ldapbindaddress = "127.0.0.1:636"; - trust_x_forward_for = true; - # Use self-signed certificates for internal TLS - tls_chain = "${kanidmCertDir}/cert.pem"; - tls_key = "${kanidmCertDir}/key.pem"; - }; - - clientSettings = { - uri = "https://auth.baduhai.dev"; - }; - }; - - services.nginx.virtualHosts = mkNginxVHosts { - domains."auth.baduhai.dev" = { - locations."/" = { - proxyPass = "https://127.0.0.1:8443"; - extraConfig = '' - proxy_ssl_verify off; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - ''; - }; - }; - }; - - networking.firewall.allowedTCPPorts = [ 636 ]; - - # Generate self-signed certificates for kanidm's internal TLS - systemd.services.kanidm-generate-certs = { - description = "Generate self-signed TLS certificates for Kanidm"; - wantedBy = [ "multi-user.target" ]; - before = [ "kanidm.service" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - script = '' - mkdir -p ${kanidmCertDir} - if [ ! -f ${kanidmCertDir}/key.pem ]; then - ${pkgs.openssl}/bin/openssl req -x509 -newkey rsa:4096 \ - -keyout ${kanidmCertDir}/key.pem \ - -out ${kanidmCertDir}/cert.pem \ - -days 3650 -nodes \ - -subj "/CN=localhost" \ - -addext "subjectAltName=DNS:localhost,IP:127.0.0.1" - chown -R kanidm:kanidm ${kanidmCertDir} - chmod 600 ${kanidmCertDir}/key.pem - chmod 644 ${kanidmCertDir}/cert.pem - fi - ''; - }; - - # Ensure certificate generation runs before kanidm starts - systemd.services.kanidm = { - after = [ "kanidm-generate-certs.service" ]; - wants = [ "kanidm-generate-certs.service" ]; - }; -} diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index aacf3b0..03a02b9 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -41,7 +41,6 @@ # Host-specific files (from _alexandria/) ./_alexandria/hardware-configuration.nix ./_alexandria/jellyfin.nix - ./_alexandria/kanidm.nix ./_alexandria/nextcloud.nix ./_alexandria/nginx.nix ./_alexandria/unbound.nix From b2747359901c1a7482035a44b2105f121ea92de6 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 12 Feb 2026 19:22:40 -0300 Subject: [PATCH 04/39] podmand for alexandria --- aspects/hosts/alexandria.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index 03a02b9..7da2c39 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -1,4 +1,4 @@ -{ inputs, self, ... }: +{ inputs, ... }: { flake.nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem { @@ -35,8 +35,9 @@ inputs.self.modules.nixos.server-nix inputs.self.modules.nixos.server-tailscale - # Other aspects based on tags + # Other aspects inputs.self.modules.nixos.fwupd + inputs.self.modules.nixos.podman # Host-specific files (from _alexandria/) ./_alexandria/hardware-configuration.nix From 66b72be5b8564c5226ed096b7e2963806994a610 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 13 Feb 2026 16:38:05 -0300 Subject: [PATCH 05/39] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'zen-browser': 'github:0xc000022070/zen-browser-flake/0078cf2d5e81eb56a9356d51f2738f7141194de1?narHash=sha256-iJ9c0ZewfRRYUflaEOj43n5TWaB6Ezygn2UA/ZHGQJA%3D' (2026-02-12) → 'github:0xc000022070/zen-browser-flake/80ce62fd26af1934454f405bcb2510ceeea8d3a2?narHash=sha256-5UDaXr770MaDac9HcFvGlUjsqyOoNbFdHArmjmtHcVk%3D' (2026-02-13) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 806550a..8587eb2 100644 --- a/flake.lock +++ b/flake.lock @@ -1220,11 +1220,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1770919290, - "narHash": "sha256-iJ9c0ZewfRRYUflaEOj43n5TWaB6Ezygn2UA/ZHGQJA=", + "lastModified": 1771000521, + "narHash": "sha256-5UDaXr770MaDac9HcFvGlUjsqyOoNbFdHArmjmtHcVk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0078cf2d5e81eb56a9356d51f2738f7141194de1", + "rev": "80ce62fd26af1934454f405bcb2510ceeea8d3a2", "type": "github" }, "original": { From d184f75f5d393de07ac9549e8b27cfea4b67eff0 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 11:08:21 -0300 Subject: [PATCH 06/39] nixos-cli: retry as root, auto yes --- aspects/common/nix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aspects/common/nix.nix b/aspects/common/nix.nix index cd76f62..7fa6e49 100644 --- a/aspects/common/nix.nix +++ b/aspects/common/nix.nix @@ -33,6 +33,8 @@ config = { use_nvd = true; ignore_dirty_tree = true; + apply.reexec_as_root = true; + confirmation.empty = "default-yes"; }; }; From 5f1c05f090bdf4b4034bbbe68a7fe054ec2b9faf Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 11:54:34 -0300 Subject: [PATCH 07/39] ssh: only run fastfetch on initial ssh session --- aspects/common/programs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aspects/common/programs.nix b/aspects/common/programs.nix index 7d12f09..b53b293 100644 --- a/aspects/common/programs.nix +++ b/aspects/common/programs.nix @@ -31,7 +31,7 @@ enable = true; interactiveShellInit = '' set fish_greeting - if set -q SSH_CONNECTION + if set -q SSH_CONNECTION; and not set -q IN_NIX_SHELL; or not set -q TMUX export TERM=xterm-256color clear fastfetch From bfa2521ed09c33f32b4f0405c3117e3a0381c2f6 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 12:53:05 -0300 Subject: [PATCH 08/39] re-work cli aspect for nixos and homeModules --- aspects/cli/btop.nix | 38 ++++++++----- aspects/cli/cli.nix | 28 +++++++++ aspects/cli/comma.nix | 2 +- aspects/cli/direnv.nix | 2 +- aspects/cli/helix.nix | 106 +++++++++++++++++++---------------- aspects/cli/hm-cli.nix | 2 +- aspects/cli/starship.nix | 2 +- aspects/cli/tmux.nix | 40 ++++++++----- aspects/common/programs.nix | 3 - aspects/hosts/alexandria.nix | 49 ++++++++-------- aspects/hosts/io.nix | 76 ++++++++++++------------- aspects/hosts/rotterdam.nix | 86 ++++++++++++++-------------- aspects/hosts/trantor.nix | 60 +++++++++----------- 13 files changed, 264 insertions(+), 230 deletions(-) create mode 100644 aspects/cli/cli.nix diff --git a/aspects/cli/btop.nix b/aspects/cli/btop.nix index 2b9c3fc..220a462 100644 --- a/aspects/cli/btop.nix +++ b/aspects/cli/btop.nix @@ -1,20 +1,28 @@ { ... }: { - flake.modules.homeManager.cli-btop = - { - config, - lib, - pkgs, - ... - }: - { - programs.btop = { - enable = true; - settings = { - theme_background = false; - proc_sorting = "cpu direct"; - update_ms = 500; + flake.modules = { + nixos.btop = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ btop ]; + }; + + homeManager.btop = + { + config, + lib, + pkgs, + ... + }: + { + programs.btop = { + enable = true; + settings = { + theme_background = false; + proc_sorting = "cpu direct"; + update_ms = 500; + }; }; }; - }; + }; } diff --git a/aspects/cli/cli.nix b/aspects/cli/cli.nix new file mode 100644 index 0000000..8a11616 --- /dev/null +++ b/aspects/cli/cli.nix @@ -0,0 +1,28 @@ +{ inputs, ... }: + +{ + flake.modules = { + nixos.cli = + { ... }: + { + imports = with inputs.self.modules.nixos; [ + btop + helix + tmux + ]; + }; + homeManager.cli = + { ... }: + { + imports = with inputs.self.modules.nixos; [ + btop + comma + direnv + helix + hm-cli + starship + tmux + ]; + }; + }; +} diff --git a/aspects/cli/comma.nix b/aspects/cli/comma.nix index 71ddb9c..169144f 100644 --- a/aspects/cli/comma.nix +++ b/aspects/cli/comma.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.homeManager.cli-comma = + flake.modules.homeManager.comma = { config, lib, diff --git a/aspects/cli/direnv.nix b/aspects/cli/direnv.nix index 60ea7ad..2cfb2ef 100644 --- a/aspects/cli/direnv.nix +++ b/aspects/cli/direnv.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.homeManager.cli-direnv = + flake.modules.homeManager.direnv = { config, lib, diff --git a/aspects/cli/helix.nix b/aspects/cli/helix.nix index fe0cf74..a21641a 100644 --- a/aspects/cli/helix.nix +++ b/aspects/cli/helix.nix @@ -1,57 +1,67 @@ { ... }: { - flake.modules.homeManager.cli-helix = - { - config, - lib, - pkgs, - ... - }: - { - home.sessionVariables = { - EDITOR = "hx"; + flake.modules = { + nixos.helix = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + helix + ]; }; - programs.helix = { - enable = true; - settings = { - editor = { - file-picker.hidden = false; - idle-timeout = 0; - line-number = "relative"; - cursor-shape = { - normal = "underline"; - insert = "bar"; - select = "underline"; - }; - soft-wrap.enable = true; - auto-format = true; - indent-guides.render = true; - }; - keys.normal = { - space = { - o = "file_picker_in_current_buffer_directory"; - esc = [ - "collapse_selection" - "keep_primary_selection" - ]; - }; - }; + homeManager.helix = + { + config, + lib, + pkgs, + ... + }: + { + home.sessionVariables = { + EDITOR = "hx"; }; - languages = { - language = [ - { - name = "nix"; + + programs.helix = { + enable = true; + settings = { + editor = { + file-picker.hidden = false; + idle-timeout = 0; + line-number = "relative"; + cursor-shape = { + normal = "underline"; + insert = "bar"; + select = "underline"; + }; + soft-wrap.enable = true; auto-format = true; - formatter.command = "nixfmt"; - } - { - name = "typst"; - auto-format = true; - formatter.command = "typstyle -c 1000 -i"; - } - ]; + indent-guides.render = true; + }; + keys.normal = { + space = { + o = "file_picker_in_current_buffer_directory"; + esc = [ + "collapse_selection" + "keep_primary_selection" + ]; + }; + }; + }; + languages = { + language = [ + { + name = "nix"; + auto-format = true; + formatter.command = "nixfmt"; + } + { + name = "typst"; + auto-format = true; + formatter.command = "typstyle -c 1000 -i"; + } + ]; + }; }; }; - }; + }; } diff --git a/aspects/cli/hm-cli.nix b/aspects/cli/hm-cli.nix index 7064a3f..97d79e4 100644 --- a/aspects/cli/hm-cli.nix +++ b/aspects/cli/hm-cli.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.homeManager.cli-base = + flake.modules.homeManager.hm-cli = { config, lib, diff --git a/aspects/cli/starship.nix b/aspects/cli/starship.nix index 7ba3a54..3ac5e4f 100644 --- a/aspects/cli/starship.nix +++ b/aspects/cli/starship.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.homeManager.cli-starship = + flake.modules.homeManager.starship = { config, lib, diff --git a/aspects/cli/tmux.nix b/aspects/cli/tmux.nix index 1238501..4937574 100644 --- a/aspects/cli/tmux.nix +++ b/aspects/cli/tmux.nix @@ -1,19 +1,29 @@ { ... }: { - flake.modules.homeManager.cli-tmux = - { - config, - lib, - pkgs, - ... - }: - { - programs.tmux = { - enable = true; - clock24 = true; - terminal = "xterm-256color"; - mouse = true; - keyMode = "vi"; + flake.modules = { + nixos.tmux = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ + tmux + ]; }; - }; + + homeManager.tmux = + { + config, + lib, + pkgs, + ... + }: + { + programs.tmux = { + enable = true; + clock24 = true; + terminal = "xterm-256color"; + mouse = true; + keyMode = "vi"; + }; + }; + }; } diff --git a/aspects/common/programs.nix b/aspects/common/programs.nix index b53b293..ccdf185 100644 --- a/aspects/common/programs.nix +++ b/aspects/common/programs.nix @@ -8,13 +8,10 @@ ### Dev Tools ### git ### System Utilities ### - btop fastfetch - helix nixos-firewall-tool nvd sysz - tmux wget yazi ]; diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index 7da2c39..dedbed9 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ inputs, lib, ... }: { flake.nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem { @@ -13,39 +13,34 @@ inputs.self.overlays.default ]; } + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_alexandria) + ] + ++ (with inputs.self.modules.nixos; [ + cli # Common aspects (always included) - inputs.self.modules.nixos.common-boot - inputs.self.modules.nixos.common-console - inputs.self.modules.nixos.common-firewall - inputs.self.modules.nixos.common-locale - inputs.self.modules.nixos.common-nix - inputs.self.modules.nixos.common-openssh - inputs.self.modules.nixos.common-programs - inputs.self.modules.nixos.common-security - inputs.self.modules.nixos.common-services - inputs.self.modules.nixos.common-tailscale + common-boot + common-console + common-firewall + common-locale + common-nix + common-openssh + common-programs + common-security + common-services + common-tailscale # User aspects - inputs.self.modules.nixos.user - inputs.self.modules.nixos.root + user + root # Server aspects - inputs.self.modules.nixos.server-boot - inputs.self.modules.nixos.server-nix - inputs.self.modules.nixos.server-tailscale + server-boot + server-nix + server-tailscale # Other aspects - inputs.self.modules.nixos.fwupd - inputs.self.modules.nixos.podman - - # Host-specific files (from _alexandria/) - ./_alexandria/hardware-configuration.nix - ./_alexandria/jellyfin.nix - ./_alexandria/nextcloud.nix - ./_alexandria/nginx.nix - ./_alexandria/unbound.nix - ./_alexandria/vaultwarden.nix - ]; + fwupd + ]); }; } diff --git a/aspects/hosts/io.nix b/aspects/hosts/io.nix index c6c3dbf..ee610fa 100644 --- a/aspects/hosts/io.nix +++ b/aspects/hosts/io.nix @@ -1,4 +1,5 @@ -{ inputs, self, ... }: +{ inputs, lib, ... }: + { flake.nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -12,48 +13,43 @@ inputs.self.overlays.default ]; } - - # Common aspects (always included) - inputs.self.modules.nixos.common-boot - inputs.self.modules.nixos.common-console - inputs.self.modules.nixos.common-firewall - inputs.self.modules.nixos.common-locale - inputs.self.modules.nixos.common-nix - inputs.self.modules.nixos.common-openssh - inputs.self.modules.nixos.common-programs - inputs.self.modules.nixos.common-security - inputs.self.modules.nixos.common-services - inputs.self.modules.nixos.common-tailscale - - # User aspects - inputs.self.modules.nixos.user - inputs.self.modules.nixos.root - - # Desktop aspects - inputs.self.modules.nixos.desktop-boot - inputs.self.modules.nixos.desktop-desktop - inputs.self.modules.nixos.desktop-nix - inputs.self.modules.nixos.desktop-services - - # Other aspects based on tags - inputs.self.modules.nixos.ai - inputs.self.modules.nixos.bluetooth - inputs.self.modules.nixos.dev - inputs.self.modules.nixos.libvirtd - inputs.self.modules.nixos.networkmanager - inputs.self.modules.nixos.podman - - # Factory-generated ephemeral module + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_io) (inputs.self.factory.ephemeral { rootDevice = "/dev/mapper/cryptroot"; }) + ] + ++ (with inputs.self.modules.nixos; [ + cli - # Host-specific files (from _io/) - ./_io/hardware-configuration.nix - ./_io/disko.nix - ./_io/boot.nix - ./_io/programs.nix - ./_io/services.nix - ]; + # Common aspects (always included) + common-boot + common-console + common-firewall + common-locale + common-nix + common-openssh + common-programs + common-security + common-services + common-tailscale + + # User aspects + user + root + + # Desktop aspects + desktop-boot + desktop-desktop + desktop-nix + desktop-services + + # Other aspects + ai + bluetooth + dev + libvirtd + networkmanager + podman + ]); }; } diff --git a/aspects/hosts/rotterdam.nix b/aspects/hosts/rotterdam.nix index 76ffbb0..4a91769 100644 --- a/aspects/hosts/rotterdam.nix +++ b/aspects/hosts/rotterdam.nix @@ -1,4 +1,5 @@ -{ inputs, ... }: +{ inputs, lib, ... }: + { flake.nixosConfigurations.rotterdam = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -12,53 +13,48 @@ inputs.self.overlays.default ]; } - - # Common aspects (always included) - inputs.self.modules.nixos.common-boot - inputs.self.modules.nixos.common-console - inputs.self.modules.nixos.common-firewall - inputs.self.modules.nixos.common-locale - inputs.self.modules.nixos.common-nix - inputs.self.modules.nixos.common-openssh - inputs.self.modules.nixos.common-programs - inputs.self.modules.nixos.common-security - inputs.self.modules.nixos.common-services - inputs.self.modules.nixos.common-tailscale - - # User aspects - inputs.self.modules.nixos.user - inputs.self.modules.nixos.root - - # Desktop aspects - inputs.self.modules.nixos.desktop-boot - inputs.self.modules.nixos.desktop-desktop - inputs.self.modules.nixos.desktop-nix - inputs.self.modules.nixos.desktop-services - - # Other aspects based on tags - inputs.self.modules.nixos.ai - inputs.self.modules.nixos.bluetooth - inputs.self.modules.nixos.dev - inputs.self.modules.nixos.fwupd - inputs.self.modules.nixos.gaming-steam - inputs.self.modules.nixos.gaming-hardware - inputs.self.modules.nixos.gaming-flatpak - inputs.self.modules.nixos.gaming-launchers - inputs.self.modules.nixos.libvirtd - inputs.self.modules.nixos.networkmanager - inputs.self.modules.nixos.podman - - # Factory-generated ephemeral module + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_rotterdam) (inputs.self.factory.ephemeral { rootDevice = "/dev/mapper/cryptroot"; }) + ] + ++ (with inputs.self.modules.nixos; [ + cli - # Host-specific files (from _rotterdam/) - ./_rotterdam/hardware-configuration.nix - ./_rotterdam/boot.nix - ./_rotterdam/hardware.nix - ./_rotterdam/programs.nix - ./_rotterdam/services.nix - ]; + # Common aspects (always included) + common-boot + common-console + common-firewall + common-locale + common-nix + common-openssh + common-programs + common-security + common-services + common-tailscale + + # User aspects + user + root + + # Desktop aspects + desktop-boot + desktop-desktop + desktop-nix + desktop-services + + # Other aspects based on tags + ai + bluetooth + dev + fwupd + gaming-steam + gaming-hardware + gaming-flatpak + gaming-launchers + libvirtd + networkmanager + podman + ]); }; } diff --git a/aspects/hosts/trantor.nix b/aspects/hosts/trantor.nix index 3de68a9..4b8b4b2 100644 --- a/aspects/hosts/trantor.nix +++ b/aspects/hosts/trantor.nix @@ -1,4 +1,4 @@ -{ inputs, self, ... }: +{ inputs, lib, ... }: { flake.nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem { system = "aarch64-linux"; @@ -13,42 +13,36 @@ ]; } - # Common aspects (always included) - inputs.self.modules.nixos.common-boot - inputs.self.modules.nixos.common-console - inputs.self.modules.nixos.common-firewall - inputs.self.modules.nixos.common-locale - inputs.self.modules.nixos.common-nix - inputs.self.modules.nixos.common-openssh - inputs.self.modules.nixos.common-programs - inputs.self.modules.nixos.common-security - inputs.self.modules.nixos.common-services - inputs.self.modules.nixos.common-tailscale - - # User aspects - inputs.self.modules.nixos.user - inputs.self.modules.nixos.root - - # Server aspects - inputs.self.modules.nixos.server-boot - inputs.self.modules.nixos.server-nix - inputs.self.modules.nixos.server-tailscale - # Factory-generated ephemeral module (inputs.self.factory.ephemeral { rootDevice = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2"; }) - # Host-specific files (from _trantor/) - ./_trantor/hardware-configuration.nix - ./_trantor/disko.nix - ./_trantor/boot.nix - ./_trantor/fail2ban.nix - ./_trantor/forgejo.nix - ./_trantor/networking.nix - ./_trantor/nginx.nix - ./_trantor/openssh.nix - ./_trantor/unbound.nix - ]; + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_trantor) + ] + ++ (with inputs.self.modules.nixos; [ + cli + + # Common aspects (always included) + common-boot + common-console + common-firewall + common-locale + common-nix + common-openssh + common-programs + common-security + common-services + common-tailscale + + # User aspects + user + root + + # Server aspects + server-boot + server-nix + server-tailscale + ]); }; } From 5d1b54c8bfc6bb2a0a82de70b20c5c2c64476f49 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 14:20:57 -0300 Subject: [PATCH 09/39] common aspects reworked into base aspect --- .../{common/programs.nix => base/base.nix} | 34 ++++++++++++------- aspects/{common => base}/boot.nix | 2 +- aspects/{common => base}/console.nix | 2 +- aspects/{common => base}/firewall.nix | 2 +- aspects/{common => base}/locale.nix | 2 +- aspects/{common => base}/nix.nix | 2 +- aspects/{common => base}/security.nix | 2 +- aspects/base/ssh.nix | 32 +++++++++++++++++ aspects/common/openssh.nix | 14 -------- aspects/common/services.nix | 12 ------- aspects/common/tailscale.nix | 11 ------ aspects/hosts/alexandria.nix | 16 ++------- aspects/hosts/io.nix | 16 ++------- aspects/hosts/rotterdam.nix | 16 ++------- aspects/hosts/trantor.nix | 21 +++--------- 15 files changed, 72 insertions(+), 112 deletions(-) rename aspects/{common/programs.nix => base/base.nix} (56%) rename aspects/{common => base}/boot.nix (92%) rename aspects/{common => base}/console.nix (75%) rename aspects/{common => base}/firewall.nix (76%) rename aspects/{common => base}/locale.nix (93%) rename aspects/{common => base}/nix.nix (96%) rename aspects/{common => base}/security.nix (81%) create mode 100644 aspects/base/ssh.nix delete mode 100644 aspects/common/openssh.nix delete mode 100644 aspects/common/services.nix delete mode 100644 aspects/common/tailscale.nix diff --git a/aspects/common/programs.nix b/aspects/base/base.nix similarity index 56% rename from aspects/common/programs.nix rename to aspects/base/base.nix index ccdf185..08841b2 100644 --- a/aspects/common/programs.nix +++ b/aspects/base/base.nix @@ -1,16 +1,22 @@ -{ ... }: +{ inputs, ... }: { - flake.modules.nixos.common-programs = + flake.modules.nixos.base = { lib, pkgs, ... }: { + imports = with inputs.self.modules.nixos; [ + boot + console + firewall + locale + nix + security + ssh + ]; environment = { systemPackages = with pkgs; [ - ### Dev Tools ### git - ### System Utilities ### fastfetch nixos-firewall-tool - nvd sysz wget yazi @@ -26,14 +32,16 @@ command-not-found.enable = false; fish = { enable = true; - interactiveShellInit = '' - set fish_greeting - if set -q SSH_CONNECTION; and not set -q IN_NIX_SHELL; or not set -q TMUX - export TERM=xterm-256color - clear - fastfetch - end - ''; + }; + }; + + services = { + dbus.implementation = "broker"; + irqbalance.enable = true; + fstrim.enable = true; + tailscale = { + enable = true; + extraUpFlags = [ "--operator=user" ]; }; }; }; diff --git a/aspects/common/boot.nix b/aspects/base/boot.nix similarity index 92% rename from aspects/common/boot.nix rename to aspects/base/boot.nix index b74b68c..ec8593d 100644 --- a/aspects/common/boot.nix +++ b/aspects/base/boot.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.nixos.common-boot = + flake.modules.nixos.boot = { pkgs, ... }: { boot = { diff --git a/aspects/common/console.nix b/aspects/base/console.nix similarity index 75% rename from aspects/common/console.nix rename to aspects/base/console.nix index 128b914..6bb7be4 100644 --- a/aspects/common/console.nix +++ b/aspects/base/console.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.nixos.common-console = + flake.modules.nixos.console = { ... }: { console = { diff --git a/aspects/common/firewall.nix b/aspects/base/firewall.nix similarity index 76% rename from aspects/common/firewall.nix rename to aspects/base/firewall.nix index 0e5297d..68ffa6e 100644 --- a/aspects/common/firewall.nix +++ b/aspects/base/firewall.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.nixos.common-firewall = + flake.modules.nixos.firewall = { ... }: { networking = { diff --git a/aspects/common/locale.nix b/aspects/base/locale.nix similarity index 93% rename from aspects/common/locale.nix rename to aspects/base/locale.nix index a6b5754..4d0c716 100644 --- a/aspects/common/locale.nix +++ b/aspects/base/locale.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.nixos.common-locale = + flake.modules.nixos.locale = { ... }: { time.timeZone = "America/Bahia"; diff --git a/aspects/common/nix.nix b/aspects/base/nix.nix similarity index 96% rename from aspects/common/nix.nix rename to aspects/base/nix.nix index 7fa6e49..16397a9 100644 --- a/aspects/common/nix.nix +++ b/aspects/base/nix.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.nixos.common-nix = + flake.modules.nixos.nix = { inputs, ... }: { imports = [ inputs.nixos-cli.nixosModules.nixos-cli ]; diff --git a/aspects/common/security.nix b/aspects/base/security.nix similarity index 81% rename from aspects/common/security.nix rename to aspects/base/security.nix index 2ad04a0..310e345 100644 --- a/aspects/common/security.nix +++ b/aspects/base/security.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.nixos.common-security = + flake.modules.nixos.security = { ... }: { security.sudo = { diff --git a/aspects/base/ssh.nix b/aspects/base/ssh.nix new file mode 100644 index 0000000..03fa556 --- /dev/null +++ b/aspects/base/ssh.nix @@ -0,0 +1,32 @@ +{ ... }: + +{ + flake.modules.nixos.ssh = + { ... }: + { + services.openssh = { + enable = true; + settings.PermitRootLogin = "no"; + extraConfig = '' + PrintLastLog no + ''; + }; + programs = { + bash.interactiveShellInit = '' + if { [ -n "$SSH_CONNECTION" ] && [ -z "$IN_NIX_SHELL" ]; } || [ -z "$TMUX" ]; then + export TERM=xterm-256color + clear + fastfetch + fi + ''; + fish.interactiveShellInit = '' + set fish_greeting + if set -q SSH_CONNECTION; and not set -q IN_NIX_SHELL; or not set -q TMUX + export TERM=xterm-256color + clear + fastfetch + end + ''; + }; + }; +} diff --git a/aspects/common/openssh.nix b/aspects/common/openssh.nix deleted file mode 100644 index b8179f2..0000000 --- a/aspects/common/openssh.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: -{ - flake.modules.nixos.common-openssh = - { ... }: - { - services.openssh = { - enable = true; - settings.PermitRootLogin = "no"; - extraConfig = '' - PrintLastLog no - ''; - }; - }; -} diff --git a/aspects/common/services.nix b/aspects/common/services.nix deleted file mode 100644 index e05dcf0..0000000 --- a/aspects/common/services.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ ... }: -{ - flake.modules.nixos.common-services = - { ... }: - { - services = { - dbus.implementation = "broker"; - irqbalance.enable = true; - fstrim.enable = true; - }; - }; -} diff --git a/aspects/common/tailscale.nix b/aspects/common/tailscale.nix deleted file mode 100644 index 74381ac..0000000 --- a/aspects/common/tailscale.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: -{ - flake.modules.nixos.common-tailscale = - { ... }: - { - services.tailscale = { - enable = true; - extraUpFlags = [ "--operator=user" ]; - }; - }; -} diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index dedbed9..d05639d 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -16,21 +16,11 @@ ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_alexandria) ] ++ (with inputs.self.modules.nixos; [ + # system aspects + base cli - # Common aspects (always included) - common-boot - common-console - common-firewall - common-locale - common-nix - common-openssh - common-programs - common-security - common-services - common-tailscale - - # User aspects + # user aspects user root diff --git a/aspects/hosts/io.nix b/aspects/hosts/io.nix index ee610fa..6163244 100644 --- a/aspects/hosts/io.nix +++ b/aspects/hosts/io.nix @@ -19,21 +19,11 @@ }) ] ++ (with inputs.self.modules.nixos; [ + # system aspects + base cli - # Common aspects (always included) - common-boot - common-console - common-firewall - common-locale - common-nix - common-openssh - common-programs - common-security - common-services - common-tailscale - - # User aspects + # user aspects user root diff --git a/aspects/hosts/rotterdam.nix b/aspects/hosts/rotterdam.nix index 4a91769..77ffe54 100644 --- a/aspects/hosts/rotterdam.nix +++ b/aspects/hosts/rotterdam.nix @@ -19,21 +19,11 @@ }) ] ++ (with inputs.self.modules.nixos; [ + # system aspects + base cli - # Common aspects (always included) - common-boot - common-console - common-firewall - common-locale - common-nix - common-openssh - common-programs - common-security - common-services - common-tailscale - - # User aspects + # user aspects user root diff --git a/aspects/hosts/trantor.nix b/aspects/hosts/trantor.nix index 4b8b4b2..e7934ab 100644 --- a/aspects/hosts/trantor.nix +++ b/aspects/hosts/trantor.nix @@ -12,30 +12,17 @@ inputs.self.overlays.default ]; } - - # Factory-generated ephemeral module + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_trantor) (inputs.self.factory.ephemeral { rootDevice = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2"; }) - - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_trantor) ] ++ (with inputs.self.modules.nixos; [ + # system aspects + base cli - # Common aspects (always included) - common-boot - common-console - common-firewall - common-locale - common-nix - common-openssh - common-programs - common-security - common-services - common-tailscale - - # User aspects + # user aspects user root From 4e78805bdaad9f031287ec07fd525aa0ab79eb17 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 14:58:37 -0300 Subject: [PATCH 10/39] rework desktop and programs aspects --- aspects/cli/cli.nix | 7 +- aspects/desktop/boot.nix | 34 --- aspects/desktop/desktop.nix | 212 +++++----------- aspects/desktop/niri.nix | 445 +++++++++++++++++---------------- aspects/desktop/nix.nix | 21 -- aspects/desktop/services.nix | 23 -- aspects/hosts/io.nix | 8 +- aspects/hosts/rotterdam.nix | 12 +- aspects/programs/graphics.nix | 2 +- aspects/programs/media.nix | 2 +- aspects/programs/office.nix | 2 +- aspects/programs/utilities.nix | 62 ----- aspects/programs/web.nix | 2 +- aspects/users/_user/git.nix | 2 +- 14 files changed, 307 insertions(+), 527 deletions(-) delete mode 100644 aspects/desktop/boot.nix delete mode 100644 aspects/desktop/nix.nix delete mode 100644 aspects/desktop/services.nix delete mode 100644 aspects/programs/utilities.nix diff --git a/aspects/cli/cli.nix b/aspects/cli/cli.nix index 8a11616..1d379e8 100644 --- a/aspects/cli/cli.nix +++ b/aspects/cli/cli.nix @@ -3,13 +3,18 @@ { flake.modules = { nixos.cli = - { ... }: + { pkgs, ... }: { imports = with inputs.self.modules.nixos; [ btop helix tmux ]; + + environment.systemPackages = with pkgs; [ + p7zip + rclone + ]; }; homeManager.cli = { ... }: diff --git a/aspects/desktop/boot.nix b/aspects/desktop/boot.nix deleted file mode 100644 index cd0fa9c..0000000 --- a/aspects/desktop/boot.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ ... }: -{ - flake.modules.nixos.desktop-boot = - { - config, - lib, - pkgs, - ... - }: - { - boot = { - plymouth.enable = true; - initrd.systemd.enable = true; - loader.efi.efiSysMountPoint = "/boot/efi"; - kernelPackages = pkgs.linuxPackages_xanmod_latest; - extraModprobeConfig = '' - options bluetooth disable_ertm=1 - ''; - kernel.sysctl = { - "net.ipv4.tcp_mtu_probing" = 1; - }; - kernelParams = [ - "quiet" - "splash" - "i2c-dev" - "i2c-piix4" - "loglevel=3" - "udev.log_priority=3" - "rd.udev.log_level=3" - "rd.systemd.show_status=false" - ]; - }; - }; -} diff --git a/aspects/desktop/desktop.nix b/aspects/desktop/desktop.nix index fb54f55..39fd0e0 100644 --- a/aspects/desktop/desktop.nix +++ b/aspects/desktop/desktop.nix @@ -4,7 +4,7 @@ }: { flake.modules = { - nixos.desktop-desktop = + nixos.desktop = { config, lib, @@ -13,37 +13,53 @@ }: { imports = [ - inputs.niri-flake.nixosModules.niri inputs.nix-flatpak.nixosModules.nix-flatpak - ]; + ] + ++ (with inputs.self.modules.nixos; [ + graphics + media + office + web + ]); + + boot = { + plymouth.enable = true; + initrd.systemd.enable = true; + loader.efi.efiSysMountPoint = "/boot/efi"; + kernelPackages = pkgs.linuxPackages_xanmod_latest; + extraModprobeConfig = '' + options bluetooth disable_ertm=1 + ''; + kernel.sysctl = { + "net.ipv4.tcp_mtu_probing" = 1; + }; + kernelParams = [ + "quiet" + "splash" + "i2c-dev" + "i2c-piix4" + "loglevel=3" + "udev.log_priority=3" + "rd.udev.log_level=3" + "rd.systemd.show_status=false" + ]; + }; + + nix = { + registry.nixpkgs.flake = inputs.nixpkgs; + nixPath = [ + "nixpkgs=${inputs.nixpkgs}" + "/nix/var/nix/profiles/per-user/root/channels" + ]; + }; environment = { + etc."channels/nixpkgs".source = inputs.nixpkgs.outPath; sessionVariables = { KDEHOME = "$XDG_CONFIG_HOME/kde4"; # Stops kde from placing a .kde4 folder in the home dir NIXOS_OZONE_WL = "1"; # Forces chromium and most electron apps to run in wayland }; systemPackages = with pkgs; [ - ### Web ### - bitwarden-desktop - fragments - nextcloud-client - tor-browser - vesktop - inputs.zen-browser.packages."${system}".default - ### Office & Productivity ### - aspell - aspellDicts.de - aspellDicts.en - aspellDicts.en-computers - aspellDicts.pt_BR - papers - presenterm - rnote - ### Graphics & Design ### - gimp - inkscape - plasticity - ### System Utilities ### adwaita-icon-theme ghostty gnome-disk-utility @@ -51,19 +67,21 @@ libfido2 mission-center nautilus - p7zip - rclone toggleaudiosink unrar - ### Media ### - decibels - loupe - obs-studio - showtime ]; }; services = { + printing.enable = true; + udev.packages = with pkgs; [ yubikey-personalization ]; + keyd = { + enable = true; + keyboards.all = { + ids = [ "*" ]; + settings.main.capslock = "overload(meta, esc)"; + }; + }; pipewire = { enable = true; alsa.enable = true; @@ -74,35 +92,11 @@ }; greetd = { enable = true; - settings = { - default_session = { - command = "${lib.getExe pkgs.tuigreet} --user-menu --time --remember --asterisks --cmd ${config.programs.niri.package}/bin/niri-session"; - user = "greeter"; - }; - } - // lib.optionalAttrs (config.networking.hostName == "io") { - initial_session = { - command = "${config.programs.niri.package}/bin/niri-session"; - user = "user"; - }; - }; + settings.default_session.user = "greeter"; }; flatpak = { enable = true; packages = [ - ### Office & Productivity ### - "com.collabora.Office" - ### Graphics & Design ### - "com.boxy_svg.BoxySVG" - rec { - appId = "io.github.softfever.OrcaSlicer"; - sha256 = "0hdx5sg6fknj1pfnfxvlfwb5h6y1vjr6fyajbsnjph5gkp97c6p1"; - bundle = "${pkgs.fetchurl { - url = "https://github.com/SoftFever/OrcaSlicer/releases/download/v2.3.0/OrcaSlicer-Linux-flatpak_V2.3.0_x86_64.flatpak"; - inherit sha256; - }}"; - } - ### System Utilities ### "com.github.tchx84.Flatseal" "com.rustdesk.RustDesk" ]; @@ -123,10 +117,6 @@ }; programs = { - niri = { - enable = true; - package = inputs.niri.packages.${pkgs.system}.niri; - }; kdeconnect = { enable = true; package = pkgs.valent; @@ -138,8 +128,6 @@ }; }; - niri-flake.cache.enable = false; - fonts = { fontDir.enable = true; packages = with pkgs; [ @@ -157,17 +145,11 @@ xdg-desktop-portal-gnome xdg-desktop-portal-gtk ]; - config = { - common.default = "*"; - niri.default = [ - "gtk" - "gnome" - ]; - }; + config.common.default = "*"; }; }; - homeManager.desktop-desktop = + homeManager.desktop = { config, lib, @@ -180,7 +162,10 @@ fonts.fontconfig.enable = true; - home.packages = with pkgs; [ xwayland-satellite ]; + home = { + packages = with pkgs; [ xwayland-satellite ]; + sessionVariables.TERMINAL = "ghostty"; + }; services.vicinae = { enable = true; @@ -216,91 +201,6 @@ xdg = { enable = true; userDirs.enable = true; - mimeApps = { - enable = true; - defaultApplications = { - "text/html" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "x-scheme-handler/http" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "x-scheme-handler/https" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "x-scheme-handler/about" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "x-scheme-handler/unknown" = [ - "re.sonny.Junction.desktop" - "zen-browser.desktop" - "torbrowser.desktop" - ]; - "image/jpeg" = "org.gnome.Loupe.desktop"; - "image/png" = "org.gnome.Loupe.desktop"; - "image/gif" = "org.gnome.Loupe.desktop"; - "image/webp" = "org.gnome.Loupe.desktop"; - "image/bmp" = "org.gnome.Loupe.desktop"; - "image/svg+xml" = "org.gnome.Loupe.desktop"; - "image/tiff" = "org.gnome.Loupe.desktop"; - "video/mp4" = "io.bassi.Showtime.desktop"; - "video/x-matroska" = "io.bassi.Showtime.desktop"; - "video/webm" = "io.bassi.Showtime.desktop"; - "video/mpeg" = "io.bassi.Showtime.desktop"; - "video/x-msvideo" = "io.bassi.Showtime.desktop"; - "video/quicktime" = "io.bassi.Showtime.desktop"; - "video/x-flv" = "io.bassi.Showtime.desktop"; - "audio/mpeg" = "io.bassi.Showtime.desktop"; - "audio/flac" = "io.bassi.Showtime.desktop"; - "audio/ogg" = "io.bassi.Showtime.desktop"; - "audio/wav" = "io.bassi.Showtime.desktop"; - "audio/mp4" = "io.bassi.Showtime.desktop"; - "audio/x-opus+ogg" = "io.bassi.Showtime.desktop"; - "application/pdf" = [ - "org.gnome.Papers.desktop" - "zen-browser.desktop" - ]; - "text/plain" = "Helix.desktop"; - "text/markdown" = "Helix.desktop"; - "text/x-log" = "Helix.desktop"; - "application/x-shellscript" = "Helix.desktop"; - "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = - "com.collabora.Office.desktop"; # DOCX - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" = - "com.collabora.Office.desktop"; # XLSX - "application/vnd.openxmlformats-officedocument.presentationml.presentation" = - "com.collabora.Office.desktop"; # PPTX - "application/vnd.oasis.opendocument.text" = "com.collabora.Office.desktop"; # ODT - "application/vnd.oasis.opendocument.spreadsheet" = "com.collabora.Office.desktop"; # ODS - "application/vnd.oasis.opendocument.presentation" = "com.collabora.Office.desktop"; # ODP - "application/msword" = "com.collabora.Office.desktop"; # DOC - "application/vnd.ms-excel" = "com.collabora.Office.desktop"; # XLS - "application/vnd.ms-powerpoint" = "com.collabora.Office.desktop"; # PPT - "application/zip" = "org.gnome.FileRoller.desktop"; - "application/x-tar" = "org.gnome.FileRoller.desktop"; - "application/x-compressed-tar" = "org.gnome.FileRoller.desktop"; - "application/x-bzip-compressed-tar" = "org.gnome.FileRoller.desktop"; - "application/x-xz-compressed-tar" = "org.gnome.FileRoller.desktop"; - "application/x-7z-compressed" = "org.gnome.FileRoller.desktop"; - "application/x-rar" = "org.gnome.FileRoller.desktop"; - "application/gzip" = "org.gnome.FileRoller.desktop"; - "application/x-bzip" = "org.gnome.FileRoller.desktop"; - "inode/directory" = "org.gnome.Nautilus.desktop"; - }; - }; - }; - - # Set Ghostty as default terminal - home.sessionVariables = { - TERMINAL = "ghostty"; }; }; }; diff --git a/aspects/desktop/niri.nix b/aspects/desktop/niri.nix index cdd02ac..adb3f80 100644 --- a/aspects/desktop/niri.nix +++ b/aspects/desktop/niri.nix @@ -1,228 +1,251 @@ -{ ... }: +{ inputs, ... }: { - flake.modules.homeManager.desktop-niri = - { - config, - lib, - pkgs, - inputs, - hostname ? null, - ... - }: - let - isRotterdam = hostname == "rotterdam"; - in - { - imports = [ inputs.noctalia.homeModules.default ]; + flake.modules = { + nixos.niri = + { + config, + lib, + pkgs, + ... + }: + { + imports = [ inputs.niri-flake.nixosModules.niri ]; - services.kanshi = { - enable = true; - settings = [ - { - profile.name = "default"; - profile.outputs = [ - { - criteria = "*"; - scale = 1.0; + services.greetd.settings = { + default_session.command = "${lib.getExe pkgs.tuigreet} --user-menu --time --remember --asterisks --cmd ${config.programs.niri.package}/bin/niri-session"; + }; + + programs.niri.enable = true; + + xdg.portal.config.niri.default = [ + "gtk" + "gnome" + ]; + }; + homeManager.niri = + { + config, + lib, + pkgs, + inputs, + hostname ? null, + ... + }: + let + isRotterdam = hostname == "rotterdam"; + in + { + imports = [ inputs.noctalia.homeModules.default ]; + + services.kanshi = { + enable = true; + settings = [ + { + profile.name = "default"; + profile.outputs = [ + { + criteria = "*"; + scale = 1.0; + } + ]; + } + ]; + }; + + home = { + packages = with pkgs; [ + xwayland-satellite + inputs.noctalia.packages.${pkgs.system}.default + ]; + sessionVariables.QT_QPA_PLATFORMTHEME = "gtk3"; + }; + + xdg.configFile."niri/config.kdl".text = '' + input { + keyboard { + xkb { + layout "us" + variant "altgr-intl" } - ]; + } + touchpad { + tap + dwt + drag true + drag-lock + natural-scroll + accel-speed 0.2 + accel-profile "flat" + scroll-method "two-finger" + middle-emulation + } + mouse { + natural-scroll + accel-speed 0.2 + accel-profile "flat" + } + warp-mouse-to-focus mode="center-xy" + focus-follows-mouse } - ]; - }; - home = { - packages = with pkgs; [ - xwayland-satellite - inputs.noctalia.packages.${pkgs.system}.default - ]; - sessionVariables.QT_QPA_PLATFORMTHEME = "gtk3"; - }; - - xdg.configFile."niri/config.kdl".text = '' - input { - keyboard { - xkb { - layout "us" - variant "altgr-intl" + layout { + gaps 8 + center-focused-column "never" + auto-center-when-space-available + preset-column-widths { + ${ + if isRotterdam then + '' + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + '' + else + '' + proportion 0.5 + proportion 1.0 + '' + } + } + default-column-width { proportion ${if isRotterdam then "0.33333" else "0.5"}; } + focus-ring { + off + } + border { + width 4 + active-color "#ffc87f" + inactive-color "#505050" + urgent-color "#9b0000" + } + tab-indicator { + width 4 + gap 4 + place-within-column } } - touchpad { - tap - dwt - drag true - drag-lock - natural-scroll - accel-speed 0.2 - accel-profile "flat" - scroll-method "two-finger" - middle-emulation + + overview { + zoom 0.65 } - mouse { - natural-scroll - accel-speed 0.2 - accel-profile "flat" + + spawn-at-startup "noctalia-shell" "-d" + layer-rule { + match namespace="^noctalia-overview*" + place-within-backdrop true } - warp-mouse-to-focus mode="center-xy" - focus-follows-mouse - } - layout { - gaps 8 - center-focused-column "never" - auto-center-when-space-available - preset-column-widths { - ${ - if isRotterdam then - '' - proportion 0.33333 - proportion 0.5 - proportion 0.66667 - '' - else - '' - proportion 0.5 - proportion 1.0 - '' - } + hotkey-overlay { + skip-at-startup } - default-column-width { proportion ${if isRotterdam then "0.33333" else "0.5"}; } - focus-ring { - off + + prefer-no-csd + screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" + + animations { + slowdown 0.3 } - border { - width 4 - active-color "#ffc87f" - inactive-color "#505050" - urgent-color "#9b0000" + + window-rule { + match app-id="zen" + default-column-width { proportion ${if isRotterdam then "0.5" else "1.0"}; } } - tab-indicator { - width 4 - gap 4 - place-within-column + + window-rule { + geometry-corner-radius 12 + clip-to-geometry true } - } - overview { - zoom 0.65 - } + config-notification { + disable-failed + } - spawn-at-startup "noctalia-shell" "-d" - layer-rule { - match namespace="^noctalia-overview*" - place-within-backdrop true - } - - hotkey-overlay { - skip-at-startup - } - - prefer-no-csd - screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" - - animations { - slowdown 0.3 - } - - window-rule { - match app-id="zen" - default-column-width { proportion ${if isRotterdam then "0.5" else "1.0"}; } - } - - window-rule { - geometry-corner-radius 12 - clip-to-geometry true - } - - config-notification { - disable-failed - } - - binds { - Alt+Space repeat=false { spawn "vicinae" "toggle"; } - XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "increase"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "decrease"; } - XF86AudioMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteOutput"; } - XF86MonBrightnessUp allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "brightness" "increase"; } - XF86MonBrightnessDown allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "brightness" "decrease"; } - XF86AudioPlay allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "play-pause"; } - XF86AudioStop allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "stop"; } - XF86AudioPrev allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "previous"; } - XF86AudioNext allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "next"; } - Mod+V repeat=false { spawn "vicinae" "vicinae://extensions/vicinae/clipboard/history"; } - Mod+Shift+L repeat=false { spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"; } - Mod+Return { spawn "ghostty"; } - Ctrl+Alt+Shift+A allow-when-locked=true { spawn "toggleaudiosink"; } - Mod+W repeat=false { toggle-overview; } - Mod+Q { close-window; } - Alt+Shift+Q { close-window;} - Mod+Shift+Q { close-window; } - Alt+F4 { close-window; } - Mod+Left { focus-column-left; } - Mod+Down { focus-window-or-workspace-down; } - Mod+Up { focus-window-or-workspace-up; } - Mod+Right { focus-column-right; } - Mod+H { focus-column-left; } - Mod+L { focus-column-right; } - Mod+J { focus-window-or-workspace-down; } - Mod+K { focus-window-or-workspace-up; } - Mod+Ctrl+Left { move-column-left; } - Mod+Ctrl+Down { move-window-down-or-to-workspace-down; } - Mod+Ctrl+Up { move-window-up-or-to-workspace-up; } - Mod+Ctrl+Right { move-column-right; } - Mod+Ctrl+H { move-column-left; } - Mod+Ctrl+J { move-window-down-or-to-workspace-down; } - Mod+Ctrl+K { move-window-up-or-to-workspace-up; } - Mod+Ctrl+L { move-column-right; } - Mod+Home { focus-column-first; } - Mod+End { focus-column-last; } - Mod+Ctrl+Home { move-column-to-first; } - Mod+Ctrl+End { move-column-to-last; } - Mod+Alt+Left { focus-monitor-left; } - Mod+Alt+Down { focus-monitor-down; } - Mod+Alt+Up { focus-monitor-up; } - Mod+Alt+Right { focus-monitor-right; } - Mod+Alt+H { focus-monitor-left; } - Mod+Alt+J { focus-monitor-down; } - Mod+Alt+K { focus-monitor-up; } - Mod+Alt+L { focus-monitor-right; } - Mod+Alt+Ctrl+Left { move-column-to-monitor-left; } - Mod+Alt+Ctrl+Down { move-column-to-monitor-down; } - Mod+Alt+Ctrl+Up { move-column-to-monitor-up; } - Mod+Alt+Ctrl+Right { move-column-to-monitor-right; } - Mod+Alt+Ctrl+H { move-column-to-monitor-left; } - Mod+Alt+Ctrl+J { move-column-to-monitor-down; } - Mod+Alt+Ctrl+K { move-column-to-monitor-up; } - Mod+Alt+Ctrl+L { move-column-to-monitor-right; } - Mod+Ctrl+U { move-workspace-down; } - Mod+Ctrl+I { move-workspace-up; } - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } - Mod+Shift+WheelScrollDown { focus-column-right; } - Mod+Shift+WheelScrollUp { focus-column-left; } - Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } - Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } - Mod+BracketLeft { consume-or-expel-window-left; } - Mod+BracketRight { consume-or-expel-window-right; } - Mod+Comma { consume-window-into-column; } - Mod+Period { expel-window-from-column; } - Mod+R { switch-preset-column-width; } - Mod+F { maximize-column; } - Mod+Ctrl+F { fullscreen-window; } - Mod+C { center-visible-columns; } - Mod+Ctrl+C { center-column; } - Mod+Space { toggle-window-floating; } - Mod+Ctrl+Space { switch-focus-between-floating-and-tiling; } - Mod+T { toggle-column-tabbed-display; } - Print { screenshot-screen; } - Mod+Print { screenshot; } - Ctrl+Print { screenshot-window; } - Mod+Backspace allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - Mod+Alt+E { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; } - Ctrl+Alt+Delete { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; } - Mod+Ctrl+P { power-off-monitors; } - } - ''; - }; + binds { + Alt+Space repeat=false { spawn "vicinae" "toggle"; } + XF86AudioRaiseVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "increase"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "decrease"; } + XF86AudioMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteOutput"; } + XF86MonBrightnessUp allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "brightness" "increase"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "brightness" "decrease"; } + XF86AudioPlay allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "play-pause"; } + XF86AudioStop allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "stop"; } + XF86AudioPrev allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "previous"; } + XF86AudioNext allow-when-locked=true { spawn "${lib.getExe pkgs.playerctl}" "next"; } + Mod+V repeat=false { spawn "vicinae" "vicinae://extensions/vicinae/clipboard/history"; } + Mod+Shift+L repeat=false { spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"; } + Mod+Return { spawn "ghostty"; } + Ctrl+Alt+Shift+A allow-when-locked=true { spawn "toggleaudiosink"; } + Mod+W repeat=false { toggle-overview; } + Mod+Q { close-window; } + Alt+Shift+Q { close-window;} + Mod+Shift+Q { close-window; } + Alt+F4 { close-window; } + Mod+Left { focus-column-left; } + Mod+Down { focus-window-or-workspace-down; } + Mod+Up { focus-window-or-workspace-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+L { focus-column-right; } + Mod+J { focus-window-or-workspace-down; } + Mod+K { focus-window-or-workspace-up; } + Mod+Ctrl+Left { move-column-left; } + Mod+Ctrl+Down { move-window-down-or-to-workspace-down; } + Mod+Ctrl+Up { move-window-up-or-to-workspace-up; } + Mod+Ctrl+Right { move-column-right; } + Mod+Ctrl+H { move-column-left; } + Mod+Ctrl+J { move-window-down-or-to-workspace-down; } + Mod+Ctrl+K { move-window-up-or-to-workspace-up; } + Mod+Ctrl+L { move-column-right; } + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + Mod+Alt+Left { focus-monitor-left; } + Mod+Alt+Down { focus-monitor-down; } + Mod+Alt+Up { focus-monitor-up; } + Mod+Alt+Right { focus-monitor-right; } + Mod+Alt+H { focus-monitor-left; } + Mod+Alt+J { focus-monitor-down; } + Mod+Alt+K { focus-monitor-up; } + Mod+Alt+L { focus-monitor-right; } + Mod+Alt+Ctrl+Left { move-column-to-monitor-left; } + Mod+Alt+Ctrl+Down { move-column-to-monitor-down; } + Mod+Alt+Ctrl+Up { move-column-to-monitor-up; } + Mod+Alt+Ctrl+Right { move-column-to-monitor-right; } + Mod+Alt+Ctrl+H { move-column-to-monitor-left; } + Mod+Alt+Ctrl+J { move-column-to-monitor-down; } + Mod+Alt+Ctrl+K { move-column-to-monitor-up; } + Mod+Alt+Ctrl+L { move-column-to-monitor-right; } + Mod+Ctrl+U { move-workspace-down; } + Mod+Ctrl+I { move-workspace-up; } + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + Mod+Comma { consume-window-into-column; } + Mod+Period { expel-window-from-column; } + Mod+R { switch-preset-column-width; } + Mod+F { maximize-column; } + Mod+Ctrl+F { fullscreen-window; } + Mod+C { center-visible-columns; } + Mod+Ctrl+C { center-column; } + Mod+Space { toggle-window-floating; } + Mod+Ctrl+Space { switch-focus-between-floating-and-tiling; } + Mod+T { toggle-column-tabbed-display; } + Print { screenshot-screen; } + Mod+Print { screenshot; } + Ctrl+Print { screenshot-window; } + Mod+Backspace allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + Mod+Alt+E { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; } + Ctrl+Alt+Delete { spawn "noctalia-shell" "ipc" "call" "sessionMenu" "toggle"; } + Mod+Ctrl+P { power-off-monitors; } + } + ''; + }; + }; } diff --git a/aspects/desktop/nix.nix b/aspects/desktop/nix.nix deleted file mode 100644 index 3a9e71e..0000000 --- a/aspects/desktop/nix.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ inputs, ... }: -{ - flake.modules.nixos.desktop-nix = - { - config, - lib, - pkgs, - ... - }: - { - environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath; - - nix = { - registry.nixpkgs.flake = inputs.nixpkgs; - nixPath = [ - "nixpkgs=${inputs.nixpkgs}" - "/nix/var/nix/profiles/per-user/root/channels" - ]; - }; - }; -} diff --git a/aspects/desktop/services.nix b/aspects/desktop/services.nix deleted file mode 100644 index eb9482a..0000000 --- a/aspects/desktop/services.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ ... }: -{ - flake.modules.nixos.desktop-services = - { - config, - lib, - pkgs, - ... - }: - { - services = { - printing.enable = true; - udev.packages = with pkgs; [ yubikey-personalization ]; - keyd = { - enable = true; - keyboards.all = { - ids = [ "*" ]; - settings.main.capslock = "overload(meta, esc)"; - }; - }; - }; - }; -} diff --git a/aspects/hosts/io.nix b/aspects/hosts/io.nix index 6163244..6944555 100644 --- a/aspects/hosts/io.nix +++ b/aspects/hosts/io.nix @@ -22,23 +22,19 @@ # system aspects base cli + desktop # user aspects user root - # Desktop aspects - desktop-boot - desktop-desktop - desktop-nix - desktop-services - # Other aspects ai bluetooth dev libvirtd networkmanager + niri podman ]); }; diff --git a/aspects/hosts/rotterdam.nix b/aspects/hosts/rotterdam.nix index 77ffe54..ad4192e 100644 --- a/aspects/hosts/rotterdam.nix +++ b/aspects/hosts/rotterdam.nix @@ -22,28 +22,24 @@ # system aspects base cli + desktop # user aspects user root - # Desktop aspects - desktop-boot - desktop-desktop - desktop-nix - desktop-services - # Other aspects based on tags ai bluetooth dev fwupd - gaming-steam - gaming-hardware gaming-flatpak + gaming-hardware gaming-launchers + gaming-steam libvirtd networkmanager + niri podman ]); }; diff --git a/aspects/programs/graphics.nix b/aspects/programs/graphics.nix index 4b7a16b..7d1ed6d 100644 --- a/aspects/programs/graphics.nix +++ b/aspects/programs/graphics.nix @@ -1,7 +1,7 @@ { ... }: { - flake.modules.nixos.programs-graphics = + flake.modules.nixos.graphics = { pkgs, ... }: { environment.systemPackages = with pkgs; [ diff --git a/aspects/programs/media.nix b/aspects/programs/media.nix index 7daaa87..ed6a767 100644 --- a/aspects/programs/media.nix +++ b/aspects/programs/media.nix @@ -2,7 +2,7 @@ { flake.modules = { - nixos.programs-media = + nixos.media = { pkgs, ... }: { environment.systemPackages = with pkgs; [ diff --git a/aspects/programs/office.nix b/aspects/programs/office.nix index c3349f3..fe41d1d 100644 --- a/aspects/programs/office.nix +++ b/aspects/programs/office.nix @@ -1,7 +1,7 @@ { ... }: { - flake.modules.nixos.programs-office = + flake.modules.nixos.office = { pkgs, ... }: { environment.systemPackages = with pkgs; [ diff --git a/aspects/programs/utilities.nix b/aspects/programs/utilities.nix deleted file mode 100644 index 4a207af..0000000 --- a/aspects/programs/utilities.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ ... }: - -{ - flake.modules = { - nixos.programs-utilities = - { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - ghostty - gnome-disk-utility - mission-center - nautilus - p7zip - rclone - unrar - # Desktop Integration - adwaita-icon-theme - junction - libfido2 - toggleaudiosink - # Xwayland Support - xwayland-satellite - ]; - - services.flatpak.packages = [ - "com.github.tchx84.Flatseal" - "com.rustdesk.RustDesk" - ]; - }; - - homeManager.programs-utilities = - { pkgs, ... }: - { - programs = { - ghostty = { - enable = true; - settings = { - cursor-style = "block"; - shell-integration-features = "no-cursor"; - cursor-style-blink = false; - custom-shader = "${builtins.fetchurl { - url = "https://raw.githubusercontent.com/hackr-sh/ghostty-shaders/cb6eb4b0d1a3101c869c62e458b25a826f9dcde3/cursor_blaze.glsl"; - sha256 = "sha256:0g2lgqjdrn3c51glry7x2z30y7ml0y61arl5ykmf4yj0p85s5f41"; - }}"; - bell-features = ""; - gtk-titlebar-style = "tabs"; - keybind = [ "shift+enter=text:\\x1b\\r" ]; - }; - }; - - password-store = { - enable = true; - package = pkgs.pass-wayland; - }; - }; - - home.sessionVariables = { - TERMINAL = "ghostty"; - }; - }; - }; -} diff --git a/aspects/programs/web.nix b/aspects/programs/web.nix index a11ca57..f661218 100644 --- a/aspects/programs/web.nix +++ b/aspects/programs/web.nix @@ -1,7 +1,7 @@ { ... }: { - flake.modules.nixos.programs-web = + flake.modules.nixos.web = { inputs, pkgs, diff --git a/aspects/users/_user/git.nix b/aspects/users/_user/git.nix index 9c1fb20..40a5714 100644 --- a/aspects/users/_user/git.nix +++ b/aspects/users/_user/git.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs = { From 7815017528fca3e0addb848dbf64d8858f4ed0cb Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 16:36:06 -0300 Subject: [PATCH 11/39] rework system, programs, desktop, cli and base aspects --- aspects/{shell => base}/bash.nix | 2 +- aspects/base/fish.nix | 47 +++++++++++++++++++ aspects/{programs => desktop}/graphics.nix | 0 aspects/{programs => desktop}/media.nix | 0 aspects/{programs => desktop}/office.nix | 0 aspects/{programs => desktop}/web.nix | 0 aspects/server/boot.nix | 14 ------ aspects/server/tailscale.nix | 22 --------- aspects/shell/fish.nix | 40 ---------------- aspects/{base => systems}/base.nix | 8 +--- aspects/{cli => systems}/cli.nix | 0 aspects/{desktop => systems}/desktop.nix | 0 .../{server/nix.nix => systems/server.nix} | 18 ++++++- 13 files changed, 66 insertions(+), 85 deletions(-) rename aspects/{shell => base}/bash.nix (82%) create mode 100644 aspects/base/fish.nix rename aspects/{programs => desktop}/graphics.nix (100%) rename aspects/{programs => desktop}/media.nix (100%) rename aspects/{programs => desktop}/office.nix (100%) rename aspects/{programs => desktop}/web.nix (100%) delete mode 100644 aspects/server/boot.nix delete mode 100644 aspects/server/tailscale.nix delete mode 100644 aspects/shell/fish.nix rename aspects/{base => systems}/base.nix (87%) rename aspects/{cli => systems}/cli.nix (100%) rename aspects/{desktop => systems}/desktop.nix (100%) rename aspects/{server/nix.nix => systems/server.nix} (51%) diff --git a/aspects/shell/bash.nix b/aspects/base/bash.nix similarity index 82% rename from aspects/shell/bash.nix rename to aspects/base/bash.nix index e451148..6ba97ef 100644 --- a/aspects/shell/bash.nix +++ b/aspects/base/bash.nix @@ -1,6 +1,6 @@ { ... }: { - flake.modules.homeManager.shell-bash = + flake.modules.homeManager.bash = { config, lib, diff --git a/aspects/base/fish.nix b/aspects/base/fish.nix new file mode 100644 index 0000000..8ed326a --- /dev/null +++ b/aspects/base/fish.nix @@ -0,0 +1,47 @@ +{ ... }: +{ + flake.modules = { + nixos.fish = + { ... }: + { + programs.fish.enable = true; + }; + homeManager.fish = + { + config, + lib, + pkgs, + ... + }: + { + programs.fish = { + enable = true; + interactiveShellInit = '' + set fish_greeting + ${lib.getExe pkgs.nix-your-shell} fish | source + ''; + loginShellInit = "${lib.getExe pkgs.nix-your-shell} fish | source"; + plugins = [ + { + name = "bang-bang"; + src = pkgs.fetchFromGitHub { + owner = "oh-my-fish"; + repo = "plugin-bang-bang"; + rev = "f969c618301163273d0a03d002614d9a81952c1e"; + sha256 = "sha256-A8ydBX4LORk+nutjHurqNNWFmW6LIiBPQcxS3x4nbeQ="; + }; + } + { + name = "z"; + src = pkgs.fetchFromGitHub { + owner = "jethrokuan"; + repo = "z"; + rev = "067e867debee59aee231e789fc4631f80fa5788e"; + sha256 = "sha256-emmjTsqt8bdI5qpx1bAzhVACkg0MNB/uffaRjjeuFxU="; + }; + } + ]; + }; + }; + }; +} diff --git a/aspects/programs/graphics.nix b/aspects/desktop/graphics.nix similarity index 100% rename from aspects/programs/graphics.nix rename to aspects/desktop/graphics.nix diff --git a/aspects/programs/media.nix b/aspects/desktop/media.nix similarity index 100% rename from aspects/programs/media.nix rename to aspects/desktop/media.nix diff --git a/aspects/programs/office.nix b/aspects/desktop/office.nix similarity index 100% rename from aspects/programs/office.nix rename to aspects/desktop/office.nix diff --git a/aspects/programs/web.nix b/aspects/desktop/web.nix similarity index 100% rename from aspects/programs/web.nix rename to aspects/desktop/web.nix diff --git a/aspects/server/boot.nix b/aspects/server/boot.nix deleted file mode 100644 index 38634d1..0000000 --- a/aspects/server/boot.nix +++ /dev/null @@ -1,14 +0,0 @@ -# aspects/server/boot.nix -{ ... }: -{ - flake.modules.nixos.server-boot = - { - config, - lib, - pkgs, - ... - }: - { - boot.kernelPackages = pkgs.linuxPackages_hardened; - }; -} diff --git a/aspects/server/tailscale.nix b/aspects/server/tailscale.nix deleted file mode 100644 index cf2fa4b..0000000 --- a/aspects/server/tailscale.nix +++ /dev/null @@ -1,22 +0,0 @@ -# aspects/server/tailscale.nix -{ ... }: -{ - flake.modules.nixos.server-tailscale = - { - config, - lib, - pkgs, - ... - }: - { - services.tailscale = { - extraSetFlags = [ "--advertise-exit-node" ]; - useRoutingFeatures = "server"; - }; - - boot.kernel.sysctl = { - "net.ipv4.ip_forward" = 1; - "net.ipv6.conf.all.forwarding" = 1; - }; - }; -} diff --git a/aspects/shell/fish.nix b/aspects/shell/fish.nix deleted file mode 100644 index 22c0f5c..0000000 --- a/aspects/shell/fish.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ ... }: -{ - flake.modules.homeManager.shell-fish = - { - config, - lib, - pkgs, - ... - }: - { - programs.fish = { - enable = true; - interactiveShellInit = '' - set fish_greeting - ${lib.getExe pkgs.nix-your-shell} fish | source - ''; - loginShellInit = "${lib.getExe pkgs.nix-your-shell} fish | source"; - plugins = [ - { - name = "bang-bang"; - src = pkgs.fetchFromGitHub { - owner = "oh-my-fish"; - repo = "plugin-bang-bang"; - rev = "f969c618301163273d0a03d002614d9a81952c1e"; - sha256 = "sha256-A8ydBX4LORk+nutjHurqNNWFmW6LIiBPQcxS3x4nbeQ="; - }; - } - { - name = "z"; - src = pkgs.fetchFromGitHub { - owner = "jethrokuan"; - repo = "z"; - rev = "067e867debee59aee231e789fc4631f80fa5788e"; - sha256 = "sha256-emmjTsqt8bdI5qpx1bAzhVACkg0MNB/uffaRjjeuFxU="; - }; - } - ]; - }; - }; -} diff --git a/aspects/base/base.nix b/aspects/systems/base.nix similarity index 87% rename from aspects/base/base.nix rename to aspects/systems/base.nix index 08841b2..5fef6b9 100644 --- a/aspects/base/base.nix +++ b/aspects/systems/base.nix @@ -7,6 +7,7 @@ boot console firewall + fish locale nix security @@ -28,12 +29,7 @@ }; }; - programs = { - command-not-found.enable = false; - fish = { - enable = true; - }; - }; + programs.command-not-found.enable = false; services = { dbus.implementation = "broker"; diff --git a/aspects/cli/cli.nix b/aspects/systems/cli.nix similarity index 100% rename from aspects/cli/cli.nix rename to aspects/systems/cli.nix diff --git a/aspects/desktop/desktop.nix b/aspects/systems/desktop.nix similarity index 100% rename from aspects/desktop/desktop.nix rename to aspects/systems/desktop.nix diff --git a/aspects/server/nix.nix b/aspects/systems/server.nix similarity index 51% rename from aspects/server/nix.nix rename to aspects/systems/server.nix index 1cb8e8b..c3c24f0 100644 --- a/aspects/server/nix.nix +++ b/aspects/systems/server.nix @@ -1,7 +1,7 @@ -# aspects/server/nix.nix { inputs, ... }: + { - flake.modules.nixos.server-nix = + flake.modules.nixos.server = { config, lib, @@ -9,6 +9,14 @@ ... }: { + boot = { + kernelPackages = pkgs.linuxPackages_hardened; + kernel.sysctl = { + "net.ipv4.ip_forward" = 1; + "net.ipv6.conf.all.forwarding" = 1; + }; + }; + environment.etc."channels/nixpkgs".source = inputs.nixpkgs-stable.outPath; nix = { @@ -18,5 +26,11 @@ "/nix/var/nix/profiles/per-user/root/channels" ]; }; + + services.tailscale = { + extraSetFlags = [ "--advertise-exit-node" ]; + useRoutingFeatures = "server"; + }; + }; } From 755937cb56f26b90e4a551de9b20e26ec72f948d Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 16:45:33 -0300 Subject: [PATCH 12/39] rework user aspect --- aspects/users/user.nix | 82 ++++++++++++------------------------------ 1 file changed, 23 insertions(+), 59 deletions(-) diff --git a/aspects/users/user.nix b/aspects/users/user.nix index ad1b8ca..ca74e8d 100644 --- a/aspects/users/user.nix +++ b/aspects/users/user.nix @@ -1,4 +1,4 @@ -{ inputs, self, ... }: +{ inputs, lib, ... }: { flake = { @@ -30,37 +30,6 @@ }; modules = [ { nixpkgs.overlays = [ inputs.self.overlays.default ]; } - - # CLI aspects (common module included) - inputs.self.modules.homeManager.cli-base - inputs.self.modules.homeManager.cli-btop - inputs.self.modules.homeManager.cli-comma - inputs.self.modules.homeManager.cli-direnv - inputs.self.modules.homeManager.cli-helix - inputs.self.modules.homeManager.cli-starship - inputs.self.modules.homeManager.cli-tmux - - # Shell - inputs.self.modules.homeManager.shell-fish - inputs.self.modules.homeManager.shell-bash - - # Desktop - inputs.self.modules.homeManager.desktop-desktop - inputs.self.modules.homeManager.desktop-niri - - # Gaming - inputs.self.modules.homeManager.gaming-mangohud - - # Programs - inputs.self.modules.homeManager.programs-media # for obs-studio - - # Stylix - inputs.self.modules.homeManager.stylix - - # User-specific (from _user/) - ./_user/git.nix - - # Home configuration { home = { username = "user"; @@ -68,7 +37,17 @@ stateVersion = "22.05"; }; } - ]; + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) + ] + ++ (with inputs.self.modules.homeManager; [ + base # base aspect + cli # cli aspect + desktop # desktop aspect + + # other aspect + stylix + niri + ]); }; "user@io" = inputs.home-manager.lib.homeManagerConfiguration { @@ -79,31 +58,6 @@ }; modules = [ { nixpkgs.overlays = [ inputs.self.overlays.default ]; } - - # CLI aspects (common module included) - inputs.self.modules.homeManager.cli-base - inputs.self.modules.homeManager.cli-btop - inputs.self.modules.homeManager.cli-comma - inputs.self.modules.homeManager.cli-direnv - inputs.self.modules.homeManager.cli-helix - inputs.self.modules.homeManager.cli-starship - inputs.self.modules.homeManager.cli-tmux - - # Shell - inputs.self.modules.homeManager.shell-fish - inputs.self.modules.homeManager.shell-bash - - # Desktop - inputs.self.modules.homeManager.desktop-desktop - inputs.self.modules.homeManager.desktop-niri - - # Stylix - inputs.self.modules.homeManager.stylix - - # User-specific (from _user/) - ./_user/git.nix - - # Home configuration { home = { username = "user"; @@ -111,7 +65,17 @@ stateVersion = "22.05"; }; } - ]; + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) + ] + ++ (with inputs.self.modules.homeManager; [ + base # base aspect + cli # cli aspect + desktop # desktop aspect + + # other aspect + stylix + niri + ]); }; }; }; From 0ce2d3b9479f496ba014ad12d6b8c2e8043b1319 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 17:02:56 -0300 Subject: [PATCH 13/39] reworked other aspects --- aspects/ai.nix | 2 +- aspects/bluetooth.nix | 5 ++++- aspects/desktop/office.nix | 1 + aspects/dev.nix | 3 --- aspects/stylix.nix | 15 ++------------- 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/aspects/ai.nix b/aspects/ai.nix index f67bbbc..3431ddd 100644 --- a/aspects/ai.nix +++ b/aspects/ai.nix @@ -4,7 +4,7 @@ { inputs, pkgs, ... }: { environment.systemPackages = - (with pkgs; [ claude-desktop ]) + (with pkgs; [ ]) ++ (with inputs.nix-ai-tools.packages.${pkgs.system}; [ claude-code claudebox diff --git a/aspects/bluetooth.nix b/aspects/bluetooth.nix index 2027ac1..6c7b2d8 100644 --- a/aspects/bluetooth.nix +++ b/aspects/bluetooth.nix @@ -8,6 +8,9 @@ ... }: { - hardware.bluetooth.enable = true; + hardware.bluetooth = { + enable = true; + powerOnBoot = false; + }; }; } diff --git a/aspects/desktop/office.nix b/aspects/desktop/office.nix index fe41d1d..68d958a 100644 --- a/aspects/desktop/office.nix +++ b/aspects/desktop/office.nix @@ -10,6 +10,7 @@ aspellDicts.en aspellDicts.en-computers aspellDicts.pt_BR + glow papers presenterm rnote diff --git a/aspects/dev.nix b/aspects/dev.nix index 89a1026..afe9edc 100644 --- a/aspects/dev.nix +++ b/aspects/dev.nix @@ -10,14 +10,11 @@ { environment.systemPackages = with pkgs; [ android-tools - bat lazygit fd fzf - glow nixfmt nix-init - nix-output-monitor ripgrep ]; diff --git a/aspects/stylix.nix b/aspects/stylix.nix index ec3fd42..f7eb9fa 100644 --- a/aspects/stylix.nix +++ b/aspects/stylix.nix @@ -1,4 +1,5 @@ { ... }: + { flake.modules = { nixos.stylix = @@ -15,10 +16,7 @@ ... }: { - imports = [ - inputs.stylix.homeModules.stylix - inputs.zen-browser.homeModules.beta - ]; + imports = [ inputs.stylix.homeModules.stylix ]; stylix = { enable = true; @@ -65,15 +63,6 @@ terminal = 12; }; }; - targets.zen-browser = { - enable = true; - profileNames = [ "william" ]; - }; - }; - - programs.zen-browser = { - enable = true; - profiles.william = { }; }; }; }; From 1075c256f85a5ad19bf443aad8a9f3001ebe3c95 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 17:17:29 -0300 Subject: [PATCH 14/39] rework gaming aspect --- aspects/gaming/flatpak.nix | 25 ------------------- aspects/gaming/hardware.nix | 13 ---------- aspects/gaming/launchers.nix | 13 ---------- aspects/gaming/mangohud.nix | 4 +-- aspects/gaming/steam.nix | 7 +++++- aspects/hosts/alexandria.nix | 8 ++---- aspects/hosts/rotterdam.nix | 7 ++---- aspects/hosts/trantor.nix | 6 +---- aspects/systems/cli.nix | 2 +- aspects/systems/gaming.nix | 48 ++++++++++++++++++++++++++++++++++++ aspects/users/user.nix | 17 +++++++------ 11 files changed, 72 insertions(+), 78 deletions(-) delete mode 100644 aspects/gaming/flatpak.nix delete mode 100644 aspects/gaming/hardware.nix delete mode 100644 aspects/gaming/launchers.nix create mode 100644 aspects/systems/gaming.nix diff --git a/aspects/gaming/flatpak.nix b/aspects/gaming/flatpak.nix deleted file mode 100644 index cc4d0ee..0000000 --- a/aspects/gaming/flatpak.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ ... }: - -{ - flake.modules.nixos.gaming-flatpak = - { pkgs, ... }: - { - services.flatpak.packages = [ - "com.github.k4zmu2a.spacecadetpinball" - "com.steamgriddb.SGDBoop" - "io.github.Foldex.AdwSteamGtk" - "io.itch.itch" - "io.mrarm.mcpelauncher" - "net.retrodeck.retrodeck" - "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/25.08" - rec { - appId = "com.hypixel.HytaleLauncher"; - sha256 = "01307s44bklc1ldcigcn9n4lm8hf8q793v9fv7w4w04xd5zyh4rv"; - bundle = "${pkgs.fetchurl { - url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak"; - inherit sha256; - }}"; - } - ]; - }; -} diff --git a/aspects/gaming/hardware.nix b/aspects/gaming/hardware.nix deleted file mode 100644 index e3b5c4b..0000000 --- a/aspects/gaming/hardware.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -{ - flake.modules.nixos.gaming-hardware = - { ... }: - { - hardware = { - xpadneo.enable = true; - steam-hardware.enable = true; # Allow steam client to manage controllers - graphics.enable32Bit = true; # For OpenGL games - }; - }; -} diff --git a/aspects/gaming/launchers.nix b/aspects/gaming/launchers.nix deleted file mode 100644 index 1fd3bb4..0000000 --- a/aspects/gaming/launchers.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -{ - flake.modules.nixos.gaming-launchers = - { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - clonehero - heroic - prismlauncher - ]; - }; -} diff --git a/aspects/gaming/mangohud.nix b/aspects/gaming/mangohud.nix index 2856b8f..14a3df6 100644 --- a/aspects/gaming/mangohud.nix +++ b/aspects/gaming/mangohud.nix @@ -2,7 +2,7 @@ { flake.modules = { - nixos.gaming-mangohud = + nixos.mangohud = { pkgs, ... }: { environment.systemPackages = with pkgs; [ @@ -10,7 +10,7 @@ ]; }; - homeManager.gaming-mangohud = + homeManager.mangohud = { config, ... }: { programs.mangohud = { diff --git a/aspects/gaming/steam.nix b/aspects/gaming/steam.nix index 530c99b..a10d0e4 100644 --- a/aspects/gaming/steam.nix +++ b/aspects/gaming/steam.nix @@ -1,7 +1,7 @@ { ... }: { - flake.modules.nixos.gaming-steam = + flake.modules.nixos.steam = { pkgs, ... }: { environment.systemPackages = with pkgs; [ @@ -15,5 +15,10 @@ }; gamemode.enable = true; }; + + services.flatpak.packages = [ + "com.steamgriddb.SGDBoop" + "io.github.Foldex.AdwSteamGtk" + ]; }; } diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index d05639d..57fdf5f 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -19,17 +19,13 @@ # system aspects base cli + server # user aspects user root - # Server aspects - server-boot - server-nix - server-tailscale - - # Other aspects + # other aspects fwupd ]); }; diff --git a/aspects/hosts/rotterdam.nix b/aspects/hosts/rotterdam.nix index ad4192e..1c177e4 100644 --- a/aspects/hosts/rotterdam.nix +++ b/aspects/hosts/rotterdam.nix @@ -23,20 +23,17 @@ base cli desktop + gaming # user aspects user root - # Other aspects based on tags + # other aspects ai bluetooth dev fwupd - gaming-flatpak - gaming-hardware - gaming-launchers - gaming-steam libvirtd networkmanager niri diff --git a/aspects/hosts/trantor.nix b/aspects/hosts/trantor.nix index e7934ab..076672c 100644 --- a/aspects/hosts/trantor.nix +++ b/aspects/hosts/trantor.nix @@ -21,15 +21,11 @@ # system aspects base cli + server # user aspects user root - - # Server aspects - server-boot - server-nix - server-tailscale ]); }; } diff --git a/aspects/systems/cli.nix b/aspects/systems/cli.nix index 1d379e8..2b95f0e 100644 --- a/aspects/systems/cli.nix +++ b/aspects/systems/cli.nix @@ -19,7 +19,7 @@ homeManager.cli = { ... }: { - imports = with inputs.self.modules.nixos; [ + imports = with inputs.self.modules.homeManager; [ btop comma direnv diff --git a/aspects/systems/gaming.nix b/aspects/systems/gaming.nix new file mode 100644 index 0000000..e73a6fe --- /dev/null +++ b/aspects/systems/gaming.nix @@ -0,0 +1,48 @@ +{ inputs, ... }: + +{ + flake.modules = { + nixos.gaming = + { pkgs, ... }: + { + imports = with inputs.self.modules.nixos; [ + mangohud + steam + ]; + hardware = { + xpadneo.enable = true; + steam-hardware.enable = true; # Allow steam client to manage controllers + graphics.enable32Bit = true; # For OpenGL games + }; + + services.flatpak.packages = [ + "com.github.k4zmu2a.spacecadetpinball" + "io.itch.itch" + "io.mrarm.mcpelauncher" + "net.retrodeck.retrodeck" + "org.freedesktop.Platform.VulkanLayer.MangoHud/x86_64/25.08" + rec { + appId = "com.hypixel.HytaleLauncher"; + sha256 = "01307s44bklc1ldcigcn9n4lm8hf8q793v9fv7w4w04xd5zyh4rv"; + bundle = "${pkgs.fetchurl { + url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak"; + inherit sha256; + }}"; + } + ]; + + environment.systemPackages = with pkgs; [ + clonehero + heroic + prismlauncher + ]; + }; + homeManager.gaming = + { ... }: + { + imports = with inputs.self.modules.homeManager; [ + mangohud + ]; + }; + }; +} diff --git a/aspects/users/user.nix b/aspects/users/user.nix index ca74e8d..e37c038 100644 --- a/aspects/users/user.nix +++ b/aspects/users/user.nix @@ -40,11 +40,13 @@ ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) ] ++ (with inputs.self.modules.homeManager; [ - base # base aspect - cli # cli aspect - desktop # desktop aspect + # system aspects + base + cli + desktop + gaming - # other aspect + # other aspects stylix niri ]); @@ -68,9 +70,10 @@ ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) ] ++ (with inputs.self.modules.homeManager; [ - base # base aspect - cli # cli aspect - desktop # desktop aspect + # system aspects + base + cli + desktop # other aspect stylix From 472aabee2a655f3ab3e69a753fd19a8401398a0f Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 17:32:03 -0300 Subject: [PATCH 15/39] finalise dendritic migration --- aspects/desktop/media.nix | 2 +- aspects/systems/base.nix | 83 +++++++++++++++++++++---------------- aspects/systems/desktop.nix | 5 ++- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/aspects/desktop/media.nix b/aspects/desktop/media.nix index ed6a767..7543c0a 100644 --- a/aspects/desktop/media.nix +++ b/aspects/desktop/media.nix @@ -13,7 +13,7 @@ ]; }; - homeManager.programs-media = + homeManager.media = { pkgs, ... }: { programs.obs-studio = { diff --git a/aspects/systems/base.nix b/aspects/systems/base.nix index 5fef6b9..fdfc525 100644 --- a/aspects/systems/base.nix +++ b/aspects/systems/base.nix @@ -1,44 +1,55 @@ { inputs, ... }: { - flake.modules.nixos.base = - { lib, pkgs, ... }: - { - imports = with inputs.self.modules.nixos; [ - boot - console - firewall - fish - locale - nix - security - ssh - ]; - environment = { - systemPackages = with pkgs; [ - git - fastfetch - nixos-firewall-tool - sysz - wget - yazi + flake.modules = { + nixos.base = + { lib, pkgs, ... }: + { + imports = with inputs.self.modules.nixos; [ + boot + console + firewall + fish + locale + nix + security + ssh ]; - shellAliases = { - cat = "${lib.getExe pkgs.bat} --paging=never --style=plain"; - ls = "${lib.getExe pkgs.eza} --git --icons --group-directories-first"; - tree = "ls --tree"; + environment = { + systemPackages = with pkgs; [ + git + fastfetch + nixos-firewall-tool + sysz + wget + yazi + ]; + shellAliases = { + cat = "${lib.getExe pkgs.bat} --paging=never --style=plain"; + ls = "${lib.getExe pkgs.eza} --git --icons --group-directories-first"; + tree = "ls --tree"; + }; + }; + + programs.command-not-found.enable = false; + + services = { + dbus.implementation = "broker"; + irqbalance.enable = true; + fstrim.enable = true; + tailscale = { + enable = true; + extraUpFlags = [ "--operator=user" ]; + }; }; }; - programs.command-not-found.enable = false; - - services = { - dbus.implementation = "broker"; - irqbalance.enable = true; - fstrim.enable = true; - tailscale = { - enable = true; - extraUpFlags = [ "--operator=user" ]; - }; + homeManager.base = + { ... }: + { + imports = with inputs.self.modules.homeManager; [ + bash + fish + ]; }; - }; + }; } diff --git a/aspects/systems/desktop.nix b/aspects/systems/desktop.nix index 39fd0e0..fb3aa1b 100644 --- a/aspects/systems/desktop.nix +++ b/aspects/systems/desktop.nix @@ -158,7 +158,10 @@ ... }: { - imports = [ inputs.vicinae.homeManagerModules.default ]; + imports = [ + inputs.vicinae.homeManagerModules.default + ] + ++ (with inputs.self.modules.homeManager; [ media ]); fonts.fontconfig.enable = true; From 8b3ab52435811d954744695fcfd1b7dd4dabfda1 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 17:36:28 -0300 Subject: [PATCH 16/39] moved home manager user configuration to dedicated files --- aspects/users/user.nix | 97 ++++++-------------------------- aspects/users/user_io.nix | 32 +++++++++++ aspects/users/user_rotterdam.nix | 35 ++++++++++++ 3 files changed, 84 insertions(+), 80 deletions(-) create mode 100644 aspects/users/user_io.nix create mode 100644 aspects/users/user_rotterdam.nix diff --git a/aspects/users/user.nix b/aspects/users/user.nix index e37c038..e3f8530 100644 --- a/aspects/users/user.nix +++ b/aspects/users/user.nix @@ -1,85 +1,22 @@ -{ inputs, lib, ... }: +{ ... }: { - flake = { - modules.nixos.user = - { pkgs, ... }: - { - users.users.user = { - isNormalUser = true; - shell = pkgs.fish; - extraGroups = [ - "networkmanager" - "wheel" - ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQPkAyy+Du9Omc2WtnUF2TV8jFAF4H6mJi2D4IZ1nzg user@himalia" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3Y0PVpGfJHonqDS7qoCFhqzUvqGq9I9sax+F9e/5cs user@io" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL user@rotterdam" - ]; - hashedPassword = "$6$Pj7v/CpstyuWQQV0$cNujVDhfMBdwlGVEnnd8t71.kZPixbo0u25cd.874iaqLTH4V5fa1f98V5zGapjQCz5JyZmsR94xi00sUrntT0"; - }; - }; - - homeConfigurations = { - "user@rotterdam" = inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { - inherit inputs; - hostname = "rotterdam"; - }; - modules = [ - { nixpkgs.overlays = [ inputs.self.overlays.default ]; } - { - home = { - username = "user"; - homeDirectory = "/home/user"; - stateVersion = "22.05"; - }; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) - ] - ++ (with inputs.self.modules.homeManager; [ - # system aspects - base - cli - desktop - gaming - - # other aspects - stylix - niri - ]); - }; - - "user@io" = inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { - inherit inputs; - hostname = "io"; - }; - modules = [ - { nixpkgs.overlays = [ inputs.self.overlays.default ]; } - { - home = { - username = "user"; - homeDirectory = "/home/user"; - stateVersion = "22.05"; - }; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) - ] - ++ (with inputs.self.modules.homeManager; [ - # system aspects - base - cli - desktop - - # other aspect - stylix - niri - ]); + flake.modules.nixos.user = + { pkgs, ... }: + { + users.users.user = { + isNormalUser = true; + shell = pkgs.fish; + extraGroups = [ + "networkmanager" + "wheel" + ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQPkAyy+Du9Omc2WtnUF2TV8jFAF4H6mJi2D4IZ1nzg user@himalia" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3Y0PVpGfJHonqDS7qoCFhqzUvqGq9I9sax+F9e/5cs user@io" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL user@rotterdam" + ]; + hashedPassword = "$6$Pj7v/CpstyuWQQV0$cNujVDhfMBdwlGVEnnd8t71.kZPixbo0u25cd.874iaqLTH4V5fa1f98V5zGapjQCz5JyZmsR94xi00sUrntT0"; }; }; - }; } diff --git a/aspects/users/user_io.nix b/aspects/users/user_io.nix new file mode 100644 index 0000000..c956b1c --- /dev/null +++ b/aspects/users/user_io.nix @@ -0,0 +1,32 @@ +{ inputs, lib, ... }: + +{ + flake."user@io" = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { + inherit inputs; + hostname = "io"; + }; + modules = [ + { nixpkgs.overlays = [ inputs.self.overlays.default ]; } + { + home = { + username = "user"; + homeDirectory = "/home/user"; + stateVersion = "22.05"; + }; + } + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) + ] + ++ (with inputs.self.modules.homeManager; [ + # system aspects + base + cli + desktop + + # other aspect + stylix + niri + ]); + }; +} diff --git a/aspects/users/user_rotterdam.nix b/aspects/users/user_rotterdam.nix new file mode 100644 index 0000000..56b2dc1 --- /dev/null +++ b/aspects/users/user_rotterdam.nix @@ -0,0 +1,35 @@ +{ inputs, lib, ... }: + +{ + flake.homeConfigurations = { + "user@rotterdam" = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { + inherit inputs; + hostname = "rotterdam"; + }; + modules = [ + { nixpkgs.overlays = [ inputs.self.overlays.default ]; } + { + home = { + username = "user"; + homeDirectory = "/home/user"; + stateVersion = "22.05"; + }; + } + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) + ] + ++ (with inputs.self.modules.homeManager; [ + # system aspects + base + cli + desktop + gaming + + # other aspects + stylix + niri + ]); + }; + }; +} From 8ab3f6e2c82974f0842362c85dc2dc40f9fb3f70 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 18:11:28 -0300 Subject: [PATCH 17/39] no more niri-flake --- aspects/base/nix.nix | 5 +- aspects/desktop/niri.nix | 40 +++--- aspects/desktop/web.nix | 3 +- flake.lock | 268 +++++++-------------------------------- flake.nix | 4 - 5 files changed, 66 insertions(+), 254 deletions(-) diff --git a/aspects/base/nix.nix b/aspects/base/nix.nix index 16397a9..8d44d54 100644 --- a/aspects/base/nix.nix +++ b/aspects/base/nix.nix @@ -33,7 +33,10 @@ config = { use_nvd = true; ignore_dirty_tree = true; - apply.reexec_as_root = true; + apply = { + reexec_as_root = true; + use_nom = true; + }; confirmation.empty = "default-yes"; }; }; diff --git a/aspects/desktop/niri.nix b/aspects/desktop/niri.nix index adb3f80..9c87723 100644 --- a/aspects/desktop/niri.nix +++ b/aspects/desktop/niri.nix @@ -1,4 +1,4 @@ -{ inputs, ... }: +{ ... }: { flake.modules = { nixos.niri = @@ -9,18 +9,11 @@ ... }: { - imports = [ inputs.niri-flake.nixosModules.niri ]; - services.greetd.settings = { default_session.command = "${lib.getExe pkgs.tuigreet} --user-menu --time --remember --asterisks --cmd ${config.programs.niri.package}/bin/niri-session"; }; programs.niri.enable = true; - - xdg.portal.config.niri.default = [ - "gtk" - "gnome" - ]; }; homeManager.niri = { @@ -88,26 +81,27 @@ focus-follows-mouse } + output "LG Electronics LG ULTRAWIDE 206AZFM5E459" { + layout { + preset-column-widths { + proportion 0.33333 + proportion 0.5 + proportion 0.66667 + } + default-column-width { proportion 0.33333; } + } + } + layout { gaps 8 center-focused-column "never" - auto-center-when-space-available + always-center-single-column + empty-workspace-above-first preset-column-widths { - ${ - if isRotterdam then - '' - proportion 0.33333 - proportion 0.5 - proportion 0.66667 - '' - else - '' - proportion 0.5 - proportion 1.0 - '' - } + proportion 0.5 + proportion 1.0 } - default-column-width { proportion ${if isRotterdam then "0.33333" else "0.5"}; } + default-column-width { proportion 0.5; } focus-ring { off } diff --git a/aspects/desktop/web.nix b/aspects/desktop/web.nix index f661218..1e4ed1c 100644 --- a/aspects/desktop/web.nix +++ b/aspects/desktop/web.nix @@ -5,12 +5,11 @@ { inputs, pkgs, - system, ... }: { environment.systemPackages = with pkgs; [ - inputs.zen-browser.packages."${system}".default + inputs.zen-browser.packages."${pkgs.system}".default bitwarden-desktop fragments nextcloud-client diff --git a/flake.lock b/flake.lock index 8587eb2..20de064 100644 --- a/flake.lock +++ b/flake.lock @@ -432,86 +432,10 @@ "type": "github" } }, - "niri": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1760963745, - "narHash": "sha256-FVf9YFw2wQnMAxvMxEk+vFakXhPQUSapDpGmlLzAxjg=", - "owner": "baduhai", - "repo": "niri", - "rev": "dd3e3d1009991ecd87ab7253c9e7696acf2bc943", - "type": "github" - }, - "original": { - "owner": "baduhai", - "ref": "auto-center-when-space-available", - "repo": "niri", - "type": "github" - } - }, - "niri-flake": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1770844822, - "narHash": "sha256-QgJZ+W6YE6nAzO/m7ezamAzr9DTflIEXRozMivL0+hc=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "7634add8bf2dd225d04f535de4bd0ee60982f367", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1770735554, - "narHash": "sha256-8GzUa8bCyQ688jYW2waXrOqetTr7oV8UPTO2He+5Hsg=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "41b5de87692b8262fbdbff7faab93f04ff0be453", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-ai-tools": { "inputs": { "blueprint": "blueprint", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -568,7 +492,7 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "optnix": "optnix" }, "locked": { @@ -632,22 +556,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1770770419, - "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6c5e707c6b5339359a9a9e215c5e66d6d802fd7a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1770770419, "narHash": "sha256-iKZMkr6Cm9JzWlRYW/VPoL0A9jVKtZYiU4zSrVeetIs=", @@ -663,38 +571,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1768564909, @@ -712,38 +588,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1757967192, - "narHash": "sha256-/aA9A/OBmnuOMgwfzdsXRusqzUpd8rQnQY8jtrHK+To=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0d7c15863b251a7a50265e57c1dca1a7add2e291", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1770843696, "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", @@ -759,7 +603,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1767151656, "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", @@ -775,7 +619,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1759070547, "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", @@ -791,7 +635,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1770562336, "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", @@ -807,7 +651,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1767767207, "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", @@ -823,6 +667,38 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -871,7 +747,7 @@ "optnix": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1765418479, @@ -895,14 +771,12 @@ "home-manager": "home-manager_2", "impermanence": "impermanence", "import-tree": "import-tree", - "niri": "niri", - "niri-flake": "niri-flake", "nix-ai-tools": "nix-ai-tools", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-cli": "nixos-cli", - "nixpkgs": "nixpkgs_8", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable", "noctalia": "noctalia", "stylix": "stylix", "terranix": "terranix", @@ -910,27 +784,6 @@ "zen-browser": "zen-browser" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "niri", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757989933, - "narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -940,7 +793,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_7", "nur": "nur", "systems": "systems_3", "tinted-foot": "tinted-foot", @@ -1164,7 +1017,7 @@ }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_8", "systems": "systems_5" }, "locked": { @@ -1181,43 +1034,10 @@ "type": "github" } }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1770583271, - "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1771000521, diff --git a/flake.nix b/flake.nix index 6026fa3..2036828 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,6 @@ stylix.url = "github:danth/stylix"; # nixos/hm program modules - niri-flake.url = "github:sodiboo/niri-flake"; nix-ai-tools.url = "github:numtide/llm-agents.nix"; nix-index-database = { url = "github:nix-community/nix-index-database"; @@ -44,9 +43,6 @@ url = "github:terranix/terranix"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # others - niri.url = "github:baduhai/niri/auto-center-when-space-available"; }; outputs = From 71ec638573f13f6cbadd3d6e1e4d49d31fda92eb Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 20:05:34 -0300 Subject: [PATCH 18/39] fix ssh motd; add nvd and nom --- aspects/base/nix.nix | 7 ++++++- aspects/base/ssh.nix | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/aspects/base/nix.nix b/aspects/base/nix.nix index 8d44d54..2442024 100644 --- a/aspects/base/nix.nix +++ b/aspects/base/nix.nix @@ -1,7 +1,7 @@ { ... }: { flake.modules.nixos.nix = - { inputs, ... }: + { inputs, pkgs, ... }: { imports = [ inputs.nixos-cli.nixosModules.nixos-cli ]; @@ -41,6 +41,11 @@ }; }; + environment.systemPackages = with pkgs; [ + nix-output-monitor + nvd + ]; + system.stateVersion = "22.11"; }; } diff --git a/aspects/base/ssh.nix b/aspects/base/ssh.nix index 03fa556..6569bf0 100644 --- a/aspects/base/ssh.nix +++ b/aspects/base/ssh.nix @@ -13,7 +13,7 @@ }; programs = { bash.interactiveShellInit = '' - if { [ -n "$SSH_CONNECTION" ] && [ -z "$IN_NIX_SHELL" ]; } || [ -z "$TMUX" ]; then + if [ -n "$SSH_CONNECTION" ] && [ -z "$IN_NIX_SHELL" ] && [ -z "$TMUX" ]; then export TERM=xterm-256color clear fastfetch @@ -21,7 +21,7 @@ ''; fish.interactiveShellInit = '' set fish_greeting - if set -q SSH_CONNECTION; and not set -q IN_NIX_SHELL; or not set -q TMUX + if set -q SSH_CONNECTION; and not set -q IN_NIX_SHELL; and not set -q TMUX export TERM=xterm-256color clear fastfetch From 91f37f90230a9a958d31781652944ce2d7e9414d Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 21:05:59 -0300 Subject: [PATCH 19/39] remove claude-desktop pkg --- packages/claude-desktop.nix | 216 ------------------------------------ 1 file changed, 216 deletions(-) delete mode 100644 packages/claude-desktop.nix diff --git a/packages/claude-desktop.nix b/packages/claude-desktop.nix deleted file mode 100644 index c21ec8e..0000000 --- a/packages/claude-desktop.nix +++ /dev/null @@ -1,216 +0,0 @@ -{ inputs, ... }: - -{ - perSystem = - { system, ... }: - let - pkgs = import inputs.nixpkgs { - inherit system; - config.allowUnfree = true; - }; - - pname = "claude-desktop"; - version = "1.0.1768"; - - srcs.x86_64-linux = pkgs.fetchurl { - url = "https://downloads.claude.ai/releases/win32/x64/1.0.1768/Claude-67d01376d0e9d08b328455f6db9e63b0d603506a.exe"; - hash = "sha256-x76Qav38ya3ObpWIq3dDowo79LgvVquMfaZeH8M1LUk=;"; - }; - - src = - srcs.${pkgs.stdenv.hostPlatform.system} - or (throw "Unsupported system: ${pkgs.stdenv.hostPlatform.system}"); - - claudeNativeStub = '' - // Stub implementation of claude-native using KeyboardKey enum values - const KeyboardKey = { - Backspace: 43, Tab: 280, Enter: 261, Shift: 272, Control: 61, Alt: 40, - CapsLock: 56, Escape: 85, Space: 276, PageUp: 251, PageDown: 250, - End: 83, Home: 154, LeftArrow: 175, UpArrow: 282, RightArrow: 262, - DownArrow: 81, Delete: 79, Meta: 187 - }; - Object.freeze(KeyboardKey); - module.exports = { - getWindowsVersion: () => "10.0.0", - setWindowEffect: () => {}, - removeWindowEffect: () => {}, - getIsMaximized: () => false, - flashFrame: () => {}, - clearFlashFrame: () => {}, - showNotification: () => {}, - setProgressBar: () => {}, - clearProgressBar: () => {}, - setOverlayIcon: () => {}, - clearOverlayIcon: () => {}, - KeyboardKey - }; - ''; - in - { - packages.claude-desktop = pkgs.stdenv.mkDerivation rec { - inherit pname version src; - - nativeBuildInputs = with pkgs; [ - makeWrapper - copyDesktopItems - p7zip - unzip - nodejs - graphicsmagick - ]; - - buildInputs = [ pkgs.electron ]; - - desktopItems = [ - (pkgs.makeDesktopItem { - name = "claude-desktop"; - desktopName = "Claude"; - comment = "AI assistant from Anthropic"; - exec = "claude-desktop %u"; - icon = "claude-desktop"; - categories = [ - "Network" - "Chat" - "Office" - ]; - mimeTypes = [ "x-scheme-handler/claude" ]; - startupNotify = true; - startupWMClass = "Claude"; - }) - ]; - - unpackPhase = '' - runHook preUnpack - - # Extract the Windows installer - use -y to auto-overwrite - 7z x -y $src -o./extracted - - # The installer contains a NuGet package - if [ -f ./extracted/AnthropicClaude-*-full.nupkg ]; then - echo "Found NuGet package, extracting..." - # NuGet packages are just zip files - unzip -q ./extracted/AnthropicClaude-*-full.nupkg -d ./nupkg - - # Extract app.asar to modify it - if [ -f ./nupkg/lib/net45/resources/app.asar ]; then - echo "Extracting app.asar..." - ${pkgs.asar}/bin/asar extract ./nupkg/lib/net45/resources/app.asar ./app - - # Also copy the unpacked resources - if [ -d ./nupkg/lib/net45/resources/app.asar.unpacked ]; then - cp -r ./nupkg/lib/net45/resources/app.asar.unpacked/* ./app/ - fi - - # Copy additional resources - mkdir -p ./app/resources - mkdir -p ./app/resources/i18n - cp ./nupkg/lib/net45/resources/Tray* ./app/resources/ || true - cp ./nupkg/lib/net45/resources/*-*.json ./app/resources/i18n/ || true - fi - else - echo "NuGet package not found" - ls -la ./extracted/ - exit 1 - fi - - runHook postUnpack - ''; - - buildPhase = '' - runHook preBuild - - # Replace the Windows-specific claude-native module with a stub - if [ -d ./app/node_modules/claude-native ]; then - echo "Replacing claude-native module with Linux stub..." - rm -rf ./app/node_modules/claude-native/*.node - cat > ./app/node_modules/claude-native/index.js << 'EOF' - ${claudeNativeStub} - EOF - fi - - # Fix the title bar detection (from aaddrick script) - echo "Fixing title bar detection..." - SEARCH_BASE="./app/.vite/renderer/main_window/assets" - if [ -d "$SEARCH_BASE" ]; then - TARGET_FILE=$(find "$SEARCH_BASE" -type f -name "MainWindowPage-*.js" | head -1) - if [ -n "$TARGET_FILE" ]; then - echo "Found target file: $TARGET_FILE" - # Replace patterns like 'if(!VAR1 && VAR2)' with 'if(VAR1 && VAR2)' - sed -i -E 's/if\(!([a-zA-Z]+)[[:space:]]*&&[[:space:]]*([a-zA-Z]+)\)/if(\1 \&\& \2)/g' "$TARGET_FILE" - echo "Title bar fix applied" - fi - fi - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/claude-desktop - - # Repack the modified app as app.asar - cd ./app - ${pkgs.asar}/bin/asar pack . ../app.asar - cd .. - - # Copy resources - mkdir -p $out/lib/claude-desktop/resources - cp ./app.asar $out/lib/claude-desktop/resources/ - - # Create app.asar.unpacked directory with the stub - mkdir -p $out/lib/claude-desktop/resources/app.asar.unpacked/node_modules/claude-native - cat > $out/lib/claude-desktop/resources/app.asar.unpacked/node_modules/claude-native/index.js << 'EOF' - ${claudeNativeStub} - EOF - - # Copy other resources - if [ -d ./nupkg/lib/net45/resources ]; then - cp ./nupkg/lib/net45/resources/*.png $out/lib/claude-desktop/resources/ 2>/dev/null || true - cp ./nupkg/lib/net45/resources/*.ico $out/lib/claude-desktop/resources/ 2>/dev/null || true - cp ./nupkg/lib/net45/resources/*.json $out/lib/claude-desktop/resources/ 2>/dev/null || true - fi - - # Create wrapper script - makeWrapper ${pkgs.electron}/bin/electron $out/bin/claude-desktop \ - --add-flags "$out/lib/claude-desktop/resources/app.asar" \ - --set DISABLE_AUTOUPDATER 1 \ - --set NODE_ENV production - - # Extract and install icons in multiple sizes - if [ -f ./extracted/setupIcon.ico ]; then - echo "Converting and installing icons..." - # Count frames in the ICO file and extract each one - frame_count=$(gm identify ./extracted/setupIcon.ico | wc -l) - for i in $(seq 0 $((frame_count - 1))); do - gm convert "./extracted/setupIcon.ico[$i]" "./extracted/setupIcon-$i.png" 2>/dev/null || true - done - - # Loop through converted icons and install them by size - for img in ./extracted/setupIcon-*.png; do - if [ -f "$img" ]; then - size=$(gm identify -format "%wx%h" "$img") - # Skip smallest icons (16x16 and 32x32) as they're too low quality - if [ "$size" != "16x16" ] && [ "$size" != "32x32" ]; then - mkdir -p "$out/share/icons/hicolor/$size/apps" - cp "$img" "$out/share/icons/hicolor/$size/apps/claude-desktop.png" - fi - fi - done - fi - - runHook postInstall - ''; - - meta = with pkgs.lib; { - description = "Claude Desktop - AI assistant from Anthropic"; - homepage = "https://claude.ai"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = [ ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "claude-desktop"; - }; - }; - }; -} From 10f823a3a6821f8de4f37b030e4af05a4e5349ac Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 22:21:33 -0300 Subject: [PATCH 20/39] lxc support for alexandria --- aspects/hosts/alexandria.nix | 1 + aspects/lxc.nix | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 aspects/lxc.nix diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index 57fdf5f..c0c9f32 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -27,6 +27,7 @@ # other aspects fwupd + lxc ]); }; } diff --git a/aspects/lxc.nix b/aspects/lxc.nix new file mode 100644 index 0000000..15da310 --- /dev/null +++ b/aspects/lxc.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + flake.modules.nixos.lxc = + { + config, + lib, + pkgs, + ... + }: + { + virtualisation.lxc = { + enable = true; + unprivilegedContainers = true; + }; + }; +} From fe460c9151c87b46c9ebcca327c09fb883fef8d9 Mon Sep 17 00:00:00 2001 From: William Date: Sun, 15 Feb 2026 23:01:25 -0300 Subject: [PATCH 21/39] fix secrets locations --- aspects/hosts/_alexandria/nextcloud.nix | 7 +++---- aspects/hosts/_alexandria/nginx.nix | 2 +- aspects/hosts/_trantor/nginx.nix | 2 +- aspects/hosts/alexandria.nix | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/aspects/hosts/_alexandria/nextcloud.nix b/aspects/hosts/_alexandria/nextcloud.nix index c4a9669..cb9f2ac 100644 --- a/aspects/hosts/_alexandria/nextcloud.nix +++ b/aspects/hosts/_alexandria/nextcloud.nix @@ -1,8 +1,7 @@ { - lib, config, - pkgs, inputs, + pkgs, ... }: @@ -83,12 +82,12 @@ in age.secrets = { "nextcloud-secrets.json" = { - file = ../../../secrets/nextcloud-secrets.json.age; + file = "${inputs.self}/secrets/nextcloud-secrets.json.age"; owner = "nextcloud"; group = "nextcloud"; }; nextcloud-adminpass = { - file = ../../../secrets/nextcloud-adminpass.age; + file = "${inputs.self}/secrets/nextcloud-adminpass.age"; owner = "nextcloud"; group = "nextcloud"; }; diff --git a/aspects/hosts/_alexandria/nginx.nix b/aspects/hosts/_alexandria/nginx.nix index 26a7ba1..087faf4 100644 --- a/aspects/hosts/_alexandria/nginx.nix +++ b/aspects/hosts/_alexandria/nginx.nix @@ -51,7 +51,7 @@ in ]; age.secrets.cloudflare = { - file = ../../../secrets/cloudflare.age; + file = "${inputs.self}/secrets/cloudflare.age"; owner = "nginx"; group = "nginx"; }; diff --git a/aspects/hosts/_trantor/nginx.nix b/aspects/hosts/_trantor/nginx.nix index 899666e..eccfb12 100644 --- a/aspects/hosts/_trantor/nginx.nix +++ b/aspects/hosts/_trantor/nginx.nix @@ -51,7 +51,7 @@ in ]; age.secrets.cloudflare = { - file = ../../../secrets/cloudflare.age; + file = "${inputs.self}/secrets/cloudflare.age"; owner = "nginx"; group = "nginx"; }; diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index c0c9f32..f10dfe7 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -27,7 +27,7 @@ # other aspects fwupd - lxc + podman ]); }; } From 657e1e4697c22f4f82985844b3d8ad2535e6ec49 Mon Sep 17 00:00:00 2001 From: William Date: Mon, 16 Feb 2026 00:07:36 -0300 Subject: [PATCH 22/39] fix forgejo on trantor --- aspects/hosts/_trantor/forgejo.nix | 7 ++++++- aspects/hosts/_trantor/nginx.nix | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/aspects/hosts/_trantor/forgejo.nix b/aspects/hosts/_trantor/forgejo.nix index 1112622..6d702e2 100644 --- a/aspects/hosts/_trantor/forgejo.nix +++ b/aspects/hosts/_trantor/forgejo.nix @@ -21,6 +21,8 @@ in ROOT_URL = "https://git.baduhai.dev"; OFFLINE_MODE = true; # disable use of CDNs SSH_DOMAIN = "git.baduhai.dev"; + SSH_USER = "forgejo"; + SSH_PORT = lib.head config.services.openssh.ports; }; log.LEVEL = "Warn"; mailer.ENABLED = false; @@ -67,5 +69,8 @@ in }; # Disable PrivateMounts to allow LoadCredential to work with bind-mounted directories - systemd.services.forgejo.serviceConfig.PrivateMounts = lib.mkForce false; + systemd.services.forgejo.serviceConfig = { + PrivateMounts = lib.mkForce false; + ProtectSystem = lib.mkForce false; + }; } diff --git a/aspects/hosts/_trantor/nginx.nix b/aspects/hosts/_trantor/nginx.nix index eccfb12..24f96c3 100644 --- a/aspects/hosts/_trantor/nginx.nix +++ b/aspects/hosts/_trantor/nginx.nix @@ -8,10 +8,8 @@ let services = inputs.self.services; - # Get all unique domains from shared services on trantor (host = "trantor") localDomains = lib.unique (map (s: s.domain) (lib.filter (s: s.host == "trantor") services)); - # Generate ACME cert configs for all local domains acmeCerts = lib.genAttrs localDomains (domain: { group = "nginx"; }); From bea47712721aa49dd0fc27c5f3640f812db30dea Mon Sep 17 00:00:00 2001 From: William Date: Mon, 16 Feb 2026 01:05:30 -0300 Subject: [PATCH 23/39] lxc on alexandria again --- aspects/hosts/alexandria.nix | 2 +- aspects/lxc.nix | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index f10dfe7..c0c9f32 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -27,7 +27,7 @@ # other aspects fwupd - podman + lxc ]); }; } diff --git a/aspects/lxc.nix b/aspects/lxc.nix index 15da310..4225e0c 100644 --- a/aspects/lxc.nix +++ b/aspects/lxc.nix @@ -9,9 +9,14 @@ ... }: { - virtualisation.lxc = { - enable = true; - unprivilegedContainers = true; + virtualisation = { + lxc = { + enable = true; + unprivilegedContainers = true; + }; + incus.enable = true; }; + + users.users.user.extraGroups = [ "incus-admin" ]; }; } From 19ecca4ea808e845e1db52d79ac3cbbbddfe647e Mon Sep 17 00:00:00 2001 From: William Date: Mon, 16 Feb 2026 11:59:32 -0300 Subject: [PATCH 24/39] add niri-auto-centre script --- aspects/desktop/niri.nix | 1 + packages/hm-cli.nix | 2 -- packages/niri-auto-centre.nix | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 packages/niri-auto-centre.nix diff --git a/aspects/desktop/niri.nix b/aspects/desktop/niri.nix index 9c87723..bc99482 100644 --- a/aspects/desktop/niri.nix +++ b/aspects/desktop/niri.nix @@ -123,6 +123,7 @@ } spawn-at-startup "noctalia-shell" "-d" + spawn-at-startup "${lib.getExe pkgs.niri-auto-centre}" layer-rule { match namespace="^noctalia-overview*" place-within-backdrop true diff --git a/packages/hm-cli.nix b/packages/hm-cli.nix index 94dae66..59f4b4f 100644 --- a/packages/hm-cli.nix +++ b/packages/hm-cli.nix @@ -5,8 +5,6 @@ { pkgs, ... }: { packages.hm-cli = pkgs.writeShellScriptBin "hm" '' - set -e - HM="${pkgs.lib.getExe pkgs.home-manager}" FLAKE_PATH="''${HM_PATH:-$HOME/.config/home-manager}" FLAKE_OUTPUT="''${HM_USER:-$(whoami)@$(hostname)}" diff --git a/packages/niri-auto-centre.nix b/packages/niri-auto-centre.nix new file mode 100644 index 0000000..dd7b04c --- /dev/null +++ b/packages/niri-auto-centre.nix @@ -0,0 +1,32 @@ +{ ... }: + +{ + perSystem = + { pkgs, ... }: + { + packages.niri-auto-centre = pkgs.writeShellApplication { + name = "niri-auto-centre"; + runtimeInputs = [ pkgs.jq ]; + text = '' + while true; do + ACTIVE_WORKSPACE=$(niri msg --json workspaces | jq -r '.[] | select(.is_active == true)') + WORKSPACE_ID=$(echo "$ACTIVE_WORKSPACE" | jq -r '.id') + OUTPUT_NAME=$(echo "$ACTIVE_WORKSPACE" | jq -r '.output') + + MONITOR_WIDTH=$(niri msg --json outputs | jq -r ".\"$OUTPUT_NAME\".logical.width") + + SUMMED_TILE_WIDTH=$(niri msg --json windows | jq --argjson wid "$WORKSPACE_ID" -r ' + [.[] | select(.workspace_id == $wid) | {col: .layout.pos_in_scrolling_layout[0], width: .layout.tile_size[0]}] + | group_by(.col) | map(first.width) | add + ') + + if awk "BEGIN {exit !($SUMMED_TILE_WIDTH < $MONITOR_WIDTH)}"; then + niri msg action center-visible-columns + fi + + sleep 0.1 + done + ''; + }; + }; +} From cd16985ddc763de89bc3eda4aeb9445b6cb059ee Mon Sep 17 00:00:00 2001 From: William Date: Tue, 17 Feb 2026 13:53:57 -0300 Subject: [PATCH 25/39] use determinate nix --- aspects/base/nix.nix | 31 +-- flake.lock | 444 +++++++++++++++++++++++++++++++------------ flake.nix | 1 + 3 files changed, 340 insertions(+), 136 deletions(-) diff --git a/aspects/base/nix.nix b/aspects/base/nix.nix index 2442024..29feff8 100644 --- a/aspects/base/nix.nix +++ b/aspects/base/nix.nix @@ -3,24 +3,25 @@ flake.modules.nixos.nix = { inputs, pkgs, ... }: { - imports = [ inputs.nixos-cli.nixosModules.nixos-cli ]; + imports = [ + inputs.nixos-cli.nixosModules.nixos-cli + inputs.determinate.nixosModules.default + ]; - nix = { - settings = { - auto-optimise-store = true; - connect-timeout = 10; - log-lines = 25; - min-free = 128000000; - max-free = 1000000000; - trusted-users = [ "@wheel" ]; - }; - extraOptions = "experimental-features = nix-command flakes"; - gc = { - automatic = true; - options = "--delete-older-than 8d"; - }; + nix.gc = { + automatic = true; + options = "--delete-older-than 8d"; }; + environment.etc."nix/nix.custom.conf".text = '' + auto-optimise-store = true + connect-timeout = 10 + log-lines = 25 + min-free = 128000000 + max-free = 1000000000 + trusted-users = @wheel + ''; + nixpkgs.config = { allowUnfree = true; enableParallelBuilding = true; diff --git a/flake.lock b/flake.lock index 20de064..8b17f1e 100644 --- a/flake.lock +++ b/flake.lock @@ -135,9 +135,66 @@ "type": "github" } }, + "determinate": { + "inputs": { + "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", + "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", + "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", + "nix": "nix", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1771014593, + "narHash": "sha256-NrCFwn20ewJwy/SZoREs+XylerizPCYP54n9qkr31/E=", + "rev": "69b4ff80ae2bbdd1e3f02ccd76a5f2988b118ed2", + "revCount": 397, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.16.0/019c58b5-64dc-77f9-b913-8738b7d338cc/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A" + } + }, + "determinate-nixd-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-PUo0u1iNMB8eTlBNFMCW8/UAn1sGKGqsIYlXaDRhx00=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" + } + }, + "determinate-nixd-aarch64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-jiIWiM88xkEpBQeohSxhl83fn2xoZY0nFkrW6CUAIAI=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" + } + }, + "determinate-nixd-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-qF/NNdHwh3tAHrKIOz2FRq5Q8GcSMzJeEY/PFvGf5vo=", + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" + }, + "original": { + "type": "file", + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" + } + }, "disko": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1769524058, @@ -170,6 +227,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -185,7 +258,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -202,6 +275,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748821116, + "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", + "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", + "revCount": 377, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -219,7 +313,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -237,7 +331,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -258,7 +352,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "terranix", @@ -295,6 +389,32 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": [ + "determinate", + "nix" + ], + "nixpkgs": [ + "determinate", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "revCount": 1026, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -401,7 +521,7 @@ "impermanence": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1769548169, @@ -432,10 +552,31 @@ "type": "github" } }, + "nix": { + "inputs": { + "flake-parts": "flake-parts", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1771010067, + "narHash": "sha256-Itk88UC3CxjGjjAb20KI6KrM9tRoGEpbv996fXwAWGo=", + "rev": "5c670e37e884c43e1da0405075c9b9c83d316a6c", + "revCount": 24629, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.16.0/019c589d-45e9-7337-9ff0-a8d78fecf63f/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" + } + }, "nix-ai-tools": { "inputs": { "blueprint": "blueprint", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -490,9 +631,9 @@ }, "nixos-cli": { "inputs": { - "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6", "optnix": "optnix" }, "locked": { @@ -511,17 +652,31 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769330179, - "narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=", + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "revCount": 811874, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" + } + }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" } }, @@ -555,6 +710,22 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1770770419, @@ -571,103 +742,7 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1770843696, - "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "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_5": { - "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { + "nixpkgs_10": { "locked": { "lastModified": 1762111121, "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", @@ -683,7 +758,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_11": { "locked": { "lastModified": 1769461804, "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", @@ -699,6 +774,132 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1770537093, + "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", + "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", + "revCount": 942631, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.942631%2Brev-fef9403a3e4d31b0a23f0bacebbec52c248fbb51/019c4621-ce4f-799f-82f6-b3b29f099b09/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1769330179, + "narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1770843696, + "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "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_7": { + "locked": { + "lastModified": 1759070547, + "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -746,8 +947,8 @@ }, "optnix": { "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_5" + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1765418479, @@ -766,8 +967,9 @@ "root": { "inputs": { "agenix": "agenix", + "determinate": "determinate", "disko": "disko", - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", "impermanence": "impermanence", "import-tree": "import-tree", @@ -775,7 +977,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-cli": "nixos-cli", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable", "noctalia": "noctalia", "stylix": "stylix", @@ -791,9 +993,9 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nur": "nur", "systems": "systems_3", "tinted-foot": "tinted-foot", @@ -893,7 +1095,7 @@ }, "terranix": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_5", "nixpkgs": [ "nixpkgs" ], @@ -1017,7 +1219,7 @@ }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_10", "systems": "systems_5" }, "locked": { @@ -1037,7 +1239,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1771000521, diff --git a/flake.nix b/flake.nix index 2036828..c2f801c 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ # nix tools flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; + determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; # nixos/hm nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; From 385586a376cdb9a78c0fb96a93d60f93b3957b69 Mon Sep 17 00:00:00 2001 From: William Date: Tue, 17 Feb 2026 14:03:58 -0300 Subject: [PATCH 26/39] add vagrant to libvirtd aspect; add libvirtd aspect to alexandria --- aspects/hosts/alexandria.nix | 2 +- aspects/libvirtd.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index c0c9f32..55867fa 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -27,7 +27,7 @@ # other aspects fwupd - lxc + libvirtd ]); }; } diff --git a/aspects/libvirtd.nix b/aspects/libvirtd.nix index 1135306..a21a23d 100644 --- a/aspects/libvirtd.nix +++ b/aspects/libvirtd.nix @@ -15,6 +15,8 @@ programs.virt-manager.enable = true; + environment.systemPackages = with pkgs; [ vagrant ]; + networking.firewall.trustedInterfaces = [ "virbr0" ]; users.users.user.extraGroups = [ From 79a6bd53bfa9e849bfbd0aa1e6b8340bed1171fc Mon Sep 17 00:00:00 2001 From: William Date: Tue, 17 Feb 2026 14:56:42 -0300 Subject: [PATCH 27/39] lima instead of vagrant --- aspects/libvirtd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aspects/libvirtd.nix b/aspects/libvirtd.nix index a21a23d..360743d 100644 --- a/aspects/libvirtd.nix +++ b/aspects/libvirtd.nix @@ -15,7 +15,7 @@ programs.virt-manager.enable = true; - environment.systemPackages = with pkgs; [ vagrant ]; + environment.systemPackages = with pkgs; [ lima ]; networking.firewall.trustedInterfaces = [ "virbr0" ]; From 561fdf5ef45d835c8948f6a9d644e165d92660b5 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 18 Feb 2026 16:08:53 -0300 Subject: [PATCH 28/39] 'system' has been renamed to/replaced by 'stdenv.hostPlatform.system' --- aspects/ai.nix | 2 +- aspects/desktop/niri.nix | 2 +- aspects/desktop/web.nix | 2 +- shells/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aspects/ai.nix b/aspects/ai.nix index 3431ddd..e3016e6 100644 --- a/aspects/ai.nix +++ b/aspects/ai.nix @@ -5,7 +5,7 @@ { environment.systemPackages = (with pkgs; [ ]) - ++ (with inputs.nix-ai-tools.packages.${pkgs.system}; [ + ++ (with inputs.nix-ai-tools.packages.${pkgs.stdenv.hostPlatform.system}; [ claude-code claudebox opencode diff --git a/aspects/desktop/niri.nix b/aspects/desktop/niri.nix index bc99482..9408097 100644 --- a/aspects/desktop/niri.nix +++ b/aspects/desktop/niri.nix @@ -48,7 +48,7 @@ home = { packages = with pkgs; [ xwayland-satellite - inputs.noctalia.packages.${pkgs.system}.default + inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default ]; sessionVariables.QT_QPA_PLATFORMTHEME = "gtk3"; }; diff --git a/aspects/desktop/web.nix b/aspects/desktop/web.nix index 1e4ed1c..8fb960a 100644 --- a/aspects/desktop/web.nix +++ b/aspects/desktop/web.nix @@ -9,7 +9,7 @@ }: { environment.systemPackages = with pkgs; [ - inputs.zen-browser.packages."${pkgs.system}".default + inputs.zen-browser.packages."${pkgs.stdenv.hostPlatform.system}".default bitwarden-desktop fragments nextcloud-client diff --git a/shells/default.nix b/shells/default.nix index a7cda20..d9eb50b 100644 --- a/shells/default.nix +++ b/shells/default.nix @@ -6,7 +6,7 @@ { devShells.default = pkgs.mkShell { packages = with pkgs; [ - inputs.agenix.packages.${system}.default + inputs.agenix.packages.${stdenv.hostPlatform.system}.default nil nixfmt ]; From 80b1246ad87b6a0f48f4629158bbb4c312faa0a7 Mon Sep 17 00:00:00 2001 From: William Date: Wed, 18 Feb 2026 16:18:07 -0300 Subject: [PATCH 29/39] new readme --- readme.md | 130 ++++++++++++++++++++++++------------------------------ 1 file changed, 58 insertions(+), 72 deletions(-) diff --git a/readme.md b/readme.md index a2b815f..554c5bc 100644 --- a/readme.md +++ b/readme.md @@ -1,87 +1,73 @@ -# Nix Configuration +# NixOS Flake Configuration -My personal Nix configuration for multiple NixOS hosts, home-manager users, miscellaneous resources... too many things to list. If I could put my life in a flake I would. +Modular NixOS configuration using flake-parts with the [dendritic](https://github.com/gytis-ivaskevicius/dendritic) pattern. + +## Structure + +``` +. +├── aspects/ # Reusable NixOS/home-manager modules (dendritic) +│ ├── base/ # Base system configuration +│ ├── hosts/ # Host-specific configurations +│ │ ├── _alexandria/ +│ │ ├── _io/ +│ │ ├── _rotterdam/ +│ │ └── _trantor/ +│ ├── systems/ # System type modules (desktop, server, cli, gaming) +│ └── users/ # User account configurations +├── data/ # Shared host/service definitions +├── packages/ # Custom packages and overlays +├── shells/ # Shell configurations +└── terranix/ # Terraform configurations for cloud resources +``` ## Hosts -### Desktop Systems -- **rotterdam** - Main desktop workstation (x86_64) - - Features: Desktop, AI tools, Bluetooth, Dev environment, Gaming, Virtualization (libvirtd), Podman - - Storage: Ephemeral root with LUKS encryption - -- **io** - Laptop workstation (x86_64) - - Features: Desktop, AI tools, Bluetooth, Dev environment, Podman - - Storage: Ephemeral root with LUKS encryption - -### Servers -- **alexandria** - Home server (x86_64) - - Hosts: Nextcloud, Vaultwarden, Jellyfin, Kanidm - -- **trantor** - Cloud server (aarch64) - - Hosts: Forgejo - - Cloud provider: Oracle Cloud Infrastructure - - Storage: Ephemeral root with btrfs - -## Home Manager Configurations - -- **user@rotterdam** - Full desktop setup with gaming, OBS, and complete development environment -- **user@io** - Lightweight desktop setup - -Both configurations include: -- btop, direnv, helix, starship, tmux -- Stylix theme management -- Fish shell with custom configurations - -## Terranix Configurations - -Infrastructure as code using Terranix (NixOS + Terraform/OpenTofu): - -- **oci-trantor** - Oracle Cloud Infrastructure provisioning for Trantor server -- **cloudflare-baduhaidev** - DNS and CDN configuration for baduhai.dev domain -- **tailscale-tailnet** - Tailscale network ACL and device management +| Host | Architecture | Type | Description | +|------|--------------|------|-------------| +| trantor | aarch64-linux | server | ARM server running Forgejo | +| alexandria | x86_64-linux | server | x86 server (Kanidm, Vaultwarden, Nextcloud, Jellyfin) | +| rotterdam | x86_64-linux | desktop | Gaming desktop with GPU passthrough | +| io | x86_64-linux | desktop | Workstation | ## Services -All services are accessible via custom domains under baduhai.dev: +- **git.baduhai.dev** (Forgejo) - Publicly accessible on trantor -- **Kanidm** (auth.baduhai.dev) - Identity and access management -- **Vaultwarden** (pass.baduhai.dev) - Password manager -- **Forgejo** (git.baduhai.dev) - Git forge (publicly accessible) -- **Nextcloud** (cloud.baduhai.dev) - File sync and collaboration -- **Jellyfin** (jellyfin.baduhai.dev) - Media server +Other services (LAN/Tailscale only): Kanidm, Vaultwarden, Nextcloud, Jellyfin -Services are accessible via: -- LAN for alexandria-hosted services -- Tailscale VPN for all services -- Public internet for Forgejo only +## Features -## Notable Features +- **Ephemeral root**: Automatic btrfs subvolume rollover with impermanence +- **Secrets**: Managed via agenix with age encryption +- **Disk management**: disko for declarative disk partitioning +- **Modular architecture**: Each aspect is a separate module imported via import-tree +- **Dendritic pattern**: Aspects are imported as a unified flake module -### Ephemeral Root -Rotterdam, io, and trantor use an ephemeral root filesystem that resets on every boot: -- Root filesystem is automatically rolled back using btrfs snapshots -- Old snapshots retained for 30 days -- Persistent data stored in dedicated subvolumes -- Implements truly stateless systems +## Building -### Custom DNS Architecture -- Unbound DNS servers on both alexandria and trantor -- Service routing based on visibility flags (public/LAN/Tailscale) -- Split-horizon DNS for optimal access paths +```bash +# Build specific host +nix build .#nixosConfigurations.trantor.config.system.build.toplevel -### Security -- LUKS full-disk encryption on desktop systems -- Fail2ban on public-facing servers -- agenix for secrets management -- Tailscale for secure remote access +# Rebuild host (if using nixos-cli on the host) +sudo nixos apply +``` -### Desktop Environment -- Custom Niri window manager (Wayland compositor) -- Using forked version with auto-centering feature -- Stylix for consistent theming +## Terranix -### Development Setup -- Nix flakes for reproducible builds -- deploy-rs for automated deployments -- Podman for containerization -- Complete AI tooling integration +Terraform configurations for cloud infrastructure managed via terranix: + +- baduhai.dev DNS +- Cloudflare tunnel endpoints +- Tailscale subnet routers + +## Key Dependencies + +- nixpkgs (nixos-unstable for workstations, nixos for servers) +- home-manager +- agenix +- disko +- impermanence +- nix-flatpak +- nixos-cli From 1f9812fea0450f3bbf232bc20fb568094e71cc12 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 19 Feb 2026 07:05:48 -0300 Subject: [PATCH 30/39] improve homeConfigurations files --- aspects/users/user_io.nix | 4 +-- aspects/users/user_rotterdam.nix | 56 +++++++++++++++----------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/aspects/users/user_io.nix b/aspects/users/user_io.nix index c956b1c..a8fa675 100644 --- a/aspects/users/user_io.nix +++ b/aspects/users/user_io.nix @@ -1,7 +1,7 @@ { inputs, lib, ... }: { - flake."user@io" = inputs.home-manager.lib.homeManagerConfiguration { + flake.homeConfigurations."user@io" = { pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; extraSpecialArgs = { inherit inputs; @@ -24,7 +24,7 @@ cli desktop - # other aspect + # other aspects stylix niri ]); diff --git a/aspects/users/user_rotterdam.nix b/aspects/users/user_rotterdam.nix index 56b2dc1..36f512d 100644 --- a/aspects/users/user_rotterdam.nix +++ b/aspects/users/user_rotterdam.nix @@ -1,35 +1,33 @@ { inputs, lib, ... }: { - flake.homeConfigurations = { - "user@rotterdam" = inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { - inherit inputs; - hostname = "rotterdam"; - }; - modules = [ - { nixpkgs.overlays = [ inputs.self.overlays.default ]; } - { - home = { - username = "user"; - homeDirectory = "/home/user"; - stateVersion = "22.05"; - }; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) - ] - ++ (with inputs.self.modules.homeManager; [ - # system aspects - base - cli - desktop - gaming - - # other aspects - stylix - niri - ]); + flake.homeConfigurations."user@rotterdam" = { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; + extraSpecialArgs = { + inherit inputs; + hostname = "rotterdam"; }; + modules = [ + { nixpkgs.overlays = [ inputs.self.overlays.default ]; } + { + home = { + username = "user"; + homeDirectory = "/home/user"; + stateVersion = "22.05"; + }; + } + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) + ] + ++ (with inputs.self.modules.homeManager; [ + # system aspects + base + cli + desktop + gaming + + # other aspects + stylix + niri + ]); }; } From d51f6f14db38b6780f2b4b9f11ad406aae8e6644 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 19 Feb 2026 08:08:27 -0300 Subject: [PATCH 31/39] created mkHost and mkHomeConfiguration --- aspects/constants.nix | 82 +++++++++++++++++++++++++++++++- aspects/hosts/alexandria.nix | 36 +++++--------- aspects/hosts/io.nix | 41 +++++----------- aspects/hosts/rotterdam.nix | 39 +++++---------- aspects/hosts/trantor.nix | 43 ++++++----------- aspects/users/user.nix | 63 ++++++++++++++++++------ aspects/users/user_io.nix | 32 ------------- aspects/users/user_rotterdam.nix | 33 ------------- 8 files changed, 178 insertions(+), 191 deletions(-) delete mode 100644 aspects/users/user_io.nix delete mode 100644 aspects/users/user_rotterdam.nix diff --git a/aspects/constants.nix b/aspects/constants.nix index 7d77098..5a82660 100644 --- a/aspects/constants.nix +++ b/aspects/constants.nix @@ -1,4 +1,9 @@ -{ lib, config, ... }: +{ + inputs, + lib, + config, + ... +}: let # Host submodule type @@ -132,6 +137,81 @@ in local-data = lanData; } ]; + # Generates flake.homeConfigurations + mkHomeConfiguration = + { + user, + hostname, + system ? "x86_64-linux", + stateVersion ? "22.05", + nixpkgs ? inputs.nixpkgs, # override with e.g. inputs.nixpkgs-stable + userModules ? [ ], + overlays ? [ inputs.self.overlays.default ], + homeManagerModules ? with inputs.self.modules.homeManager; [ + base + cli + ], + userDirectory ? "/home/${user}", + }: + inputs.home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + + extraSpecialArgs = { + inherit inputs hostname; + }; + + modules = [ + { nixpkgs.overlays = overlays; } + { + home = { + username = user; + homeDirectory = userDirectory; + inherit stateVersion; + }; + } + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) + "/${inputs.self}/aspects/users/_${user}" + ) + ] + ++ homeManagerModules + ++ userModules; + }; + # Generates flake.nixosConfigurations + mkHost = + { + hostname, + system ? "x86_64-linux", + nixpkgs ? inputs.nixpkgs, + overlays ? [ + inputs.agenix.overlays.default + inputs.self.overlays.default + ], + ephemeralRootDev ? null, # pass rootDevice string to enable, e.g. ephemeralephemeralRootDev = "/dev/mapper/cryptroot" + nixosModules ? with inputs.self.modules.nixos; [ + base + cli + user + root + ], + extraModules ? [ ], + }: + nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { inherit inputs; }; + modules = [ + inputs.agenix.nixosModules.default + { networking.hostName = hostname; } + { nixpkgs.overlays = overlays; } + ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) + "${inputs.self}/aspects/hosts/_${hostname}" + ) + ] + ++ (lib.optional (ephemeralRootDev != null) ( + inputs.self.factory.ephemeral { rootDevice = ephemeralRootDev; } + )) + ++ nixosModules + ++ extraModules; + }; }; }; } diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix index 55867fa..be5027e 100644 --- a/aspects/hosts/alexandria.nix +++ b/aspects/hosts/alexandria.nix @@ -1,33 +1,19 @@ -{ inputs, lib, ... }: +{ inputs, ... }: + +let + mkHost = inputs.self.lib.mkHost; +in { - flake.nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - inputs.agenix.nixosModules.default - { networking.hostName = "alexandria"; } - { - nixpkgs.overlays = [ - inputs.agenix.overlays.default - inputs.self.overlays.default - ]; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_alexandria) - ] - ++ (with inputs.self.modules.nixos; [ - # system aspects - base - cli + flake.nixosConfigurations.alexandria = mkHost { + hostname = "alexandria"; + nixpkgs = inputs.nixpkgs-stable; + extraModules = with inputs.self.modules.nixos; [ + # base aspects server - - # user aspects - user - root - # other aspects fwupd libvirtd - ]); + ]; }; } diff --git a/aspects/hosts/io.nix b/aspects/hosts/io.nix index 6944555..cf5ecec 100644 --- a/aspects/hosts/io.nix +++ b/aspects/hosts/io.nix @@ -1,34 +1,17 @@ -{ inputs, lib, ... }: +{ inputs, ... }: + +let + mkHost = inputs.self.lib.mkHost; +in { - flake.nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - inputs.agenix.nixosModules.default - { networking.hostName = "io"; } - { - nixpkgs.overlays = [ - inputs.agenix.overlays.default - inputs.self.overlays.default - ]; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_io) - (inputs.self.factory.ephemeral { - rootDevice = "/dev/mapper/cryptroot"; - }) - ] - ++ (with inputs.self.modules.nixos; [ - # system aspects - base - cli + flake.nixosConfigurations.io = mkHost { + hostname = "io"; + ephemeralRootDev = "/dev/mapper/cryptroot"; + extraModules = with inputs.self.modules.nixos; [ + # base aspects desktop - - # user aspects - user - root - - # Other aspects + # other aspects ai bluetooth dev @@ -36,6 +19,6 @@ networkmanager niri podman - ]); + ]; }; } diff --git a/aspects/hosts/rotterdam.nix b/aspects/hosts/rotterdam.nix index 1c177e4..f3b6fca 100644 --- a/aspects/hosts/rotterdam.nix +++ b/aspects/hosts/rotterdam.nix @@ -1,34 +1,17 @@ -{ inputs, lib, ... }: +{ inputs, ... }: + +let + mkHost = inputs.self.lib.mkHost; +in { - flake.nixosConfigurations.rotterdam = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - inputs.agenix.nixosModules.default - { networking.hostName = "rotterdam"; } - { - nixpkgs.overlays = [ - inputs.agenix.overlays.default - inputs.self.overlays.default - ]; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_rotterdam) - (inputs.self.factory.ephemeral { - rootDevice = "/dev/mapper/cryptroot"; - }) - ] - ++ (with inputs.self.modules.nixos; [ - # system aspects - base - cli + flake.nixosConfigurations.rotterdam = mkHost { + hostname = "rotterdam"; + ephemeralRootDev = "/dev/mapper/cryptroot"; + extraModules = with inputs.self.modules.nixos; [ + # base aspects desktop gaming - - # user aspects - user - root - # other aspects ai bluetooth @@ -38,6 +21,6 @@ networkmanager niri podman - ]); + ]; }; } diff --git a/aspects/hosts/trantor.nix b/aspects/hosts/trantor.nix index 076672c..14f9dd7 100644 --- a/aspects/hosts/trantor.nix +++ b/aspects/hosts/trantor.nix @@ -1,31 +1,18 @@ -{ inputs, lib, ... }: -{ - flake.nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem { - system = "aarch64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - inputs.agenix.nixosModules.default - { networking.hostName = "trantor"; } - { - nixpkgs.overlays = [ - inputs.agenix.overlays.default - inputs.self.overlays.default - ]; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_trantor) - (inputs.self.factory.ephemeral { - rootDevice = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2"; - }) - ] - ++ (with inputs.self.modules.nixos; [ - # system aspects - base - cli - server +{ inputs, ... }: - # user aspects - user - root - ]); +let + mkHost = inputs.self.lib.mkHost; +in + +{ + flake.nixosConfigurations.trantor = mkHost { + hostname = "trantor"; + system = "aarch64-linux"; + nixpkgs = inputs.nixpkgs-stable; + ephemeralRootDev = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2"; + extraModules = with inputs.self.modules.nixos; [ + # base aspects + server + ]; }; } diff --git a/aspects/users/user.nix b/aspects/users/user.nix index e3f8530..86bcddb 100644 --- a/aspects/users/user.nix +++ b/aspects/users/user.nix @@ -1,22 +1,55 @@ -{ ... }: +{ inputs, ... }: + +let + mkHomeConfiguration = inputs.self.lib.mkHomeConfiguration; +in { - flake.modules.nixos.user = - { pkgs, ... }: - { - users.users.user = { - isNormalUser = true; - shell = pkgs.fish; - extraGroups = [ - "networkmanager" - "wheel" + flake = { + modules.nixos.user = + { pkgs, ... }: + { + users.users.user = { + isNormalUser = true; + shell = pkgs.fish; + extraGroups = [ + "networkmanager" + "wheel" + ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQPkAyy+Du9Omc2WtnUF2TV8jFAF4H6mJi2D4IZ1nzg user@himalia" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3Y0PVpGfJHonqDS7qoCFhqzUvqGq9I9sax+F9e/5cs user@io" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL user@rotterdam" + ]; + hashedPassword = "$6$Pj7v/CpstyuWQQV0$cNujVDhfMBdwlGVEnnd8t71.kZPixbo0u25cd.874iaqLTH4V5fa1f98V5zGapjQCz5JyZmsR94xi00sUrntT0"; + }; + }; + homeConfigurations = { + "user@rotterdam" = mkHomeConfiguration { + user = "user"; + hostname = "rotterdam"; + userModules = with inputs.self.modules.homeManager; [ + # system aspects + desktop + gaming + + # other aspects + stylix + niri ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQPkAyy+Du9Omc2WtnUF2TV8jFAF4H6mJi2D4IZ1nzg user@himalia" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO3Y0PVpGfJHonqDS7qoCFhqzUvqGq9I9sax+F9e/5cs user@io" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA1v3+q3EaruiiStWjubEJWvtejam/r41uoOpCdwJtLL user@rotterdam" + }; + "user@io" = mkHomeConfiguration { + user = "user"; + hostname = "io"; + userModules = with inputs.self.modules.homeManager; [ + # system aspects + desktop + + # other aspects + stylix + niri ]; - hashedPassword = "$6$Pj7v/CpstyuWQQV0$cNujVDhfMBdwlGVEnnd8t71.kZPixbo0u25cd.874iaqLTH4V5fa1f98V5zGapjQCz5JyZmsR94xi00sUrntT0"; }; }; + }; } diff --git a/aspects/users/user_io.nix b/aspects/users/user_io.nix deleted file mode 100644 index a8fa675..0000000 --- a/aspects/users/user_io.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ inputs, lib, ... }: - -{ - flake.homeConfigurations."user@io" = { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { - inherit inputs; - hostname = "io"; - }; - modules = [ - { nixpkgs.overlays = [ inputs.self.overlays.default ]; } - { - home = { - username = "user"; - homeDirectory = "/home/user"; - stateVersion = "22.05"; - }; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) - ] - ++ (with inputs.self.modules.homeManager; [ - # system aspects - base - cli - desktop - - # other aspects - stylix - niri - ]); - }; -} diff --git a/aspects/users/user_rotterdam.nix b/aspects/users/user_rotterdam.nix deleted file mode 100644 index 36f512d..0000000 --- a/aspects/users/user_rotterdam.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ inputs, lib, ... }: - -{ - flake.homeConfigurations."user@rotterdam" = { - pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = { - inherit inputs; - hostname = "rotterdam"; - }; - modules = [ - { nixpkgs.overlays = [ inputs.self.overlays.default ]; } - { - home = { - username = "user"; - homeDirectory = "/home/user"; - stateVersion = "22.05"; - }; - } - ((inputs.import-tree.initFilter (p: lib.hasSuffix ".nix" p)) ./_user) - ] - ++ (with inputs.self.modules.homeManager; [ - # system aspects - base - cli - desktop - gaming - - # other aspects - stylix - niri - ]); - }; -} From be4553046c151c048cc4bac3bf45f310b32ee5c3 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 19 Feb 2026 09:02:16 -0300 Subject: [PATCH 32/39] nix-ai-tools not that up to date --- aspects/ai.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/aspects/ai.nix b/aspects/ai.nix index e3016e6..99efd60 100644 --- a/aspects/ai.nix +++ b/aspects/ai.nix @@ -4,11 +4,8 @@ { inputs, pkgs, ... }: { environment.systemPackages = - (with pkgs; [ ]) + (with pkgs; [ opencode ]) ++ (with inputs.nix-ai-tools.packages.${pkgs.stdenv.hostPlatform.system}; [ - claude-code - claudebox - opencode ]); }; } From 09b0e64708e2f936e5eed33992cf4ffbb9f48f29 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 19 Feb 2026 09:10:44 -0300 Subject: [PATCH 33/39] determinate nix breaks my systems --- aspects/base/nix.nix | 31 ++--- flake.lock | 322 ++++++++----------------------------------- flake.nix | 1 - 3 files changed, 75 insertions(+), 279 deletions(-) diff --git a/aspects/base/nix.nix b/aspects/base/nix.nix index 29feff8..2442024 100644 --- a/aspects/base/nix.nix +++ b/aspects/base/nix.nix @@ -3,25 +3,24 @@ flake.modules.nixos.nix = { inputs, pkgs, ... }: { - imports = [ - inputs.nixos-cli.nixosModules.nixos-cli - inputs.determinate.nixosModules.default - ]; + imports = [ inputs.nixos-cli.nixosModules.nixos-cli ]; - nix.gc = { - automatic = true; - options = "--delete-older-than 8d"; + nix = { + settings = { + auto-optimise-store = true; + connect-timeout = 10; + log-lines = 25; + min-free = 128000000; + max-free = 1000000000; + trusted-users = [ "@wheel" ]; + }; + extraOptions = "experimental-features = nix-command flakes"; + gc = { + automatic = true; + options = "--delete-older-than 8d"; + }; }; - environment.etc."nix/nix.custom.conf".text = '' - auto-optimise-store = true - connect-timeout = 10 - log-lines = 25 - min-free = 128000000 - max-free = 1000000000 - trusted-users = @wheel - ''; - nixpkgs.config = { allowUnfree = true; enableParallelBuilding = true; diff --git a/flake.lock b/flake.lock index 8b17f1e..20de064 100644 --- a/flake.lock +++ b/flake.lock @@ -135,66 +135,9 @@ "type": "github" } }, - "determinate": { - "inputs": { - "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", - "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", - "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", - "nix": "nix", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1771014593, - "narHash": "sha256-NrCFwn20ewJwy/SZoREs+XylerizPCYP54n9qkr31/E=", - "rev": "69b4ff80ae2bbdd1e3f02ccd76a5f2988b118ed2", - "revCount": 397, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.16.0/019c58b5-64dc-77f9-b913-8738b7d338cc/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/determinate/%2A" - } - }, - "determinate-nixd-aarch64-darwin": { - "flake": false, - "locked": { - "narHash": "sha256-PUo0u1iNMB8eTlBNFMCW8/UAn1sGKGqsIYlXaDRhx00=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" - } - }, - "determinate-nixd-aarch64-linux": { - "flake": false, - "locked": { - "narHash": "sha256-jiIWiM88xkEpBQeohSxhl83fn2xoZY0nFkrW6CUAIAI=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" - } - }, - "determinate-nixd-x86_64-linux": { - "flake": false, - "locked": { - "narHash": "sha256-qF/NNdHwh3tAHrKIOz2FRq5Q8GcSMzJeEY/PFvGf5vo=", - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" - }, - "original": { - "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" - } - }, "disko": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1769524058, @@ -227,22 +170,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -258,7 +185,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1747046372, @@ -275,27 +202,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "determinate", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", - "revCount": 377, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -313,7 +219,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -331,7 +237,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -352,7 +258,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "terranix", @@ -389,32 +295,6 @@ "type": "github" } }, - "git-hooks-nix": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": [ - "determinate", - "nix" - ], - "nixpkgs": [ - "determinate", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", - "revCount": 1026, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" - } - }, "gnome-shell": { "flake": false, "locked": { @@ -521,7 +401,7 @@ "impermanence": { "inputs": { "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1769548169, @@ -552,31 +432,10 @@ "type": "github" } }, - "nix": { - "inputs": { - "flake-parts": "flake-parts", - "git-hooks-nix": "git-hooks-nix", - "nixpkgs": "nixpkgs", - "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1771010067, - "narHash": "sha256-Itk88UC3CxjGjjAb20KI6KrM9tRoGEpbv996fXwAWGo=", - "rev": "5c670e37e884c43e1da0405075c9b9c83d316a6c", - "revCount": 24629, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.16.0/019c589d-45e9-7337-9ff0-a8d78fecf63f/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" - } - }, "nix-ai-tools": { "inputs": { "blueprint": "blueprint", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -631,9 +490,9 @@ }, "nixos-cli": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4", "optnix": "optnix" }, "locked": { @@ -652,31 +511,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", - "revCount": 811874, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" - } - }, - "nixpkgs-23-11": { - "locked": { - "lastModified": 1717159533, - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "lastModified": 1769330179, + "narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", "type": "github" } }, @@ -710,22 +555,6 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1770770419, @@ -742,69 +571,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1770537093, - "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", - "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", - "revCount": 942631, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.942631%2Brev-fef9403a3e4d31b0a23f0bacebbec52c248fbb51/019c4621-ce4f-799f-82f6-b3b29f099b09/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/nixpkgs-weekly/0.1" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1769330179, - "narHash": "sha256-yxgb4AmkVHY5OOBrC79Vv6EVd4QZEotqv+6jcvA212M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "48698d12cc10555a4f3e3222d9c669b884a49dfe", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1768564909, "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", @@ -820,7 +587,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1770843696, "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", @@ -836,7 +603,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1767151656, "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", @@ -852,7 +619,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1759070547, "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", @@ -868,7 +635,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1770562336, "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", @@ -884,7 +651,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1767767207, "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", @@ -900,6 +667,38 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -947,8 +746,8 @@ }, "optnix": { "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_7" + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1765418479, @@ -967,9 +766,8 @@ "root": { "inputs": { "agenix": "agenix", - "determinate": "determinate", "disko": "disko", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "home-manager": "home-manager_2", "impermanence": "impermanence", "import-tree": "import-tree", @@ -977,7 +775,7 @@ "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", "nixos-cli": "nixos-cli", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable", "noctalia": "noctalia", "stylix": "stylix", @@ -993,9 +791,9 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_7", "nur": "nur", "systems": "systems_3", "tinted-foot": "tinted-foot", @@ -1095,7 +893,7 @@ }, "terranix": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixpkgs" ], @@ -1219,7 +1017,7 @@ }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_8", "systems": "systems_5" }, "locked": { @@ -1239,7 +1037,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_4", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1771000521, diff --git a/flake.nix b/flake.nix index c2f801c..2036828 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ # nix tools flake-parts.url = "github:hercules-ci/flake-parts"; import-tree.url = "github:vic/import-tree"; - determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; # nixos/hm nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; From e9c17f10a5f3c999b46b7941b21db46a5cec68ef Mon Sep 17 00:00:00 2001 From: baduhai Date: Thu, 19 Feb 2026 18:29:03 -0300 Subject: [PATCH 34/39] Update readme.md --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 554c5bc..52f8af1 100644 --- a/readme.md +++ b/readme.md @@ -27,14 +27,14 @@ Modular NixOS configuration using flake-parts with the [dendritic](https://githu |------|--------------|------|-------------| | trantor | aarch64-linux | server | ARM server running Forgejo | | alexandria | x86_64-linux | server | x86 server (Kanidm, Vaultwarden, Nextcloud, Jellyfin) | -| rotterdam | x86_64-linux | desktop | Gaming desktop with GPU passthrough | +| rotterdam | x86_64-linux | desktop | Main workstation setup for gaming | | io | x86_64-linux | desktop | Workstation | ## Services - **git.baduhai.dev** (Forgejo) - Publicly accessible on trantor -Other services (LAN/Tailscale only): Kanidm, Vaultwarden, Nextcloud, Jellyfin +Other services (LAN/Tailscale only): Vaultwarden, Nextcloud, Jellyfin ## Features From b16821ef741129fb9053f75325c8831a9e27fab7 Mon Sep 17 00:00:00 2001 From: baduhai Date: Thu, 19 Feb 2026 18:32:43 -0300 Subject: [PATCH 35/39] Update readme.md --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 52f8af1..e36ccec 100644 --- a/readme.md +++ b/readme.md @@ -58,8 +58,8 @@ sudo nixos apply Terraform configurations for cloud infrastructure managed via terranix: -- baduhai.dev DNS -- Cloudflare tunnel endpoints +- baduhai.dev DNS on CloudFlare +- VPS provisioning on OCI - Tailscale subnet routers ## Key Dependencies From 87d75380bb7a1661394f86cc58f00f89a45f47ad Mon Sep 17 00:00:00 2001 From: William Date: Fri, 20 Feb 2026 11:14:31 -0300 Subject: [PATCH 36/39] add beeper to web packages --- aspects/desktop/web.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/aspects/desktop/web.nix b/aspects/desktop/web.nix index 8fb960a..4e4fe5b 100644 --- a/aspects/desktop/web.nix +++ b/aspects/desktop/web.nix @@ -10,6 +10,7 @@ { environment.systemPackages = with pkgs; [ inputs.zen-browser.packages."${pkgs.stdenv.hostPlatform.system}".default + beeper bitwarden-desktop fragments nextcloud-client From 834d4d516090f96e44c58dfa8eb409849acc95ea Mon Sep 17 00:00:00 2001 From: William Date: Sun, 22 Feb 2026 16:08:52 -0300 Subject: [PATCH 37/39] add ungoogled-chromium to web aspect --- aspects/desktop/web.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/aspects/desktop/web.nix b/aspects/desktop/web.nix index 4e4fe5b..9d6494f 100644 --- a/aspects/desktop/web.nix +++ b/aspects/desktop/web.nix @@ -15,6 +15,7 @@ fragments nextcloud-client tor-browser + ungoogled-chromium vesktop ]; }; From 84e7f6c51041f3a0dda2f254881f8b0b630e3b44 Mon Sep 17 00:00:00 2001 From: William Date: Mon, 23 Feb 2026 08:31:38 -0300 Subject: [PATCH 38/39] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nix-ai-tools': 'github:numtide/llm-agents.nix/266d4d8a55eef6dd23cd0adced301053d8fc23c9?narHash=sha256-HQXK2CXAhBuTBw99Ip018Vp9MMAPfJVywgRrkwMUgMc%3D' (2026-02-12) → 'github:numtide/llm-agents.nix/db94a329058a1a37b49d3209af85708b3338559a?narHash=sha256-q5Wsb1573qDfIPJctG9CBZP0NMniejoB7SmBLZIVAHg%3D' (2026-02-23) • Updated input 'nix-ai-tools/blueprint': 'github:numtide/blueprint/c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c?narHash=sha256-zI%2B7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0%3D' (2026-01-25) → 'github:numtide/blueprint/06ee7190dc2620ea98af9eb225aa9627b68b0e33?narHash=sha256-bLqwib%2BrtyBRRVBWhMuBXPCL/OThfokA%2Bj6%2BuH7jDGU%3D' (2026-02-18) • Updated input 'nix-ai-tools/nixpkgs': 'github:NixOS/nixpkgs/2343bbb58f99267223bc2aac4fc9ea301a155a16?narHash=sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8%3D' (2026-02-11) → 'github:NixOS/nixpkgs/d1c15b7d5806069da59e819999d70e1cec0760bf?narHash=sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE%3D' (2026-02-16) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 20de064..a99cac7 100644 --- a/flake.lock +++ b/flake.lock @@ -100,11 +100,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1769353768, - "narHash": "sha256-zI+7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0=", + "lastModified": 1771437256, + "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=", "owner": "numtide", "repo": "blueprint", - "rev": "c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c", + "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33", "type": "github" }, "original": { @@ -439,11 +439,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1770907059, - "narHash": "sha256-HQXK2CXAhBuTBw99Ip018Vp9MMAPfJVywgRrkwMUgMc=", + "lastModified": 1771816560, + "narHash": "sha256-q5Wsb1573qDfIPJctG9CBZP0NMniejoB7SmBLZIVAHg=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "266d4d8a55eef6dd23cd0adced301053d8fc23c9", + "rev": "db94a329058a1a37b49d3209af85708b3338559a", "type": "github" }, "original": { @@ -589,11 +589,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770843696, - "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=", + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", "type": "github" }, "original": { From c3650b73a1310c61c2e67afe0d1347bc4dac852a Mon Sep 17 00:00:00 2001 From: William Date: Mon, 23 Feb 2026 08:32:16 -0300 Subject: [PATCH 39/39] opencode from nix-ai-tools --- aspects/ai.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/aspects/ai.nix b/aspects/ai.nix index 99efd60..f3eb6dd 100644 --- a/aspects/ai.nix +++ b/aspects/ai.nix @@ -4,8 +4,16 @@ { inputs, pkgs, ... }: { environment.systemPackages = - (with pkgs; [ opencode ]) + (with pkgs; [ ]) ++ (with inputs.nix-ai-tools.packages.${pkgs.stdenv.hostPlatform.system}; [ + opencode ]); + + nix.settings = { + extra-substituters = [ "https://cache.numtide.com" ]; + extra-trusted-public-keys = [ + "niks3.numtide.com-1:DTx8wZduET09hRmMtKdQDxNNthLQETkc/yaX7M4qK0g=" + ]; + }; }; }