tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Merge branch 'zenix/master' into alpine/master

Browse source
This commit is contained in:
Tristan 2025-01-18 00:25:15 +00:00
commit 2c406b36d3
38 changed files with 843 additions and 360 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hardware/alpine.nix
View file

@ -62,7 +62,6 @@ in {
"minfreespace=50G"
"fsname=mergerfs"
"category.create=mfs"
"cache.files=auto-all"
"dropcacheonclose=true"
];
};

5
hardware/fcs-tristan-nixbook.nix
View file

@ -6,7 +6,6 @@
...
}: let
user = config.user;
decrypt = import ../lib/decrypt.nix;
in {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
@ -24,7 +23,7 @@ in {
};
boot.initrd.luks.devices."usbkey" = {
device = "/dev/disk/by-id/usb-Generic_Flash_Disk_BCC97785-0:0";
device = "/dev/disk/by-label/usbkey1";
};
boot.initrd.luks.devices."cryptroot" = {
@ -32,7 +31,7 @@ in {
keyFileSize = 4096;
preOpenCommands = ''
mkdir -m 0755 -p /key
mount -n -t vfat -o ro /dev/mapper/usbkey /key
mount -n -o ro /dev/mapper/usbkey /key
'';
keyFile = "/key/keyfile";
preLVM = false;

27
hardware/zenix.nix
View file

@ -6,7 +6,6 @@
...
}: let
user = config.user;
decrypt = import ../lib/decrypt.nix;
in {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
@ -20,7 +19,7 @@ in {
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/2dad5ed6-44cc-4d9d-9392-32afaa7b3909";
device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = ["subvol=@" "compress=zstd" "autodefrag"];
};
@ -32,30 +31,38 @@ in {
options = ["noatime"];
};
boot.initrd.postDeviceCommands = pkgs.lib.mkBefore (decrypt {
keydevice = "/dev/disk/by-id/usb-Generic_Flash_Disk_BCC97785-0:0";
keypartname = "usbkey";
});
boot.initrd.luks.devices."usbkey" = {
device = "/dev/disk/by-label/usbkey1";
};
boot.initrd.luks.devices."cryptroot" = {
device = "/dev/disk/by-uuid/cc0617df-8cbf-4618-abbc-df64c96de151";
keyFileSize = 4096;
preOpenCommands = ''
mkdir -m 0755 -p /key
mount -n -o ro /dev/mapper/usbkey /key
'';
keyFile = "/key/keyfile";
preLVM = false;
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/2dad5ed6-44cc-4d9d-9392-32afaa7b3909";
device = "/dev/mapper/cryptroot";
fsType = "btrfs";
options = ["subvol=@home" "compress=zstd" "autodefrag"];
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/FE7E-0DE3";
device = "/dev/disk/by-label/boot";
fsType = "vfat";
};
swapDevices = [{device = "/dev/disk/by-uuid/da57b489-ab77-4830-b710-9f96cf43d053";}];
boot.plymouth.enable = true;
boot.initrd.verbose = false;
boot.consoleLogLevel = 1;
boot.kernelParams = ["quiet" "udev.log_level=3"];
swapDevices = [{device = "/dev/disk/by-label/swap";}];
# 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
@ -64,7 +71,7 @@ in {
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
networking.networkmanager.insertNameservers = ["1.1.1.1" "1.0.0.1"];
networking.networkmanager.appendNameservers = ["1.1.1.1" "1.0.0.1"];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;