cullmann/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup neko config for tmpfs/btrfs/luks

Browse source
This commit is contained in:
Christoph Cullmann 2023-06-09 18:26:35 +02:00
parent 8c5b984620
commit a9eecc6d9a
3 changed files with 71 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

7
neko/configuration.nix
View file

@ -1,6 +1,6 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
# and in the NixOS manual (accessible by running `nixos-help`).
{ config, pkgs, ... }:
@ -11,10 +11,9 @@
./hardware-configuration.nix
# Shared config of all machines
/home/cullmann/install/nixos/common.nix
/data/nixos/common.nix
];
# host name & id
# host name
networking.hostName = "neko";
networking.hostId = "eb707291";
}

50
neko/hardware-configuration.nix
View file

@ -9,26 +9,64 @@
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "i915" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
# Intel ARC
boot.kernelParams = [ "i915.force_probe=56a0" "i915.enable_guc=1" ];
fileSystems."/" =
{ device = "none";
fsType = "tmpfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/9CF2-12FF";
{ device = "/dev/disk/by-uuid/D6ED-7B8C";
fsType = "vfat";
};
fileSystems."/boot-fallback" =
{ device = "/dev/disk/by-uuid/9CF2-9E07";
{ device = "/dev/disk/by-uuid/D6ED-BC4A";
fsType = "vfat";
};
boot.initrd.luks.devices."crypt-disk1".device = "/dev/disk/by-uuid/d24c36a7-d39c-4de5-8fc0-33ff0262e964";
boot.initrd.luks.devices."crypt-disk1".allowDiscards = true;
boot.initrd.luks.devices."crypt-disk1".bypassWorkqueues = true;
boot.initrd.luks.devices."crypt-disk2".device = "/dev/disk/by-uuid/cde8caa0-be38-4ff8-a3b3-aa82bc587550";
boot.initrd.luks.devices."crypt-disk2".allowDiscards = true;
boot.initrd.luks.devices."crypt-disk2".bypassWorkqueues = true;
fileSystems."/nix" =
{ device = "/dev/mapper/crypt-disk1";
fsType = "btrfs";
options = [ "device=/dev/mapper/crypt-disk2" "subvol=nix" "noatime" "compress=zstd" ];
};
fileSystems."/data" =
{ device = "/dev/mapper/crypt-disk1";
fsType = "btrfs";
options = [ "device=/dev/mapper/crypt-disk2" "subvol=data" "noatime" "compress=zstd" ];
};
fileSystems."/home" =
{ device = "/data/home";
fsType = "none";
options = [ "bind" ];
};
fileSystems."/root" =
{ device = "/data/root";
fsType = "none";
options = [ "bind" ];
};
fileSystems."/etc/nixos" =
{ device = "/data/nixos/neko";
fsType = "none";
options = [ "bind" ];
};
swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}