diff --git a/home/wayland/default.nix b/home/wayland/default.nix
index b4f02ea..cd2b35b 100644
--- a/home/wayland/default.nix
+++ b/home/wayland/default.nix
@@ -1,110 +1,10 @@
-{pkgs, ...}: let
-  catppuccin-mako = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "mako";
-    rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df";
-    sha256 = "097x9jrkzvml6ngnhxwkzzl1l2awwv73yli1mhmpw83c0n8xck4x";
-  };
-in {
-  # TODO: split some stuff here
-
+{...}: {
   imports = [
-    ./hyprland
     ./eww
+    ./fuzzel
+    ./hyprland
+    ./mako
+    ./swayidle
+    ./swaylock
   ];
-
-  services.mako = {
-    enable = true;
-    defaultTimeout = 5000;
-    extraConfig = builtins.readFile "${catppuccin-mako}/src/mocha";
-  };
-
-  programs.fuzzel = {
-    enable = true;
-    settings = {
-      main = {
-        line-height = 15;
-        lines = 10;
-        layer = "overlay";
-        icon-theme = "Papirus-Dark";
-      };
-      colors = {
-        background = "1E1E2EEE";
-        text = "7F849CFF";
-        match = "89B4FAFF";
-        selection = "45475AFF";
-        selection-text = "CDD6F4FF";
-        selection-match = "89B4FAFF";
-      };
-    };
-  };
-
-  services.swayidle = {
-    enable = true;
-    systemdTarget = "hyprland-session.target";
-    events = [
-      {
-        event = "after-resume";
-        command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on";
-      }
-      {
-        event = "before-sleep";
-        command = "${pkgs.swaylock-effects}/bin/swaylock -f";
-      }
-    ];
-    timeouts = [
-      {
-        timeout = 120;
-        command = "${pkgs.swaylock-effects}/bin/swaylock -f --grace 3";
-      }
-      {
-        timeout = 150;
-        command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off";
-      }
-      {
-        timeout = 300;
-        command = "${pkgs.systemd}/bin/systemctl suspend";
-      }
-    ];
-  };
-
-  programs.swaylock = {
-    enable = true;
-    package = pkgs.swaylock-effects;
-    settings = {
-      image = "/home/laurent/Pictures/wallpapers/kai-oberhauser-unsplash.jpg";
-
-      clock = true;
-      timestr = "%T";
-      datestr = "%F";
-
-      indicator = true;
-      indicator-radius = 100;
-      indicator-thickness = 7;
-
-      effect-blur = "7x5";
-      effect-vignette = "0.5:0.5";
-
-      text-color = "CDD6F4";
-      text-clear-color = "CDD6F4";
-      text-caps-lock-color = "CDD6F4";
-      text-ver-color = "CDD6F4";
-      text-wrong-color = "CDD6F4";
-
-      inside-color = "1E1E2EEE";
-      inside-clear-color = "1E1E2EEE";
-      inside-caps-lock-color = "1E1E2EEE";
-      inside-ver-color = "1E1E2EEE";
-      inside-wrong-color = "1E1E2EEE";
-
-      ring-color = "CBA6F7";
-      ring-clear-color = "FAB387";
-      ring-caps-lock-color = "F5C2E7";
-      ring-ver-color = "89B4Fa";
-      ring-wrong-color = "F38BA8";
-
-      key-hl-color = "A6E3A1";
-      bs-hl-color = "F38BA8";
-    };
-  };
 }
diff --git a/home/wayland/fuzzel/default.nix b/home/wayland/fuzzel/default.nix
new file mode 100644
index 0000000..f751242
--- /dev/null
+++ b/home/wayland/fuzzel/default.nix
@@ -0,0 +1,21 @@
+{...}: {
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        line-height = 15;
+        lines = 10;
+        layer = "overlay";
+        icon-theme = "Papirus-Dark";
+      };
+      colors = {
+        background = "1E1E2EEE";
+        text = "7F849CFF";
+        match = "89B4FAFF";
+        selection = "45475AFF";
+        selection-text = "CDD6F4FF";
+        selection-match = "89B4FAFF";
+      };
+    };
+  };
+}
diff --git a/home/wayland/mako/default.nix b/home/wayland/mako/default.nix
new file mode 100644
index 0000000..93d2ca3
--- /dev/null
+++ b/home/wayland/mako/default.nix
@@ -0,0 +1,14 @@
+{pkgs, ...}: let
+  catppuccin-mako = pkgs.fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "mako";
+    rev = "9dd088aa5f4529a3dd4d9760415e340664cb86df";
+    sha256 = "097x9jrkzvml6ngnhxwkzzl1l2awwv73yli1mhmpw83c0n8xck4x";
+  };
+in {
+  services.mako = {
+    enable = true;
+    defaultTimeout = 5000;
+    extraConfig = builtins.readFile "${catppuccin-mako}/src/mocha";
+  };
+}
diff --git a/home/wayland/swayidle/default.nix b/home/wayland/swayidle/default.nix
new file mode 100644
index 0000000..5c2f919
--- /dev/null
+++ b/home/wayland/swayidle/default.nix
@@ -0,0 +1,30 @@
+{pkgs, ...}: {
+  services.swayidle = {
+    enable = true;
+    systemdTarget = "hyprland-session.target";
+    events = [
+      {
+        event = "after-resume";
+        command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on";
+      }
+      {
+        event = "before-sleep";
+        command = "${pkgs.swaylock-effects}/bin/swaylock -f";
+      }
+    ];
+    timeouts = [
+      {
+        timeout = 120;
+        command = "${pkgs.swaylock-effects}/bin/swaylock -f --grace 3";
+      }
+      {
+        timeout = 150;
+        command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off";
+      }
+      {
+        timeout = 300;
+        command = "${pkgs.systemd}/bin/systemctl suspend";
+      }
+    ];
+  };
+}
diff --git a/home/wayland/swaylock/default.nix b/home/wayland/swaylock/default.nix
new file mode 100644
index 0000000..cfac6d4
--- /dev/null
+++ b/home/wayland/swaylock/default.nix
@@ -0,0 +1,42 @@
+{pkgs, ...}: {
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+
+    settings = {
+      image = "/home/laurent/Pictures/wallpapers/kai-oberhauser-unsplash.jpg";
+
+      clock = true;
+      timestr = "%T";
+      datestr = "%F";
+
+      indicator = true;
+      indicator-radius = 100;
+      indicator-thickness = 7;
+
+      effect-blur = "7x5";
+      effect-vignette = "0.5:0.5";
+
+      text-color = "CDD6F4";
+      text-clear-color = "CDD6F4";
+      text-caps-lock-color = "CDD6F4";
+      text-ver-color = "CDD6F4";
+      text-wrong-color = "CDD6F4";
+
+      inside-color = "1E1E2EEE";
+      inside-clear-color = "1E1E2EEE";
+      inside-caps-lock-color = "1E1E2EEE";
+      inside-ver-color = "1E1E2EEE";
+      inside-wrong-color = "1E1E2EEE";
+
+      ring-color = "CBA6F7";
+      ring-clear-color = "FAB387";
+      ring-caps-lock-color = "F5C2E7";
+      ring-ver-color = "89B4Fa";
+      ring-wrong-color = "F38BA8";
+
+      key-hl-color = "A6E3A1";
+      bs-hl-color = "F38BA8";
+    };
+  };
+}