diff --git a/modules/host/laptop/configuration.nix b/modules/host/laptop/configuration.nix
index 1ee0fe8..317f6e9 100644
--- a/modules/host/laptop/configuration.nix
+++ b/modules/host/laptop/configuration.nix
@@ -2,7 +2,8 @@
 	flake.nixosModules.laptopConfiguration = { config, pkgs, self', ... }: {
         imports =
         [ # Include the results of the hardware scan.
-            self.nixosModules.base
+            self.nixosModules.user
+            self.nixosModules.main
             self.nixosModules.laptopHardware
             self.nixosModules.visualProfile
             self.nixosModules.developmentProfile
@@ -26,7 +27,7 @@
         boot.kernelPackages = pkgs.linuxPackages_latest;
 
         networking.hostName = "laptop"; # Define your hostname.
-        # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+        networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
         powerManagement.enable = true;
         services.power-profiles-daemon.enable = true;
@@ -82,15 +83,7 @@
         # List packages installed in system profile. To search, run:
         # $ nix search wget
         environment.systemPackages = with pkgs; [
-            vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-            wget
-            zathura
-            zip
-            unzip
             faugus-launcher
-            mpv
-            nix-sweep
-            #self.packages.${pkgs.system}.lf
         ];
 
         # Some programs need SUID wrappers, can be configured further or are
diff --git a/modules/profiles/profiles.nix b/modules/profiles/profiles.nix
index eba4099..844b733 100644
--- a/modules/profiles/profiles.nix
+++ b/modules/profiles/profiles.nix
@@ -1,5 +1,12 @@
 { inputs, lib, self, ... }: {
     flake.nixosModules.main = { pkgs, ... }: {
+        environment.systemPackages = with pkgs; [
+            vim
+            wget
+            zip
+            unzip
+            nix-sweep
+        ];
         imports = [
             self.nixosModules.git
             self.nixosModules.lf
@@ -11,8 +18,11 @@
     };
 
 	flake.nixosModules.visualProfile = { pkgs, ... }: {
+        environment.systemPackages = with pkgs; [
+            zathura
+            mpv
+        ];
         imports = [
-            self.nixosModules.main
 
             self.nixosModules.niri
             self.nixosModules.pipewire
@@ -30,6 +40,8 @@
 	};
 
     flake.nixosModules.developmentProfile = { pkgs, ... }: {
+        environment.systemPackages = with pkgs; [
+        ];
         imports = [
             self.nixosModules.devenv
         ];
diff --git a/modules/profiles/user.nix b/modules/profiles/user.nix
index 55e0f9e..91c58de 100644
--- a/modules/profiles/user.nix
+++ b/modules/profiles/user.nix
@@ -1,5 +1,5 @@
 {
-  flake.nixosModules.base = {lib, ...}: {
+  flake.nixosModules.user = {lib, ...}: {
     options.preferences = {
       user.name = lib.mkOption {
         type = lib.types.str;