From 3cf2b491ed03fa1d9b56a2b194186495649935dd Mon Sep 17 00:00:00 2001 From: ocfox Date: Mon, 8 Jul 2024 19:25:34 +0800 Subject: [PATCH] mesa broken :( --- flake.lock | 80 +++++++++++++++++------------------ hosts/silverfox/_hardware.nix | 5 +-- hosts/silverfox/nix.nix | 11 +++++ 3 files changed, 53 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 4dc2a6b..f388488 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1716561646, - "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "lastModified": 1718371084, + "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=", "owner": "ryantm", "repo": "agenix", - "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "rev": "3a56735779db467538fb2e577eda28a9daacaca6", "type": "github" }, "original": { @@ -50,11 +50,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1718291710, - "narHash": "sha256-yp3pQStGFCd0qSAULA7RaI9evMRZHPuN4dUuNNOhH80=", + "lastModified": 1720277930, + "narHash": "sha256-A1D2H6FQotrpbfq+ge1jpCScFiLYrwKCK8If2qsvmTM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "edbd85ef842fad14b8fe26cad2067868674dcf8d", + "rev": "d30a5f8d5414996f587679dc4fb4e29b4b02830b", "type": "github" }, "original": { @@ -107,11 +107,11 @@ ] }, "locked": { - "lastModified": 1718242063, - "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", + "lastModified": 1720402389, + "narHash": "sha256-zJv6euDOrJWMHBhxfp/ay+Dvjwpe8YtMuEI5b09bxmo=", "owner": "nix-community", "repo": "disko", - "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", + "rev": "f1a00e7f55dc266ef286cc6fc8458fa2b5ca2414", "type": "github" }, "original": { @@ -122,11 +122,11 @@ }, "factorio-versions": { "locked": { - "lastModified": 1717813000, - "narHash": "sha256-0HbBc9Etj+lbwW4MpULc5/AvY3aSPSj0BcJrzLylMy0=", + "lastModified": 1719973023, + "narHash": "sha256-liAdGVNtWjvstyvSaj6fpUHUwXqr6NJphcA132SvSB8=", "owner": "ocfox", "repo": "factorio-versions", - "rev": "12d46dc687e70ca840e6c73e4786cc1fb02fbb8f", + "rev": "fa76e6840ee602874e47183d1020baa2969ca95e", "type": "github" }, "original": { @@ -155,11 +155,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1719677234, + "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d", "type": "github" }, "original": { @@ -250,11 +250,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1720327769, + "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", "type": "github" }, "original": { @@ -272,11 +272,11 @@ ] }, "locked": { - "lastModified": 1718173451, - "narHash": "sha256-ySzjpSDAmecKsoSqgqjKfEsgzRMiI87pLLJgY8haP+s=", + "lastModified": 1719631702, + "narHash": "sha256-HMWxIehVO8pHp7OlqBYliiLOds34UJHSRn5FPdEb1j8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "326c1ab2b816f520d298b7a4319a0b50cde01c48", + "rev": "2f9668e19aff06550cd154c87c0af120735a56a4", "type": "github" }, "original": { @@ -335,11 +335,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1716699938, - "narHash": "sha256-AzTYm22tTDJy0tSqMDf95rmCxxoGTPClu0paGPeh5a0=", + "lastModified": 1718588737, + "narHash": "sha256-06acqoMEYtc+/w5gWiIIuUFfdtdOBKlp1qrC/InRiBY=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "842306255856d7f5677c113e699101eb253e2e3f", + "rev": "b0a2376f6c164a0af963d47386c064cc6fdcd5ea", "type": "github" }, "original": { @@ -366,14 +366,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1719876945, + "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, "nixpkgs_2": { @@ -394,11 +394,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1718149104, - "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", + "lastModified": 1720368505, + "narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", + "rev": "ab82a9612aa45284d4adf69ee81871a389669a9e", "type": "github" }, "original": { @@ -443,11 +443,11 @@ "papermod": { "flake": false, "locked": { - "lastModified": 1715438495, - "narHash": "sha256-NpO7VEXApOpOXznvhbSWWdxBrzn+xn81OGyUGe4/Hzc=", + "lastModified": 1718995633, + "narHash": "sha256-Ko0ZwQlYlPg6dq0L8LFdA2Mw9q/Gr9PfmpTmuLloh8E=", "owner": "adityatelange", "repo": "hugo-papermod", - "rev": "3f50861a0ced88f9b614a43662edeb4c0bc45da8", + "rev": "9ea3bb0e1f3aa06ed7715e73b5fabb36323f7267", "type": "github" }, "original": { diff --git a/hosts/silverfox/_hardware.nix b/hosts/silverfox/_hardware.nix index 33608e0..f63d128 100644 --- a/hosts/silverfox/_hardware.nix +++ b/hosts/silverfox/_hardware.nix @@ -33,7 +33,6 @@ # set to false, or use with impure :( hardware.asahi.extractPeripheralFirmware = false; - hardware.asahi.peripheralFirmwareDirectory = /boot; - - hardware.asahi.useExperimentalGPUDriver = true; + # hardware.asahi.peripheralFirmwareDirectory = /boot/asahi; + # hardware.asahi.useExperimentalGPUDriver = true; } diff --git a/hosts/silverfox/nix.nix b/hosts/silverfox/nix.nix index 140f082..394f98b 100644 --- a/hosts/silverfox/nix.nix +++ b/hosts/silverfox/nix.nix @@ -18,7 +18,18 @@ }; settings = { + trusted-users = [ + "root" + "ocfox" + ]; nix-path = [ "nixpkgs=${inputs.nixpkgs}" ]; + substituters = [ + "https://cache.garnix.io" + ]; + trusted-public-keys = [ + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + ]; auto-optimise-store = true; }; + }