feat: cleanup post btrfs epic crash

BTRFS had a bug and we know how it goes.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
This commit is contained in:
raito 2024-07-04 13:13:22 +02:00
parent c96bce2975
commit 1b1c6b2849
6 changed files with 30 additions and 49 deletions

View file

@ -302,22 +302,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-for-kernel": {
"locked": {
"lastModified": 1708680708,
"narHash": "sha256-K2SxCGk13nLOFMeNG1RjzFDrh513VtzFzFhp0NsnJRY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "593000b7d1e21cd84c7ecd965a64916b0982b202",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "593000b7d1e21cd84c7ecd965a64916b0982b202",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1711460390, "lastModified": 1711460390,
@ -376,7 +360,6 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-for-kernel": "nixpkgs-for-kernel",
"nur": "nur", "nur": "nur",
"srvos": "srvos" "srvos": "srvos"
} }

View file

@ -11,8 +11,6 @@
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
# contains kernel 6.7.5, do not update
nixpkgs-for-kernel.url = "github:NixOS/nixpkgs/593000b7d1e21cd84c7ecd965a64916b0982b202";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";

View file

@ -2,9 +2,6 @@
let let
gcc-system-features = arch: lib.optionals (arch != null) ([ "gccarch-${arch}" ] gcc-system-features = arch: lib.optionals (arch != null) ([ "gccarch-${arch}" ]
++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${arch}); ++ map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${arch});
pkgsForKernel = import inputs.nixpkgs-for-kernel {
system = "x86_64-linux";
};
in in
{ {
imports = [ imports = [
@ -12,7 +9,6 @@ in
../modules/hardware/supermicro-H12SSL-i.nix ../modules/hardware/supermicro-H12SSL-i.nix
../modules/iperf-server.nix ../modules/iperf-server.nix
../modules/hypervisor.nix ../modules/hypervisor.nix
../modules/hydra/coordinator.nix
../modules/android-cache.nix ../modules/android-cache.nix
../modules/garage.nix ../modules/garage.nix
../modules/users/friends.nix ../modules/users/friends.nix
@ -21,17 +17,13 @@ in
networking.hostName = "epyc"; networking.hostName = "epyc";
security.acme.acceptTerms = true;
security.acme.defaults.email = "epyc@lahfa.xyz";
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
virtualisation.docker = { boot.kernelPackages = pkgs.linuxPackages_latest;
enable = true;
rootless.enable = true;
};
# TODO: there's a critical bug on 6.8+ where btrfs won't mount the rootfs at all.
# Do not upgrade until it is fixed. Ping Raito when needed.
boot.kernelPackages = pkgsForKernel.linuxPackages_6_7;
# Open public access to our PostgreSQL. # Open public access to our PostgreSQL.
services.postgresql.enable = true; services.postgresql.enable = true;

View file

@ -34,7 +34,6 @@ in
pkgs.gh pkgs.gh
pkgs.nix pkgs.nix
pkgs.nix-output-monitor pkgs.nix-output-monitor
inputs.attic.packages.x86_64-linux.attic
]; ];
environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}"; environment.PYTHONPATH = "${python.withPackages (_: [package])}/${python.sitePackages}";
environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989''; environment.MASTER_URL = ''TCP:2a01\\:e34\\:ec2a\\:8e60\\:8ec7\\:b5d2\\:f663\\:a67a:9989'';

View file

@ -14,33 +14,43 @@
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.initrd.extraUtilsCommands = '' boot.initrd.services.lvm.enable = true;
copy_bin_and_libs ${pkgs.nvme-cli}/bin/nvme boot.initrd.systemd.enable = true;
copy_bin_and_libs ${pkgs.util-linux}/bin/blkzone
copy_bin_and_libs ${pkgs.util-linux}/bin/lsblk
'';
boot.initrd.systemd.enable = lib.mkForce false; fileSystems."/experiments" =
{ device = "/dev/disk/by-uuid/40ef7d25-91c5-41e4-a40f-b0fb93658ffe";
fileSystems."/" = fsType = "ext4";
{ device = "/dev/disk/by-uuid/3a81ba8f-f5bb-446c-89a3-ad77e354dae0";
fsType = "btrfs";
}; };
boot.initrd.luks.devices."nixroot" = { fileSystems."/" =
device = "/dev/disk/by-uuid/c10d2822-cb83-4666-98f8-0aa04be259bc"; { device = "/dev/disk/by-uuid/53cc33a3-1488-44c4-8f5d-a2bc67914274";
keyFile = "/dev/zero"; fsType = "xfs";
keyFileSize = 1; };
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/cee7b903-53f6-4967-b95d-654d34ccd460";
fsType = "xfs";
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/5625935d-579b-41e4-be35-03df8437bc2c";
fsType = "xfs";
};
fileSystems."/var" =
{ device = "/dev/disk/by-uuid/33bf7f4e-37f5-4121-84ac-70d06964ea21";
fsType = "xfs";
};
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/AFF2-3149"; { device = "/dev/disk/by-uuid/AFF2-3149";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/93e251e1-1bfc-4bd4-8585-ea2eae7795bf"; } [ { device = "/dev/disk/by-uuid/93e251e1-1bfc-4bd4-8585-ea2eae7795bf"; }
]; ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View file

@ -6,7 +6,6 @@
whois whois
nix-output-monitor nix-output-monitor
inputs.attic.packages.x86_64-linux.attic
jq jq
psmisc psmisc
libarchive libarchive