diff --git a/modules/system.nix b/modules/system.nix
index 4898e76..b5ead15 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -2,5 +2,7 @@
   imports = [
     ../system/firefox/default.nix
     ../system/astal/default.nix
+    ../system/hyprland/default.nix
+    ../system/fonts/default.nix
   ];
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index d71961b..65da6d2 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -65,7 +65,6 @@
     zsh
     p7zip
     gcc
-    astal.hyprland
     btop
     libnotify
   ];
@@ -83,22 +82,11 @@
   ### ----------------------------------------
   ### DESKTOP START
   services.xserver.displayManager.gdm.enable = true;
-
-  fonts.packages = with pkgs; [
-    nerd-fonts.fira-code
-  ];
-
   hardware = {
     # pulseaudio.enable = true;
     graphics.enable = true;
     nvidia.modesetting.enable = false;
   };
-  programs.hyprland = {
-    enable = true;
-    # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
-    # portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-    xwayland.enable = true;
-  };
 
   ### DESKTOP END
   ### ----------------------------------------
diff --git a/system/fonts/default.nix b/system/fonts/default.nix
new file mode 100644
index 0000000..a12aeac
--- /dev/null
+++ b/system/fonts/default.nix
@@ -0,0 +1,5 @@
+{ ... }: {
+  fonts.packages = with pkgs; [
+    nerd-fonts.fira-code
+  ];
+}
diff --git a/system/hyprland/default.nix b/system/hyprland/default.nix
new file mode 100644
index 0000000..54ca21e
--- /dev/null
+++ b/system/hyprland/default.nix
@@ -0,0 +1,9 @@
+{ ... }: {
+  programs.hyprland = {
+    enable = true;
+    # package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
+    # portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
+    xwayland.enable = true;
+  };
+}
+