mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
mjallen18
2026-01-02 14:45:58 -06:00
parent 56fb195967
commit 579c83164e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/nixos/disko/default.nix
View File

@@ -144,7 +144,7 @@ in
}; };
}; };
firmware = lib.mkIf cfg.firmware.enableFirmware { firmware = lib.mkIf cfg.firmware.enableFirmware {
device = cfg.firmware.firmwareDrive; device = cfg.firmware.firmwareDisk;
type = "disk"; type = "disk";
imageSize = "1G"; imageSize = "1G";
content = { content = {

10
modules/nixos/user/default.nix
View File

@@ -8,7 +8,13 @@
with lib; with lib;
let let
inherit (lib.${namespace}) mkOpt mkBoolOpt; inherit (lib.${namespace}) mkOpt mkBoolOpt;
cfg = config.${namespace}.user; cfg = config.${namespace}.user // {
hashedPasswordFile = (if (config.${namespace}.user.hashedPassword == null &&
config.${namespace}.user.hashedPasswordFile == null &&
config.${namespace}.user.password == null) then
defaultPasswordFile else null
);
};
# Common SSH keys used across systems # Common SSH keys used across systems
commonSshKeys = [ commonSshKeys = [
@@ -27,8 +33,6 @@ let
]; ];
defaultPasswordFile = config.sops.secrets."matt_password".path; defaultPasswordFile = config.sops.secrets."matt_password".path;
cfg.hashedPasswordFile = (if (cfg.hashedPassword == null && cfg.hashedPasswordFile == null && cfg.password == null) then defaultPasswordFile else null);
in in
{ {
options.${namespace}.user = with types; { options.${namespace}.user = with types; {