aboutsummaryrefslogtreecommitdiff
path: root/nixos/machine
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-06-27 21:55:07 +0200
committerKarel Kočí <cynerd@email.cz>2022-06-27 22:03:38 +0200
commit16dba0e7e389319cec6967e628d85837f5d46915 (patch)
tree6c8d09d1ff6c2c79d8406635f81f561bbf97c7a4 /nixos/machine
parentdbfa517f33ab35f78d8dc3f246aa0078d3db8e05 (diff)
downloadnixos-personal-16dba0e7e389319cec6967e628d85837f5d46915.tar.gz
nixos-personal-16dba0e7e389319cec6967e628d85837f5d46915.tar.bz2
nixos-personal-16dba0e7e389319cec6967e628d85837f5d46915.zip
nixos/machine/ridcully: update
Diffstat (limited to 'nixos/machine')
-rw-r--r--nixos/machine/binky.nix4
-rw-r--r--nixos/machine/ridcully.nix34
2 files changed, 33 insertions, 5 deletions
diff --git a/nixos/machine/binky.nix b/nixos/machine/binky.nix
index 6ec37d3..c7e319a 100644
--- a/nixos/machine/binky.nix
+++ b/nixos/machine/binky.nix
@@ -12,11 +12,14 @@ with lib;
};
wifiClient = true;
develop = true;
+ gaming = true;
};
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage" "sd_mod"];
boot.kernelModules = ["kvm-amd"];
+ hardware.cpu.amd.updateMicrocode = true;
+
boot.initrd.luks.devices = {
"encroot".device = "/dev/disk/by-uuid/b317feb5-d68d-4ec3-a24f-0307c116cac8";
};
@@ -61,7 +64,6 @@ with lib;
config = "config /run/secrets/elektroline.ovpn";
};
- cynerd.gaming = true;
};
diff --git a/nixos/machine/ridcully.nix b/nixos/machine/ridcully.nix
index 882f967..4c0bba9 100644
--- a/nixos/machine/ridcully.nix
+++ b/nixos/machine/ridcully.nix
@@ -5,15 +5,28 @@ with lib;
{
config = {
- cynerd.desktop.enable = true;
+ cynerd = {
+ desktop.enable = true;
+ develop = true;
+ gaming = true;
+ };
+
+ boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "usb_storage"];
+ boot.kernelModules = ["kvm-amd"];
+ hardware.cpu.amd.updateMicrocode = true;
+
+ cynerd.autounlock = {
+ "encroot" = "/dev/disk/by-uuid/c07e929a-6eac-4f99-accf-f7cb3431290c";
+ "enchdd" = "/dev/disk/by-uuid/7fee3cda-efa0-47cd-8832-fdead9a7e6db";
+ };
fileSystems = {
"/" = {
- device = "/dev/disk/by-uuid/3b3063aa-c284-4075-bb37-8820df12a2f5";
+ device = "/dev/mapper/encroot";
options = ["compress=lzo" "subvol=@nix"];
};
"/home" = {
- device = "/dev/disk/by-uuid/3b3063aa-c284-4075-bb37-8820df12a2f5";
+ device = "/dev/mapper/encroot";
options = ["compress=lzo" "subvol=@home"];
};
"/boot" = {
@@ -21,11 +34,24 @@ with lib;
};
"/home2" = {
- device = "/dev/disk/by-uuid/c9aa0b7b-7482-4d4a-bcc3-8bd6a853ae7f";
+ device = "/dev/mapper/enchdd";
options = ["compress=lzo" "subvol=@home"];
};
};
+ services.syncthing = {
+ enable = true;
+ user = mkDefault "cynerd";
+ group = mkDefault "cynerd";
+ openDefaultPorts = true;
+
+ overrideDevices = false;
+ overrideFolders = false;
+
+ dataDir = "/home/cynerd";
+ configDir = "/home/cynerd/.config/syncthing";
+ };
+
};
}