diff --git a/desktop-environment/window-manager.nix b/desktop-environment/window-manager.nix
index fbbcbf3..a20c75c 100644
--- a/desktop-environment/window-manager.nix
+++ b/desktop-environment/window-manager.nix
@@ -1,37 +1,9 @@
 { pkgs, lib, ... }:
 let
-    dotfiles_hypr = pkgs.fetchgit {
-        url = "https://git.nichkara.eu/dotfiles/hypr";
-        rev = "96f9ca03450049baffbc8a2b71c3a40367edd2a5";
-        sha256 = "sha256-dHxf2UNEDC/KyDgjMMQ988hyGM2gasYNbNtLTityhDY=";
-    };
-
     profile = import ../profile.nix;
 in
 {
-    environment.systemPackages = with pkgs; [
-        wofi
-        waybar
-        grim
-        swaynotificationcenter
-        swaylock
-        hyprpaper
-        lxsession
-        hyprshot
-        wayvnc
+    imports = [
+        ./window-manager/${profile.interface}.nix
     ];
-
-    programs.hyprland = {
-        enable = true;
-        withUWSM = true;
-        xwayland.enable = true;
-    };
-
-    home-manager.users.${profile.username} = { ... }: {
-        home.file.".config/hypr" = {
-        source = dotfiles_hypr;
-        recursive = true;
-        };
-    };
-
 }
diff --git a/desktop-environment/window-manager/hyprland.nix b/desktop-environment/window-manager/hyprland.nix
new file mode 100644
index 0000000..2bf34ab
--- /dev/null
+++ b/desktop-environment/window-manager/hyprland.nix
@@ -0,0 +1,38 @@
+{ pkgs, lib, ... }:
+let
+    dotfiles_hypr = pkgs.fetchgit {
+        url = "https://git.nichkara.eu/dotfiles/hypr";
+        rev = "96f9ca03450049baffbc8a2b71c3a40367edd2a5";
+        sha256 = "sha256-dHxf2UNEDC/KyDgjMMQ988hyGM2gasYNbNtLTityhDY=";
+    };
+
+    profile = import ../../profile.nix;
+in
+{
+
+    environment.systemPackages = with pkgs; [
+        wofi
+        waybar
+        grim
+        swaynotificationcenter
+        swaylock
+        hyprpaper
+        lxsession
+        hyprshot
+        wayvnc
+    ];
+
+    programs.hyprland = {
+        enable = true;
+        withUWSM = true;
+        xwayland.enable = true;
+    };
+
+    home-manager.users.${profile.username} = { ... }: {
+        home.file.".config/hypr" = {
+        source = dotfiles_hypr;
+        recursive = true;
+        };
+    };
+
+}
diff --git a/system-environment/config.nix b/system-environment/config.nix
index 394c2a3..c49779e 100644
--- a/system-environment/config.nix
+++ b/system-environment/config.nix
@@ -9,11 +9,10 @@ in
     ];
 
     environment.systemPackages = with pkgs; [
-        # Make systems
         gnumake
-        pathon3
-        ]
-        ++ lib.optionals profile.modules.development [
+        python3
+    ]
+    ++ lib.optionals profile.modules.development [
         cmake
         cmakeCurses