aires/nix-configuration
aires/nix-configuration
1
0
Fork 0
Code Actions Activity

Apps: add Element; RAID: Fix keyfile syntax

Browse source
This commit is contained in:
Aires 2024-09-18 10:15:06 -04:00
parent f52c831759
commit 0efee8cfe0
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -233,11 +233,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726489388, "lastModified": 1726650330,
"narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", "narHash": "sha256-UbHzmaOQ18O/kCizipU70N0UQVFIfv8AiFKXw07oZ9Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", "rev": "abb448608a56a60075468e90d8acec2a7cb689b1",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
modules/apps/social.nix
View file

@ -18,7 +18,10 @@ in
allowUnfree = true; allowUnfree = true;
ui.flatpak = { ui.flatpak = {
enable = true; enable = true;
packages = [ "com.discordapp.Discord" ]; packages = [
"com.discordapp.Discord"
"im.riot.Riot" # Element
];
}; };
}; };

10
modules/system/raid.nix
View file

@ -17,9 +17,9 @@ in
}; };
keyFile = lib.mkOption { keyFile = lib.mkOption {
default = ""; default = "";
type = lib.types.path; type = lib.types.str;
description = "Path to the key file to use to auto-unlock the array."; 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 # Auto-unlock RAID array with a key file
environment.etc."crypttab".text = lib.mkIf (cfg.storage.keyFile != "") '' environment.etc."crypttab" = lib.mkIf (cfg.storage.keyFile != "") {
storage /dev/md/Sapana ${toString cfg.storage.keyFile} nofail,keyfile-timeout=5s text = "storage /dev/md/Sapana ${cfg.storage.keyFile} nofail,keyfile-timeout=5s";
''; };
fileSystems."/storage" = { fileSystems."/storage" = {
device = "/dev/mapper/storage"; device = "/dev/mapper/storage";
# Keep booting even if the array fails to unlock # Keep booting even if the array fails to unlock