rouven.seifert/nixos-config
1
1
Fork 0
mirror of https://git.sr.ht/~rouven/nixos-config synced 2024-11-15 05:13:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

thinkpad: revert to btrfs

Browse source 
zfs just randomly decided to fail
This commit is contained in:
Rouven Seifert 2024-03-22 17:24:57 +01:00
parent 1c2f5c95e6
commit a16bc598a4
Signed by: rouven.seifert
GPG key ID: B95E8FE6B11C4D09
3 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hosts/thinkpad/default.nix
View file

@ -24,7 +24,7 @@
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot = { boot = {
kernelModules = [ "v4l2loopback" ]; kernelModules = [ "v4l2loopback" ];
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; kernelPackages = pkgs.linuxPackages_latest;
extraModulePackages = [ extraModulePackages = [
config.boot.kernelPackages.v4l2loopback config.boot.kernelPackages.v4l2loopback
]; ];
@ -59,7 +59,7 @@
devmon.enable = true; # automount stuff devmon.enable = true; # automount stuff
upower.enable = true; upower.enable = true;
fwupd.enable = true; # firmware updates fwupd.enable = true; # firmware updates
zfs.autoScrub.enable = true; btrfs.autoScrub.enable = true;
}; };
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;

40
hosts/thinkpad/hardware-configuration.nix
View file

@ -35,29 +35,37 @@
}; };
fileSystems."/nix" = # fileSystems."/" =
{ # { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
device = "rpool/nixos/nix"; # fsType = "btrfs";
fsType = "zfs"; # options = [ "subvol=root" ];
# };
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
fsType = "btrfs";
options = [ "subvol=home" "compress=zstd" ];
}; };
fileSystems."/var/lib" = fileSystems."/nix" =
{ { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
device = "rpool/nixos/var/lib"; fsType = "btrfs";
fsType = "zfs"; options = [ "subvol=nix" "compress=zstd" "noatime"];
}; };
fileSystems."/var/log" = fileSystems."/var/log" =
{ { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
device = "rpool/nixos/var/log"; fsType = "btrfs";
fsType = "zfs"; options = [ "subvol=log" "compress=zstd" ];
}; };
fileSystems."/home" = fileSystems."/var/lib" =
{ { device = "/dev/disk/by-uuid/43e42607-bc44-45de-a2c1-a09a4e34daf1";
device = "rpool/nixos/home"; fsType = "btrfs";
fsType = "zfs"; options = [ "subvol=lib" "compress=zstd" ];
}; };
fileSystems."/" = fileSystems."/" =
{ {
device = "tmpfs"; device = "tmpfs";
@ -67,7 +75,7 @@
fileSystems."/boot" = fileSystems."/boot" =
{ {
device = "/dev/disk/by-uuid/DF86-7611"; device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat"; fsType = "vfat";
}; };

16
hosts/thinkpad/modules/security/default.nix
View file

@ -35,13 +35,13 @@
# This setting is usually set to true in configuration.nix # This setting is usually set to true in configuration.nix
# generated at installation time. So we force it to false # generated at installation time. So we force it to false
# for now. # for now.
loader.systemd-boot.enable = lib.mkForce false; loader.systemd-boot.enable = lib.mkForce true;
lanzaboote = { # lanzaboote = {
enable = true; # enable = true;
pkiBundle = "/etc/secureboot"; # pkiBundle = "/etc/secureboot";
configurationLimit = 10; # configurationLimit = 10;
}; # };
loader.systemd-boot.editor = false; # loader.systemd-boot.editor = false;
loader.efi.canTouchEfiVariables = true; # loader.efi.canTouchEfiVariables = true;
}; };
} }