diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 91fa5ad..a4abb06 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -3,6 +3,7 @@
     ./git.nix
     ./fish.nix
     ./nixvim
-    ./hyprland
+    ./hyprland.nix
+    ./kitty.nix
   ];
 }
diff --git a/modules/home-manager/hyprland/default.nix b/modules/home-manager/hyprland.nix
similarity index 88%
rename from modules/home-manager/hyprland/default.nix
rename to modules/home-manager/hyprland.nix
index 71b2257..d830747 100644
--- a/modules/home-manager/hyprland/default.nix
+++ b/modules/home-manager/hyprland.nix
@@ -1,14 +1,8 @@
 { pkgs, ... }:
 {
-  programs.kitty = {
-    enable = true;
-    themeFile = "tokyo_night_night";
-    font = {
-      package = pkgs.nerd-fonts.jetbrains-mono;
-      name = "JetBrainsMono NF";
-      size = 14;
-    };
-  };
+  services.displayManager.ly.enable = true;
+
+  programs.waybar.enable = true;
 
   wayland.windowManager.hyprland =
     let
diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix
new file mode 100644
index 0000000..2aae631
--- /dev/null
+++ b/modules/home-manager/kitty.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  programs.kitty = {
+    enable = true;
+    themeFile = "tokyo_night_night";
+    font = {
+      package = pkgs.nerd-fonts.jetbrains-mono;
+      name = "JetBrainsMono NF";
+      size = 14;
+    };
+  };
+}