diff --git a/flake.lock b/flake.lock index fbfe3f2..a10187f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,63 @@ { "nodes": { + "attic": { + "inputs": { + "crane": [ + "chaotic", + "crane" + ], + "flake-compat": [ + "chaotic", + "flake-compat" + ], + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1705617092, + "narHash": "sha256-n9PK4O4X4S1JkwpkMuYm1wHZYJzRqif8g3RuVIPD+rY=", + "rev": "fbe252a5c21febbe920c025560cbd63b20e24f3b", + "revCount": 191, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.191%2Brev-fbe252a5c21febbe920c025560cbd63b20e24f3b/018d1eb4-19ca-72b0-a38d-3b3cce0cae5b/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" + } + }, "chaotic": { "inputs": { + "attic": "attic", "compare-to": "compare-to", + "conduit": "conduit", + "crane": "crane", + "fenix": "fenix", + "flake-compat": "flake-compat", "flake-schemas": "flake-schemas", + "flake-utils": "flake-utils", "home-manager": "home-manager", "jovian": "jovian", + "jujutsu": "jujutsu", + "niri": "niri", + "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", "systems": "systems", "yafas": "yafas" }, "locked": { - "lastModified": 1706798619, - "narHash": "sha256-U2UYfVYjX3bXnAsv3C98yWcDDlQVmk2eCB0XxDzA20o=", + "lastModified": 1706978170, + "narHash": "sha256-mS5Ex8OKfZYp6M8nUdFQt7Ppuc50QdGtZgbJJROjbWs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "82f97c8aa5b842be752e65933901cb20506a90bf", + "rev": "c73af1d6032e139a37f3918d32d0665ca987b93d", "type": "github" }, "original": { @@ -36,7 +78,73 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/0.1.2.tar.gz" + "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" + } + }, + "conduit": { + "inputs": { + "attic": [ + "chaotic", + "attic" + ], + "crane": [ + "chaotic", + "crane" + ], + "fenix": [ + "chaotic", + "fenix" + ], + "flake-compat": [ + "chaotic", + "flake-compat" + ], + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nix-filter": [ + "chaotic", + "nix-filter" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706844761, + "narHash": "sha256-5BcXmVy5QPXplCT9fJ4A0+Tru0kG2sAR7qYwdxVrwvo=", + "owner": "famedly", + "repo": "conduit", + "rev": "72a13d83539a4df7c0f126b5854642e210c506b0", + "type": "gitlab" + }, + "original": { + "owner": "famedly", + "ref": "next", + "repo": "conduit", + "type": "gitlab" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706473297, + "narHash": "sha256-FbxuYIrHaXpsYCLtI1gCNJhd+qvERjPibXL3ctmVaCs=", + "rev": "fe812ef0dad5bb93a56c599d318be176d080281d", + "revCount": 493, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.1/018d51be-1c17-765e-babc-c9e3bc8a5a14/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz" } }, "disko": { @@ -46,11 +154,11 @@ ] }, "locked": { - "lastModified": 1706491084, - "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=", + "lastModified": 1707095972, + "narHash": "sha256-iQ2jpCCwYWpk4UcPEgQqRSOVsY2p8GkPmz/lJw47Cvo=", "owner": "nix-community", "repo": "disko", - "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9", + "rev": "2e9b88f02ec166b1c3f0a638688f8e4ef444de32", "type": "github" }, "original": { @@ -61,7 +169,7 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs-unstable" ], @@ -105,23 +213,43 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1706768574, + "narHash": "sha256-4o6TMpzBHO659EiJTzd/EGQGUDdbgwKwhqf3u6b23U8=", + "rev": "668102037129923cd0fc239d864fce71eabdc6a3", + "revCount": 1762, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1762%2Brev-668102037129923cd0fc239d864fce71eabdc6a3/018d63bb-6455-7a2f-98c6-74a36b8216a4/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz" + } + }, "flake-compat": { + "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz" } }, "flake-compat_2": { - "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -137,6 +265,22 @@ } }, "flake-compat_3": { + "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_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -214,19 +358,39 @@ }, "flake-schemas": { "locked": { - "lastModified": 1697467827, - "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", - "rev": "764932025c817d4e500a8d2a4d8c565563923d29", - "revCount": 29, + "lastModified": 1693491534, + "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", + "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", + "revCount": 21, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.1.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" } }, "flake-utils": { + "inputs": { + "systems": [ + "chaotic", + "systems" + ] + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "revCount": 90, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.90%2Brev-1ef2e671c3b0c19053962c07dbda38332dcebf26/018d0c5a-ac7d-77f2-bef1-1527903ad3cc/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -244,7 +408,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -262,7 +426,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -280,7 +444,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -353,7 +517,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/nix-community/home-manager/0.1.0.tar.gz" + "url": "https://flakehub.com/f/nix-community/home-manager/0.1.%2A.tar.gz" } }, "home-manager_2": { @@ -363,11 +527,11 @@ ] }, "locked": { - "lastModified": 1706798041, - "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", + "lastModified": 1707114923, + "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", + "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7", "type": "github" }, "original": { @@ -385,11 +549,11 @@ ] }, "locked": { - "lastModified": 1706509827, - "narHash": "sha256-fnZ8BXDgfvXGwStQvmpUXe+I+Fjd2JCLm8xo0kVwVKc=", + "lastModified": 1706954734, + "narHash": "sha256-R3t6ehjMXbLFUOB8BHJKzY1URALHztIvHyokvBII6+g=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e2c026d8efea340d2a2dcc56775212979dd51ef2", + "rev": "19057dafa099eb312d6c91175932f8880b68ed0f", "type": "github" }, "original": { @@ -398,11 +562,74 @@ "type": "github" } }, + "jujutsu": { + "inputs": { + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1706970432, + "narHash": "sha256-56nws7EAkx5ud8RiM2zeZZc06V+bvsXX73OpsMBXbGo=", + "owner": "martinvonz", + "repo": "jj", + "rev": "31e4061bab6cfc835e8ac65d263c29e99c937abf", + "type": "github" + }, + "original": { + "owner": "martinvonz", + "repo": "jj", + "type": "github" + } + }, + "niri": { + "inputs": { + "crane": [ + "chaotic", + "crane" + ], + "fenix": [ + "chaotic", + "fenix" + ], + "flake-utils": [ + "chaotic", + "flake-utils" + ], + "nix-filter": [ + "chaotic", + "nix-filter" + ], + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706940006, + "narHash": "sha256-+Y7dnq8gwVxefwvRnamqGneCTI4uUXgAo0SEffIvNB0=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "72c8f569aca37ec45420b086a1aa488f5c4a2bd7", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-alien": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nix-filter": "nix-filter", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nix-filter": "nix-filter_2", "nix-index-database": "nix-index-database", "nixpkgs": [ "nix-alien", @@ -425,6 +652,21 @@ } }, "nix-filter": { + "locked": { + "lastModified": 1705332318, + "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, + "nix-filter_2": { "locked": { "lastModified": 1701697642, "narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=", @@ -487,11 +729,11 @@ ] }, "locked": { - "lastModified": 1706411424, - "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", + "lastModified": 1707016097, + "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", + "rev": "3e3dad2808379c522138e2e8b0eb73500721a237", "type": "github" }, "original": { @@ -502,8 +744,8 @@ }, "nix-ld-rs": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -522,7 +764,7 @@ }, "nix-wallpaper": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], @@ -562,16 +804,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", - "revCount": 577948, + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "revCount": 578631, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.577948%2Brev-97b17f32362e475016f942bbdfda4a4a72a8a652/018d5e85-4e02-7200-b411-d764d60cd44e/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.578631%2Brev-b8b232ae7b8b144397fdb12d20f592e5e7c1a64d/018d6a7d-21b4-7935-bdaf-4c8682c7e5b1/source.tar.gz" }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz" + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, "nixpkgs-lib": { @@ -593,6 +835,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1702780907, + "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1673800717, "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", @@ -610,11 +868,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1706683685, - "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", + "lastModified": 1706925685, + "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d", + "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", "type": "github" }, "original": { @@ -674,11 +932,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { @@ -743,11 +1001,11 @@ }, "nur": { "locked": { - "lastModified": 1706867093, - "narHash": "sha256-AjZ17vssveafF7hflOl3Hp8EeZ89frQrP/R37AeLta0=", + "lastModified": 1707121924, + "narHash": "sha256-eeFSNid3MuGouOM3OgxtiZEtxOpX0Ckln80AhTk93Yo=", "owner": "nix-community", "repo": "NUR", - "rev": "b059a4cc6638f3be13c710dbbf1ee537eeb37359", + "rev": "7da4a8a9a76d5b62aba41fe9063341829f7e5707", "type": "github" }, "original": { @@ -782,11 +1040,11 @@ ] }, "locked": { - "lastModified": 1706718414, - "narHash": "sha256-qOwU5X0nG4nJ3xBSKWfJ9ROf6T2r7jThO85AiBimwgc=", + "lastModified": 1707045317, + "narHash": "sha256-o2NZJcNu2/M3qycZ2Z9sgIESQEBFmihbbA7//sp7yVA=", "owner": "pjones", "repo": "plasma-manager", - "rev": "91b5335d4310e94527a8a778d5e8884c43340276", + "rev": "290cd65b65e2da11ca9fda69781ea9beb8a6f6ac", "type": "github" }, "original": { @@ -797,7 +1055,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": [ "nix-wallpaper", "flake-utils" @@ -807,7 +1065,7 @@ "nix-wallpaper", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1675337566, @@ -842,6 +1100,50 @@ "plasma-manager": "plasma-manager" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1706735270, + "narHash": "sha256-IJk+UitcJsxzMQWm9pa1ZbJBriQ4ginXOlPyVq+Cu40=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "42cb1a2bd79af321b0cc503d2960b73f34e2f92b", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "chaotic", + "jujutsu", + "flake-utils" + ], + "nixpkgs": [ + "chaotic", + "jujutsu", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705457855, + "narHash": "sha256-5cCHQtP/PEHK1YNTQyZN9v8ehpLTjc723ZSKAP3Tva8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a854609265af0e9f48c92e497679edf8fab9e690", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1689347949, @@ -944,7 +1246,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.0.tar.gz" + "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz" } } }, diff --git a/systems/nixos-pulse/disko.nix b/systems/nixos-pulse/disko.nix index 7cdab5a..edd813e 100644 --- a/systems/nixos-pulse/disko.nix +++ b/systems/nixos-pulse/disko.nix @@ -1,3 +1,12 @@ +let + cryptOpenArgs = [ + "--allow-discards" + "--perf-same_cpu_crypt" + "--perf-submit_from_crypt_cpus" + "--perf-no_read_workqueue" + "--perf-no_write_workqueue" + ]; +in { disko.devices = { disk = { @@ -18,7 +27,7 @@ content = { type = "luks"; name = "crypted_0"; - extraOpenArgs = [ "--allow-discards" ]; + extraOpenArgs = cryptOpenArgs; passwordFile = "/tmp/secret.key"; additionalKeyFiles = [ ]; # content is empty here as the btrfs partition will be created via extraArgs of the cryptroot_1 partition def @@ -30,7 +39,7 @@ content = { type = "luks"; name = "crypted_swap_0"; - extraOpenArgs = [ "--allow-discards" ]; + extraOpenArgs = cryptOpenArgs; passwordFile = "/tmp/secret.key"; additionalKeyFiles = [ ]; content = { @@ -66,7 +75,7 @@ content = { type = "luks"; name = "crypted_1"; - extraOpenArgs = [ "--allow-discards" ]; + extraOpenArgs = cryptOpenArgs; passwordFile = "/tmp/secret.key"; additionalKeyFiles = [ ]; content = { @@ -123,7 +132,7 @@ content = { type = "luks"; name = "crypted_swap_1"; - extraOpenArgs = [ "--allow-discards" ]; + extraOpenArgs = cryptOpenArgs; passwordFile = "/tmp/secret.key"; additionalKeyFiles = [ ]; content = {