diff --git a/hosts/algiz/default.nix b/hosts/algiz/default.nix
index 9c6577a..f8556a5 100644
--- a/hosts/algiz/default.nix
+++ b/hosts/algiz/default.nix
@@ -1,17 +1,22 @@
 {
   self,
   pkgs,
+  lib,
   ...
-}: {
+}: 
+let inherit (lib) enabled;
+in {
   imports = with self.nixosModules; [
-    docker
     restic
   ];
 
-  oizys.languages = [
+  oizys = {languages = [
     "nim"
     "python"
   ];
+  docker = enabled;
+
+};
 
   environment.systemPackages = with pkgs; [
     rclone
diff --git a/hosts/mannaz/default.nix b/hosts/mannaz/default.nix
index fb91413..57539c5 100644
--- a/hosts/mannaz/default.nix
+++ b/hosts/mannaz/default.nix
@@ -1,9 +1,12 @@
-{self, ...}: {
+{self, lib, ...}: let inherit (lib) enabled; in {
   imports = with self.nixosModules; [
     nix-ld
   ];
 
-  oizys.desktop.enable = true;
+  oizys = {
+    desktop = enabled;
+    nix-ld = enabled;
+};
 
   # Enable the X11 windowing system.
   services.xserver = {
diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix
index 107275c..bb84bf6 100644
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@@ -8,7 +8,6 @@
 in {
   imports = with self.nixosModules; [
     restic
-    docker
   ];
 
   oizys = {
@@ -20,6 +19,7 @@ in {
       "node"
     ];
     nix-ld = enabled;
+    docker = enabled;
     vbox = enabled;
     desktop = enabled;
     vpn = enabled;
diff --git a/modules/common.nix b/modules/common.nix
index 38b0736..dc22a0c 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -20,6 +20,7 @@
     hyprland
 
     virtualbox
+    docker
 
     gui
 
diff --git a/modules/virtualization/docker.nix b/modules/virtualization/docker.nix
index 73f335b..d0d5fd1 100644
--- a/modules/virtualization/docker.nix
+++ b/modules/virtualization/docker.nix
@@ -1,6 +1,18 @@
-{pkgs, ...}: {
+{pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf;
+  cfg = config.oizys.docker;
+in {
+  options.oizys.docker.enable = mkEnableOption "enable docker support";
+
+  config = mkIf cfg.enable {
+
   virtualisation.docker.enable = true;
   environment.systemPackages = with pkgs; [
     lazydocker
   ];
+};
 }
diff --git a/modules/virtualization/virtualbox.nix b/modules/virtualization/virtualbox.nix
index 79627e6..9b1d4c6 100644
--- a/modules/virtualization/virtualbox.nix
+++ b/modules/virtualization/virtualbox.nix
@@ -7,7 +7,9 @@
   cfg = config.oizys.vbox;
 in {
   options.oizys.vbox.enable = mkEnableOption "enable virtualbox host";
+
   config = mkIf cfg.enable {
+
     virtualisation.virtualbox = {
       host.enable = true;
     };