diff --git a/modules/default.nix b/modules/default.nix
index f201896..ee07f27 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -20,6 +20,7 @@
     ./repo-sync
     ./ssh
     ./steam
+    ./sway
     ./users
     ../upstream
     self.inputs.home-manager.nixosModules.home-manager
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
new file mode 100644
index 0000000..ff58284
--- /dev/null
+++ b/modules/sway/default.nix
@@ -0,0 +1,16 @@
+{ config, lib, ... }:
+
+let cfg = config.jopejoe1.sway;
+in {
+  options.jopejoe1.sway = {
+    enable = lib.mkEnableOption "Enable Sway";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.sway = { 
+      enable = true;
+    };
+    networking.networkmanager.enable = true;
+  };
+}
+
diff --git a/systems/yokai/default.nix b/systems/yokai/default.nix
index 87f8716..8b5498f 100644
--- a/systems/yokai/default.nix
+++ b/systems/yokai/default.nix
@@ -13,6 +13,7 @@
     overlays.enable = true;
     nix.enable = true;
     plasma.enable = true;
+    sway.enable = true;
     jopejoe1.enable = true;
     root.enable = true;
     ssh.enable = true;
@@ -33,6 +34,7 @@
     catppuccin-gtk
     tela-icon-theme
     element-desktop
+    kitty
   ];
 
   programs = {