diff --git a/common/user.nix b/common/user.nix index 9e7bbf9..3237d1c 100644 --- a/common/user.nix +++ b/common/user.nix @@ -6,7 +6,7 @@ let # Celerrime macOS "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF0GX4/09I5B7nVeU3EKw58VyKNsbwpi4KzuJrgpoVfR ivabus@celerrime-x" # Celerrime NixOS - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKp/t0ImyVYqaxVda8XP6fcxJVkf+Sc4oo3x5a5j2Gk ivabus@celerrime" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMDgplnr0Rgv6osbq7pwmFuKQ1/egXg52gbLmswuvCiT ivabus@celerrime" ]; in rec { options.my.users = { diff --git a/machines/celerrime/default.nix b/machines/celerrime/default.nix index 2cd61d7..e14bc37 100644 --- a/machines/celerrime/default.nix +++ b/machines/celerrime/default.nix @@ -43,9 +43,9 @@ in { # Setup asahi-specific things. NOTE: you must copy firmware from ESP to /etc/nixos/asahi/firmware hardware.asahi.peripheralFirmwareDirectory = ../../asahi/firmware; - hardware.asahi.addEdgeKernelConfig = true; hardware.asahi.useExperimentalGPUDriver = true; hardware.asahi.setupAsahiSound = true; + boot.m1n1CustomLogo = ../../asahi/logo.png; environment.systemPackages = with pkgs; [ (retroarch.override { cores = with libretro; [ np2kai ]; }) ]; diff --git a/machines/celerrime/hardware.nix b/machines/celerrime/hardware.nix index 7fd5d9a..0450d9d 100644 --- a/machines/celerrime/hardware.nix +++ b/machines/celerrime/hardware.nix @@ -17,20 +17,21 @@ boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "/dev/disk/by-uuid/679b5c29-3e7f-4449-96f0-7e5890302e32"; + device = "/dev/disk/by-uuid/4b0a6b8a-a85c-4256-9d83-e46d47e0d017"; fsType = "btrfs"; + options = [ "compress=zstd" "noatime" ]; }; boot.initrd.luks.devices."nixos-root".device = - "/dev/disk/by-uuid/845370c8-5841-4c9e-b50b-c3a70f6fd2b6"; + "/dev/disk/by-uuid/528c8aa3-d15d-4b23-bbb5-d21cd3edee4b"; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/2AC0-1B04"; + device = "/dev/disk/by-uuid/A65B-1700"; fsType = "vfat"; }; swapDevices = [{ - device = "/dev/disk/by-partuuid/8bd4586f-e44b-41b3-a060-52ba7773237f"; + device = "/dev/disk/by-partuuid/6d6e837c-d63c-4254-afff-88b69787024f"; randomEncryption.enable = true; }];