Thor: simpler setup

This commit is contained in:
Filippo Berto 2025-01-18 19:51:51 +01:00
parent fb2b022db8
commit 95e54d5ea0
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
2 changed files with 35 additions and 65 deletions

View file

@ -25,23 +25,8 @@
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd = {
checkJournalingFS = true;
luks.devices = {
root = {
device = "/dev/disk/by-id/nvme-Sabrent_Rocket_4.0_1TB_A0D6070C1AA788202455-part2";
preLVM = true;
allowDiscards = true;
bypassWorkqueues = true;
};
nvme2t = {
device = "/dev/disk/by-id/nvme-SHPP41-2000GM_SJC4N477711004A0J";
preLVM = true;
allowDiscards = true;
bypassWorkqueues = true;
};
};
};
initrd.checkJournalingFS = true;
};
console = {

View file

@ -1,72 +1,57 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ modulesPath, ... }:
{ config, lib, modulesPath, ... }:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot = {
extraModulePackages = [ ];
initrd = {
availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"usbhid"
"sd_mod"
];
kernelModules = [ "dm-snapshot" ];
};
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "uas" "sd_mod" ];
initrd.kernelModules = [ ];
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
device = "/dev/nvme1n1p2";
fsType = "btrfs";
options = [
"subvol=@root"
"x-gvfs-hide"
"space_cache=v2"
"discard"
"compress-force=zstd:1"
];
options = [ "subvol=@root" ];
};
"/nix" = {
device = "/dev/nvme1n1p2";
fsType = "btrfs";
options = [ "subvol=@nix" ];
};
"/boot" = {
device = "/dev/disk/by-uuid/B9D2-255C";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
"/home/bertof" = {
device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
device = "/dev/nvme1n1p2";
fsType = "btrfs";
options = [
"subvol=@home_bertof"
"x-gvfs-hide"
"space_cache=v2"
"discard"
"compress-force=zstd:1"
];
};
"/nix" = {
device = "/dev/disk/by-uuid/6c06428e-c296-4ef1-8429-62bafb860126";
fsType = "btrfs";
options = [
"subvol=@nix"
"x-gvfs-hide"
"space_cache=v2"
"discard"
"compress-force=zstd:1"
];
options = [ "subvol=@home_bertof" ];
};
};
# swapDevices = [
# { device = "/dev/disk/by-uuid/dee188e4-4ff8-417c-9419-b7f00ecb9989"; }
# {
# device = "/swapfile";
# size = 1024 * 32;
# }
# ];
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
# networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}