Switch boot partition (#126)

This commit is contained in:
Patrick Stevens
2025-09-06 15:21:17 +01:00
committed by GitHub
parent d56963e330
commit 2d09c607d2
6 changed files with 51 additions and 30 deletions

60
flake.lock generated
View File

@@ -3,14 +3,15 @@
"apple-silicon": { "apple-silicon": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1751622568, "lastModified": 1756110286,
"narHash": "sha256-EE3NBsej517VRa1x+ylAghrvngftxf1KgfHlE9OYyXE=", "narHash": "sha256-NE0HwcQCQTgM+HuYqmiemPf/5e+3fjwowceAyJj+ikU=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "eba4b40c816e5aff8951ae231ac237e8aab8ec1d", "rev": "b99bf9bf7445416fe55da09034fc4a6cd733805c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -26,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751313918, "lastModified": 1757015938,
"narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=", "narHash": "sha256-1qBXNK/QxEjCqIoA2DxWn5gqM8rVxt+OxKodXu1GLTY=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf", "rev": "eaacfa1101b84225491d2ceae9549366d74dc214",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -42,11 +43,11 @@
}, },
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1688025799, "lastModified": 1746162366,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -80,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751729568, "lastModified": 1757075491,
"narHash": "sha256-ay7O1jjalUxkL23QWLv9C2s8rdVGs3hUOPZClIbUHKs=", "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f117b383dd591fd579bce5ee7bac07a3fdc1d050", "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -107,11 +108,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748460289, "lastModified": 1755615617,
"narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -123,11 +124,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1751625545, "lastModified": 1756911493,
"narHash": "sha256-4E7wWftF1ExK5ZEDzj41+9mVgxtuRV3wWCId7QAYMAU=", "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c860cf0b3a0829f0f6cf344ca8de83a2bbfab428", "rev": "c6a788f552b7b7af703b1a29802a7233c0067908",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -176,6 +177,27 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"apple-silicon",
"nixpkgs"
]
},
"locked": {
"lastModified": 1754847726,
"narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"whisper": { "whisper": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",

View File

@@ -4,7 +4,6 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {
@@ -23,7 +22,7 @@
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/9248-31C6"; device = "/dev/disk/by-uuid/5BCD-7078";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"]; options = ["fmask=0022" "dmask=0022"];
}; };

View File

@@ -13,6 +13,8 @@
enable32Bit = true; enable32Bit = true;
}; };
hardware.bluetooth.enable = true;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

View File

@@ -5,10 +5,7 @@
hardware.asahi.peripheralFirmwareDirectory = ./../firmware; hardware.asahi.peripheralFirmwareDirectory = ./../firmware;
hardware.asahi = { hardware.asahi = {
useExperimentalGPUDriver = true;
experimentalGPUInstallMode = "overlay";
setupAsahiSound = true; setupAsahiSound = true;
withRust = true;
}; };
hardware.graphics.enable = true; hardware.graphics.enable = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
@@ -75,7 +72,6 @@
environment.systemPackages = [ environment.systemPackages = [
pkgs.vim pkgs.vim
pkgs.wget pkgs.wget
pkgs.mesa-asahi-edge
]; ];
environment.loginShellInit = '' environment.loginShellInit = ''

View File

@@ -321,7 +321,6 @@
++ ( ++ (
if nixpkgs.stdenv.isLinux if nixpkgs.stdenv.isLinux
then [ then [
nixpkgs.ghostty
nixpkgs.kdePackages.xwaylandvideobridge nixpkgs.kdePackages.xwaylandvideobridge
nixpkgs.protonmail-bridge nixpkgs.protonmail-bridge
nixpkgs.pinentry nixpkgs.pinentry

View File

@@ -1,6 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
programs.ghostty = { programs.ghostty = {
enable = true; enable = pkgs.stdenv.isLinux;
enableZshIntegration = true; enableZshIntegration = true;
settings = { settings = {
keybind = [ keybind = [
@@ -9,7 +9,10 @@
}; };
}; };
home.packages = [ home.packages =
if pkgs.stdenv.isLinux
then [
pkgs.ghostty pkgs.ghostty
]; ]
else [];
} }