diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000..1ce029f
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,6 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+{ }
diff --git a/desktop/cursor.nix b/desktop/cursor.nix
new file mode 100644
index 0000000..ed21123
--- /dev/null
+++ b/desktop/cursor.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  programs.hyprcursor-phinger.enable = true;
+  # Only applies to XWayland/GTK
+  home.pointerCursor = {
+    name = "phinger-cursors-dark";
+    package = pkgs.phinger-cursors;
+    size = 24;
+    gtk.enable = true;
+  };
+}
diff --git a/desktop/default.nix b/desktop/default.nix
new file mode 100644
index 0000000..70e5e0e
--- /dev/null
+++ b/desktop/default.nix
@@ -0,0 +1,14 @@
+{ ... }:
+{
+  imports = [
+    ./cursor.nix
+    ./hyprpaper.nix
+  ];
+
+  home.file = {
+    hyprland = {
+      target = ".config/hypr/hyprland.conf";
+      source = ./hyprland.conf;
+    };
+  };
+}
diff --git a/hyprland.conf b/desktop/hyprland.conf
similarity index 99%
rename from hyprland.conf
rename to desktop/hyprland.conf
index e91c725..e55ce9c 100644
--- a/hyprland.conf
+++ b/desktop/hyprland.conf
@@ -195,6 +195,7 @@ master {
 misc {
     force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
     disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
+    disable_splash_rendering = true
 }
 
 
diff --git a/desktop/hyprpaper.nix b/desktop/hyprpaper.nix
new file mode 100644
index 0000000..d62c118
--- /dev/null
+++ b/desktop/hyprpaper.nix
@@ -0,0 +1,14 @@
+{
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      preload = [ "~/Pictures/nomo2.jpg" ];
+      wallpaper = [
+        {
+          monitor = "HDMI-A-2";
+          path = "~/Pictures/nomo2.jpg";
+        }
+      ];
+    };
+  };
+}
diff --git a/home.nix b/home.nix
index eebbb79..75f4743 100644
--- a/home.nix
+++ b/home.nix
@@ -6,10 +6,10 @@
 
 {
   imports = [
+    ./desktop
     ./shell
 
     ./git.nix
-    ./hyprland.nix
     ./kitty.nix
     ./ssh.nix
   ];
diff --git a/hyprland.nix b/hyprland.nix
deleted file mode 100644
index 8219eb6..0000000
--- a/hyprland.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  home.file = {
-    hyprland = {
-      target = ".config/hypr/hyprland.conf";
-      source = ./hyprland.conf;
-    };
-  };
-
-  programs.hyprcursor-phinger.enable = true;
-  services.hyprpaper = {
-    enable = true;
-    settings = {
-      preload = [ "~/Pictures/nomo2.jpg" ];
-      wallpaper = [ "HDMI-A-2,~/Pictures/nomo2.jpg" ];
-    };
-  };
-
-  # Only applies to XWayland/GTK
-  home.pointerCursor = {
-    name = "phinger-cursors-dark";
-    package = pkgs.phinger-cursors;
-    size = 24;
-    gtk.enable = true;
-  };
-
-}