diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix index c82105c..5a26043 100644 --- a/modules/nixos/hardware/nvidia.nix +++ b/modules/nixos/hardware/nvidia.nix @@ -55,7 +55,7 @@ presets.nvidia-gpu.enable = true; }; - # Enable nvidia-container-toolkit if virtualization is enabled - hardware.nvidia-container-toolkit.enable = lib.mkIf config.osbmModules.virtualization.docker.enable true; + # Enable nvidia-container-toolkit if virtualisation is enabled + hardware.nvidia-container-toolkit.enable = lib.mkIf config.osbmModules.virtualisation.docker.enable true; }; } diff --git a/modules/nixos/options.nix b/modules/nixos/options.nix index ca78024..d3ec044 100644 --- a/modules/nixos/options.nix +++ b/modules/nixos/options.nix @@ -340,7 +340,7 @@ }; }; - virtualization = { + virtualisation = { docker = { enable = lib.mkOption { type = lib.types.bool; diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix index dd01a58..1f653ca 100644 --- a/modules/nixos/system/default.nix +++ b/modules/nixos/system/default.nix @@ -5,7 +5,7 @@ ./nix-settings.nix ./agenix.nix ./home-manager.nix - ./virtualization.nix + ./virtualisation.nix ./emulation.nix ./i18n.nix ./impermanence.nix diff --git a/modules/nixos/system/users.nix b/modules/nixos/system/users.nix index 4bee1a5..e8f3862 100644 --- a/modules/nixos/system/users.nix +++ b/modules/nixos/system/users.nix @@ -14,7 +14,7 @@ in "networkmanager" ] ++ lib.optional (username == config.osbmModules.defaultUser) "wheel" - ++ lib.optional config.osbmModules.virtualization.docker.enable "docker" + ++ lib.optional config.osbmModules.virtualisation.docker.enable "docker" ++ lib.optional config.osbmModules.programs.adbFastboot.enable "adbusers"; })) diff --git a/modules/nixos/system/virtualization.nix b/modules/nixos/system/virtualisation.nix similarity index 93% rename from modules/nixos/system/virtualization.nix rename to modules/nixos/system/virtualisation.nix index cbf4142..29fc84d 100644 --- a/modules/nixos/system/virtualization.nix +++ b/modules/nixos/system/virtualisation.nix @@ -1,6 +1,6 @@ { lib, config, ... }: let - cfg = config.osbmModules.virtualization; + cfg = config.osbmModules.virtualisation; in { config = lib.mkMerge [