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

upd

Browse Source
This commit is contained in:
mjallen18
2026-01-02 14:41:08 -06:00
parent 451f5aa726
commit 56fb195967
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,8 +143,8 @@ in
}; };
}; };
}; };
firmware = lib.mkIf cfg.enableFirmware { firmware = lib.mkIf cfg.firmware.enableFirmware {
device = "/dev/mmcblk0"; device = cfg.firmware.firmwareDrive;
type = "disk"; type = "disk";
imageSize = "1G"; imageSize = "1G";
content = { content = {

5
modules/nixos/disko/options.nix
View File

@@ -19,7 +19,10 @@ in
enableLuks = mkBoolOpt false "Enable Luks"; enableLuks = mkBoolOpt false "Enable Luks";
enableFirmware = mkBoolOpt false "Enable rpi firmware part"; firmware = {
enableFirmware = mkBoolOpt false "Enable rpi firmware part";
firmwareDisk = mkOpt types.str "/dev/mmcblk0" "UEFI firmware disk";
};
swapSize = mkOpt types.str "16G" "size of swap part"; swapSize = mkOpt types.str "16G" "size of swap part";

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

@@ -27,6 +27,8 @@ 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; {

5
systems/aarch64-linux/pi4/default.nix
View File

@@ -29,7 +29,10 @@
hardware = { hardware = {
disko = { disko = {
enable = true; enable = true;
enableFirmware = false; firmware = {
enableFirmware = true;
firmwareDisk = "/dev/mmcblk1";
};
}; };
raspberry-pi = { raspberry-pi = {
enable = true; enable = true;