diff --git a/machines/haze/configuration.nix b/machines/haze/configuration.nix
index 0d4c679..f722e53 100644
--- a/machines/haze/configuration.nix
+++ b/machines/haze/configuration.nix
@@ -6,20 +6,18 @@
   imports = [
     ./boot.nix
     ./chat.nix
-    ./firefox.nix
     ./gimp.nix
     ./gnome.nix
     ./hibernate.nix
-    ./hyprland.nix
     ./niri.nix
     ./ssh.nix
     ./steam.nix
-    ./thunderbird.nix
     ./network.nix
     ./syncthing.nix
-    ./video.nix
     ../../system
 
+    self.nixosModules.desktop
+
     self.inputs.home-manager.nixosModules.home-manager
     {
       home-manager.useGlobalPkgs = true;
diff --git a/machines/haze/firefox.nix b/machines/haze/firefox.nix
deleted file mode 100644
index 32391e8..0000000
--- a/machines/haze/firefox.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.firefox = {
-    enable = true;
-    nativeMessagingHosts.packages = [ pkgs.passff-host ];
-  };
-}
diff --git a/machines/haze/hyprland.nix b/machines/haze/hyprland.nix
deleted file mode 100644
index 98dfe35..0000000
--- a/machines/haze/hyprland.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  programs.hyprland.enable = true;
-}
diff --git a/machines/haze/thunderbird.nix b/machines/haze/thunderbird.nix
deleted file mode 100644
index c856732..0000000
--- a/machines/haze/thunderbird.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  programs.thunderbird.enable = true;
-}
diff --git a/machines/haze/video.nix b/machines/haze/video.nix
deleted file mode 100644
index fd045fb..0000000
--- a/machines/haze/video.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [ mpv ];
-}
diff --git a/modules/desktop.nix b/modules/desktop.nix
new file mode 100644
index 0000000..04d56c1
--- /dev/null
+++ b/modules/desktop.nix
@@ -0,0 +1,14 @@
+{ self, pkgs, ... }:
+{
+  environment.systemPackages = [
+    pkgs.mpv # video player
+    pkgs.amberol # music player
+  ];
+
+  programs.firefox = {
+    enable = true;
+    nativeMessagingHosts.packages = [ pkgs.passff-host ];
+  };
+
+  programs.thunderbird.enable = true;
+}
diff --git a/modules/flake-module.nix b/modules/flake-module.nix
index 56fad3f..781a291 100644
--- a/modules/flake-module.nix
+++ b/modules/flake-module.nix
@@ -3,5 +3,9 @@
     gitea.imports = [
       ./gitea.nix
     ];
+
+    desktop.imports = [
+      ./desktop.nix
+    ];
   };
 }