diff --git a/clhickey-nixos/configuration.nix b/clhickey-nixos/configuration.nix
index d5715be..4a01680 100644
--- a/clhickey-nixos/configuration.nix
+++ b/clhickey-nixos/configuration.nix
@@ -9,6 +9,9 @@
   cos.username = "clhickey";
   cos.hostName = "clhickey-nixos";
 
+  cos.winboat.enable = true;
+  cos.docker.enable = true;
+
   boot = {
     loader = {
       systemd-boot.enable = true;
diff --git a/cos.nix b/cos.nix
index 6c3330e..531862a 100644
--- a/cos.nix
+++ b/cos.nix
@@ -4,6 +4,7 @@
     ./hyprland.nix
     ./wireguard.nix
     ./winboat.nix
+    ./docker.nix
     "${inputs.home-manager}/nixos"
   ];
 
diff --git a/docker.nix b/docker.nix
new file mode 100644
index 0000000..bd92311
--- /dev/null
+++ b/docker.nix
@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+let cfg = config.cos.docker; in
+{
+  options.cos.docker = {
+    enable = lib.mkEnableOption "Enable Docker";
+  };
+
+  config = lib.mkIf cfg.enable {
+    virtualisation.docker.enable = true;
+
+    users.users.${config.cos.username}.extraGroups = [
+      "docker"
+    ];
+  };
+}
diff --git a/winboat.nix b/winboat.nix
index e3d4a8a..345e8fb 100644
--- a/winboat.nix
+++ b/winboat.nix
@@ -8,11 +8,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    virtualisation.docker.enable = true;
-
-    users.users.${config.cos.username}.extraGroups = [
-      "docker"
-    ];
+    cos.docker.enable = true;
 
     environment.systemPackages = [
       inputs.winboat.packages.x86_64-linux.winboat