colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

servo: port to Ryzen/x86 machine

Browse Source
This commit is contained in:
colin 2022-11-29 02:20:18 +00:00
parent b9533d7ee3
commit ff9c26b03d
3 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flake.nix
View File

@ -94,7 +94,7 @@
# - `nixos-rebuild --flake './#<host>' switch` # - `nixos-rebuild --flake './#<host>' switch`
img = nixosConfiguration.config.system.build.img; img = nixosConfiguration.config.system.build.img;
}; };
hosts.servo = decl-bootable-host { name = "servo"; local = "aarch64-linux"; target = "aarch64-linux"; }; hosts.servo = decl-bootable-host { name = "servo"; local = "x86_64-linux"; target = "x86_64-linux"; };
hosts.desko = decl-bootable-host { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; }; hosts.desko = decl-bootable-host { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
hosts.lappy = decl-bootable-host { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; }; hosts.lappy = decl-bootable-host { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
hosts.moby = decl-bootable-host { name = "moby"; local = "aarch64-linux"; target = "aarch64-linux"; }; hosts.moby = decl-bootable-host { name = "moby"; local = "aarch64-linux"; target = "aarch64-linux"; };
@ -102,7 +102,6 @@
# note that these *do* produce different store paths, because the closure for the tools used to cross compile # note that these *do* produce different store paths, because the closure for the tools used to cross compile
# v.s. emulate differ. # v.s. emulate differ.
# so deploying foo-cross and then foo incurs some rebuilding. # so deploying foo-cross and then foo incurs some rebuilding.
hosts.servo-cross = decl-bootable-host { name = "servo"; local = "x86_64-linux"; target = "aarch64-linux"; };
hosts.moby-cross = decl-bootable-host { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; }; hosts.moby-cross = decl-bootable-host { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; };
hosts.rescue = decl-bootable-host { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; }; hosts.rescue = decl-bootable-host { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
in { in {

7
hosts/servo/default.nix
View File

@ -3,7 +3,6 @@
{ {
imports = [ imports = [
./fs.nix ./fs.nix
./hardware.nix
./net.nix ./net.nix
./users.nix ./users.nix
./services ./services
@ -13,18 +12,14 @@
# for administering services # for administering services
pkgs.matrix-synapse pkgs.matrix-synapse
pkgs.freshrss pkgs.freshrss
pkgs.libraspberrypi
]; ];
sane.impermanence.enable = true; sane.impermanence.enable = true;
# sane.services.duplicity.enable = true; # TODO: re-enable after HW upgrade # sane.services.duplicity.enable = true; # TODO: re-enable after HW upgrade
sane.services.nixserve.enable = true; sane.services.nixserve.enable = true;
sane.services.nixserve.sopsFile = ../../secrets/servo.yaml; sane.services.nixserve.sopsFile = ../../secrets/servo.yaml;
# TODO: look into the EFI stuff
boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true;
boot.loader.efi.canTouchEfiVariables = false; boot.loader.efi.canTouchEfiVariables = false;
sane.image.extraBootFiles = [ pkgs.bootpart-u-boot-rpi-aarch64 ]; sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
sops.secrets.duplicity_passphrase = { sops.secrets.duplicity_passphrase = {
sopsFile = ../../secrets/servo.yaml; sopsFile = ../../secrets/servo.yaml;

33
hosts/servo/fs.nix
View File

@ -16,32 +16,29 @@
device = "none"; device = "none";
fsType = "tmpfs"; fsType = "tmpfs";
options = [ options = [
"size=40G"
"mode=777" "mode=777"
"defaults" "defaults"
]; ];
}; };
fileSystems."/nix" = { fileSystems."/nix" = {
device = "/dev/disk/by-uuid/aa272cff-0fcc-498e-a4cb-0d95fb60631b"; device = "/dev/disk/by-uuid/cc81cca0-3cc7-4d82-a00c-6243af3e7776";
fsType = "btrfs"; fsType = "btrfs";
options = [
"compress=zstd"
"defaults"
];
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/31D3-40CB"; device = "/dev/disk/by-uuid/6EE3-4171";
fsType = "vfat"; fsType = "vfat";
}; };
# fileSystems."/var/lib/pleroma" = {
# device = "/opt/pleroma";
# options = [ "bind" ];
# };
# in-memory compressed RAM (seems to be dynamically sized) # in-memory compressed RAM (seems to be dynamically sized)
zramSwap = { # zramSwap = {
enable = true; # enable = true;
}; # };
# btrfs doesn't easily support swapfiles # btrfs doesn't easily support swapfiles
# swapDevices = [ # swapDevices = [
@ -59,11 +56,11 @@
# 19 # set part type to Linux swap # 19 # set part type to Linux swap
# w # write changes # w # write changes
# mkswap -L swap <part> # mkswap -L swap <part>
swapDevices = [ # swapDevices = [
{ # {
label = "swap"; # label = "swap";
# TODO: randomEncryption.enable = true; # # TODO: randomEncryption.enable = true;
} # }
]; # ];
} }