diff --git a/configuration.nix b/configuration.nix
index bac11ce..51bc05e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -36,6 +36,9 @@
   };
 
   services = {
+    libinput = {
+      enable = true;
+    };
     xserver = {
       enable = true;
       displayManager.startx.enable = true;
diff --git a/modules/home.nix b/modules/home.nix
index 133165a..2af1973 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -4,7 +4,7 @@
     ./nix/user.nix
     ./nix/nvim/default.nix
 
-    #./nix/hypr/default.nix
+    ./nix/hypr/default.nix
     ./nix/bspwm/default.nix
   ];
 
diff --git a/modules/nix/bspwm/bspwm.nix b/modules/nix/bspwm/bspwm.nix
index 2c26f64..915a552 100644
--- a/modules/nix/bspwm/bspwm.nix
+++ b/modules/nix/bspwm/bspwm.nix
@@ -4,7 +4,7 @@
     sxhkd = {
       enable = true;
       keybindings = {
-        "super + return" = "${pkgs.alacritty}/bin/alacritty";
+        "super + Return" = "${pkgs.alacritty}/bin/alacritty";
         "super + space" = "${pkgs.rofi}/bin/rofi -show drun";
 
         "super + shift + r" = "bspc restart";
diff --git a/modules/raw/waybar/config b/modules/nix/hypr/raw/waybar/config
similarity index 100%
rename from modules/raw/waybar/config
rename to modules/nix/hypr/raw/waybar/config
diff --git a/modules/raw/waybar/style.css b/modules/nix/hypr/raw/waybar/style.css
similarity index 100%
rename from modules/raw/waybar/style.css
rename to modules/nix/hypr/raw/waybar/style.css