diff --git a/.stfolder/syncthing-folder-e45d76.txt b/.stfolder/syncthing-folder-e45d76.txt new file mode 100644 index 0000000..7aed9b7 --- /dev/null +++ b/.stfolder/syncthing-folder-e45d76.txt @@ -0,0 +1,5 @@ +# This directory is a Syncthing folder marker. +# Do not delete. + +folderID: m7vwl-vsa6c +created: 2026-01-25T20:17:26-05:00 diff --git a/modules/nixos/system/agenix/default.nix b/modules/nixos/system/agenix/default.nix index 9799df9..bbe3497 100644 --- a/modules/nixos/system/agenix/default.nix +++ b/modules/nixos/system/agenix/default.nix @@ -3,23 +3,22 @@ lib, pkgs, ... -}: -with lib; let +}: let cfg = config.system.agenix; in { options.system.agenix = { enable = - mkEnableOption "Enable agenix"; + lib.mkEnableOption "Enable agenix"; - identityPaths = mkOption { + identityPaths = lib.mkOption { default = ["/persistent/age-tpm.txt"]; example = '' ["/persistent/age-tpm.txt", "/etc/ssh/ssh_host_ed25519_key"] ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; description = "List of identity paths for agenix"; }; - secrets = mkOption { + secrets = lib.mkOption { default = ["/persistent/age-tpm.txt"]; example = '' { @@ -31,7 +30,7 @@ in { }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { # Load the TPM drivers in the initram to allow for decryption of agenix # secrets. boot.initrd.availableKernelModules = ["tpm_crb" "tpm_tis"]; diff --git a/modules/nixos/system/impermanence/default.nix b/modules/nixos/system/impermanence/default.nix index 85375d6..0d110b4 100644 --- a/modules/nixos/system/impermanence/default.nix +++ b/modules/nixos/system/impermanence/default.nix @@ -2,13 +2,12 @@ config, lib, ... -}: -with lib; let +}: let cfg = config.system.impermanence; in { - options.system.impermanence.enable = mkEnableOption "Enable impermanence"; + options.system.impermanence.enable = lib.mkEnableOption "Enable impermanence"; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = config.fileSystems."/persistent".fsType or null == "btrfs"; diff --git a/modules/nixos/system/network/default.nix b/modules/nixos/system/network/default.nix index df4145c..f0764b8 100644 --- a/modules/nixos/system/network/default.nix +++ b/modules/nixos/system/network/default.nix @@ -2,24 +2,23 @@ config, lib, ... -}: -with lib; let +}: let cfg = config.system.network; in { options.system.network = { - hostName = mkOption { + hostName = lib.mkOption { example = "sachiel-vm"; - type = types.str; + type = lib.types.str; description = "System hostname"; }; - wireless.enable = mkEnableOption "Enable wireless"; + wireless.enable = lib.mkEnableOption "Enable wireless"; }; config = { networking = { inherit (cfg) hostName; - wireless.iwd = mkIf cfg.wireless.enable { + wireless.iwd = lib.mkIf cfg.wireless.enable { enable = true; settings = { Network = {