Apps: add Element; RAID: Fix keyfile syntax
This commit is contained in:
parent
f52c831759
commit
0efee8cfe0
|
@ -233,11 +233,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1726489388,
|
||||
"narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=",
|
||||
"lastModified": 1726650330,
|
||||
"narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9",
|
||||
"rev": "abb448608a56a60075468e90d8acec2a7cb689b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -18,7 +18,10 @@ in
|
|||
allowUnfree = true;
|
||||
ui.flatpak = {
|
||||
enable = true;
|
||||
packages = [ "com.discordapp.Discord" ];
|
||||
packages = [
|
||||
"com.discordapp.Discord"
|
||||
"im.riot.Riot" # Element
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -17,9 +17,9 @@ in
|
|||
};
|
||||
keyFile = lib.mkOption {
|
||||
default = "";
|
||||
type = lib.types.path;
|
||||
type = lib.types.str;
|
||||
description = "Path to the key file to use to auto-unlock the array.";
|
||||
example = /home/user/storage.key;
|
||||
example = "/home/user/storage.key";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -35,9 +35,9 @@ in
|
|||
'';
|
||||
|
||||
# Auto-unlock RAID array with a key file
|
||||
environment.etc."crypttab".text = lib.mkIf (cfg.storage.keyFile != "") ''
|
||||
storage /dev/md/Sapana ${toString cfg.storage.keyFile} nofail,keyfile-timeout=5s
|
||||
'';
|
||||
environment.etc."crypttab" = lib.mkIf (cfg.storage.keyFile != "") {
|
||||
text = "storage /dev/md/Sapana ${cfg.storage.keyFile} nofail,keyfile-timeout=5s";
|
||||
};
|
||||
fileSystems."/storage" = {
|
||||
device = "/dev/mapper/storage";
|
||||
# Keep booting even if the array fails to unlock
|
||||
|
|
Loading…
Reference in a new issue