diff --git a/flake.lock b/flake.lock index fc8fa69..2f95e44 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1782250391, - "narHash": "sha256-/zZoFZs4AWncVkPVChEzZL9ZH+lcMvfHCiQmszOBuBY=", + "lastModified": 1783198589, + "narHash": "sha256-4G0GEhcRz7UwE8M+eovOfuxk+RpjH1e1KFZuzvmeTjM=", "owner": "tadfisher", "repo": "android-nixpkgs", - "rev": "2aae16866c51caa236c4c44e9afa08485180e3b0", + "rev": "aa95c5edd6b1ccf2b8e495b572fb8bccd791227b", "type": "github" }, "original": { @@ -76,11 +76,11 @@ ] }, "locked": { - "lastModified": 1781520503, - "narHash": "sha256-XuqQQG1qRyc3o8ld937sDLQNx+QrGV852KJ0dNglJDg=", + "lastModified": 1783079127, + "narHash": "sha256-mNuifmp/gJ73tsLDAf6Q4iwhuDCSrS88G7BlvAsa42E=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "43043ad207529650f9fa68e1705f7cf9c08bfdeb", + "rev": "8c666069ee3070445b1040f9aa357b78c08eb9ce", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "crane": { "locked": { - "lastModified": 1765145449, - "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", + "lastModified": 1781825982, + "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", "owner": "ipetkov", "repo": "crane", - "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", + "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", "type": "github" }, "original": { @@ -185,15 +185,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -299,11 +299,11 @@ ] }, "locked": { - "lastModified": 1782233665, - "narHash": "sha256-h/xOtrByoA/Ak1lWHn0O1lVZz4qWYbwOSLQ8YSwQO0I=", + "lastModified": 1783222121, + "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=", "owner": "nix-community", "repo": "home-manager", - "rev": "062581938b4a378a82dfbb294b494808157153a1", + "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266", "type": "github" }, "original": { @@ -413,16 +413,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765382359, - "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", + "lastModified": 1782141370, + "narHash": "sha256-hqijVSEETttmo8Okql9/LG0Ua34hdciKW1a5zzlj8mU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", + "rev": "7c9a54a7f87b4539ddbd8bda09a8a5f5f9361aa9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v1.0.0", + "ref": "v1.1.0", "repo": "lanzaboote", "type": "github" } @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1782166108, - "narHash": "sha256-/EtnQBcKbsaCAGQ5VRcplrHRkR4ryqyLMpBfkVuG9Xw=", + "lastModified": 1782562157, + "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "875776f0252fcb8618bb948640a0d1f7a5b362be", + "rev": "a9cf7546a938c737b079e738de73934a13de9784", "type": "github" }, "original": { @@ -475,11 +475,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", + "lastModified": 1783214977, + "narHash": "sha256-0lkauQbtrljJqwtzTCILPAiHAJyMvn6XDo264moDv30=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "rev": "6edbf1a6a03e75886a6609c088801a0856449e88", "type": "github" }, "original": { @@ -653,11 +653,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1781733627, + "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", "type": "github" }, "original": { @@ -709,11 +709,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1782012058, + "narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c", "type": "github" }, "original": { @@ -853,16 +853,17 @@ }, "locked": { "dir": "nix", - "lastModified": 1779523646, - "narHash": "sha256-E15h/hkUc9VhxZWKGm5/LZ34gTaFli5pNiWJ1PJu3qs=", - "owner": "AndyFilter", + "lastModified": 1774866951, + "narHash": "sha256-zAQ35OHXGhGo+Zbi7lhNt/0XfjGUZfNG9fyoZrvAZvg=", + "owner": "kitten", "repo": "yeetmouse", - "rev": "ed4c9392fb77599112ba5debfe87f8824f4a0a0e", + "rev": "784d7a4609c46bdbc542ec63961fede682ca9b9a", "type": "github" }, "original": { "dir": "nix", - "owner": "AndyFilter", + "owner": "kitten", + "ref": "@kitten/fix/nix-build-gui-config-changes", "repo": "yeetmouse", "type": "github" } @@ -877,11 +878,11 @@ ] }, "locked": { - "lastModified": 1782144240, - "narHash": "sha256-RgCWSv7AJZCwPhCzz+J0lvwp1WBz9ouvCnnlmvu0xfw=", + "lastModified": 1783190846, + "narHash": "sha256-UcdKHKcDxLxBon0HsOjDRRA7l1vVT28R83LkCIAlYYc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d1693556428967f8b4eef128feb090421ddcaf15", + "rev": "0758bc86f7a55bbe002f0cede9e1a49e5a6e34d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index acc45ec..c4eac57 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ }; lanzaboote = { - url = "github:nix-community/lanzaboote/v1.0.0"; + url = "github:nix-community/lanzaboote/v1.1.0"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -51,7 +51,7 @@ }; yeetmouse = { - url = "github:AndyFilter/yeetmouse?dir=nix"; + url = "github:kitten/yeetmouse/@kitten/fix/nix-build-gui-config-changes?dir=nix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/machines/pepper/hardware.nix b/machines/pepper/hardware.nix index 3e36dcf..5f6e1d0 100755 --- a/machines/pepper/hardware.nix +++ b/machines/pepper/hardware.nix @@ -12,8 +12,6 @@ ]; boot = { - bootspec.enable = true; - initrd = { availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; }; diff --git a/modules/base/linux.nix b/modules/base/linux.nix index 72b74f6..3bab36c 100644 --- a/modules/base/linux.nix +++ b/modules/base/linux.nix @@ -31,7 +31,6 @@ in helpers.linuxAttrs { }; boot = { - bootspec.enable = mkDefault true; consoleLogLevel = mkDefault 2; loader = {