BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

framework-2024-12-09-13-26-44

Browse Source
This commit is contained in:
Alexander Szczepanski
2024-12-09 13:26:44 +01:00
parent aa336cf497
commit a1c2ce484c
3 changed files with 50 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
machine/framework/configuration.nix
View File

@ -14,6 +14,7 @@ in {
../../configs/common-linux.nix
../../configs/docker.nix
../../configs/games.nix
../../configs/hardware.nix
../../configs/virtualization.nix
../../configs/plasma.nix
../../configs/user-gui.nix
@ -21,7 +22,7 @@ in {
];
sops = {
defaultSopsFile = ../../secrets-framework.yaml;
defaultSopsFile = ../../secrets/secrets-framework.yaml;
secrets = {
borg-key = {
@ -85,11 +86,11 @@ in {
}
{
temp = 65;
speed = 25;
speed = 20;
}
{
temp = 70;
speed = 35;
speed = 25;
}
{
temp = 75;
@ -205,13 +206,8 @@ in {
msr-tools
quota
mergerfs
snapraid
gparted
homebank
# fahviewer
# fahcontrol
];
};

32
machine/framework/hardware-configuration.nix
View File

@ -85,24 +85,24 @@
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
};
"/home/alex/shared/storage" = {
device = "/dev/disk/by-uuid/58259976-4f63-4f60-a755-7870b08286e7";
fsType = "btrfs";
options = [
"subvol=@data"
"discard=async"
"compress=zstd"
"nodiratime"
"noatime"
"nofail"
"x-systemd.automount"
];
};
# "/home/alex/shared/storage" = {
# device = "/dev/disk/by-uuid/58259976-4f63-4f60-a755-7870b08286e7";
# fsType = "btrfs";
# options = [
# "subvol=@data"
# "discard=async"
# "compress=zstd"
# "nodiratime"
# "noatime"
# "nofail"
# "x-systemd.automount"
# ];
# };
};
environment.etc.crypttab.text = ''
luks-e36ec189-2211-4bcc-bb9d-46650443d76b UUID=e36ec189-2211-4bcc-bb9d-46650443d76b /persist/luks-key01
'';
# environment.etc.crypttab.text = ''
# luks-e36ec189-2211-4bcc-bb9d-46650443d76b UUID=e36ec189-2211-4bcc-bb9d-46650443d76b /persist/luks-key01
# '';
swapDevices = [
{