diff --git a/modules/default.nix b/modules/default.nix
index 9b7d69a..22cd946 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,6 +7,7 @@
     ./auto-update
     ./bluetooth
     ./events
+    ./kodi
     ./local
     ./minecraft-server
     ./moodle-dl
diff --git a/modules/kodi/default.nix b/modules/kodi/default.nix
new file mode 100644
index 0000000..1fe8620
--- /dev/null
+++ b/modules/kodi/default.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, self, ... }:
+
+let cfg = config.jopejoe1.kodi;
+in {
+  options.jopejoe1.kodi = { enable = lib.mkEnableOption "Enable Kodi"; };
+
+  config = lib.mkIf cfg.enable {
+    services.xserver = {
+      enable = true;
+      desktopManger.kodi.enable = true;
+      displayManager = {
+        autoLogin = {
+          enable = true;
+          user = "jopejoe1";
+        };
+        ligthdm = {
+          enable = true;
+          autoLogin.timeout = 3;
+        };
+      };
+    };
+  };
+}
+
diff --git a/systems/inugami/default.nix b/systems/inugami/default.nix
index 634ff5d..195ec28 100644
--- a/systems/inugami/default.nix
+++ b/systems/inugami/default.nix
@@ -23,6 +23,7 @@
     bluetooth.enable = true;
     local.enable = true;
     nix.enable = true;
+    kodi.enable = true;
     root.enable = true;
     jopejoe1.enable = true;
   };