diff --git a/flake.nix b/flake.nix
index 1e6978c..87c5b45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,11 +18,6 @@ in rec {
           inherit stateVersion;
           hostname = "mrmeeseeks";
           username = "ephase";
-          hostConfig = {
-            gaming = true;
-            desktop = true;
-            laptop = false;
-          };
         };
         modules = [ 
           ./nixos/default.nix
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index 6cd20bc..4bbeed4 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, hostConfig, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     emojione
diff --git a/modules/home/desktop/sway/default.nix b/modules/home/desktop/sway/default.nix
index d014055..2bfe550 100644
--- a/modules/home/desktop/sway/default.nix
+++ b/modules/home/desktop/sway/default.nix
@@ -1,7 +1,5 @@
-{ hostConfig, ... }:
-let
-  cfg = hostConfig;
-in {
+{ ... }:
+{
   imports = [
     ./sway.nix
     ./mako.nix
@@ -9,9 +7,5 @@ in {
     ./swaylock.nix
     ./swayidle.nix
     ./fuzzel.nix
-  ] ++ (
-    if hostConfig.laptop then
-      [ ./kanshi.nix ]
-    else []
-  );
+  ];
 }
diff --git a/modules/home/desktop/sway/kanshi.nix b/modules/home/desktop/sway/kanshi.nix
deleted file mode 100644
index cf6ef7a..0000000
--- a/modules/home/desktop/sway/kanshi.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-_: {
-  service.kanshi = {
-    enable = true;
-    profiles = {
-      home = {
-        outputs = [
-          {
-            criteria = "Iiyama North America PL2792UH 1166310803122"; 
-            mode = "3840x2160";
-            position = "0,0";
-            scale = 2;
-          }
-          { 
-            criteria =  "Iiyama North America PL2792UH 1176923201598"; 
-            mode = "3840x2160";
-            position = "1920,0";
-            transform = "270";
-            scale = "2";
-          }
-          {
-            criteria = "eDP-1";
-            status = "disable";
-          }
-        ];
-      };
-      work = {
-        outputs = [
-          {
-            criteria = "Iiyama North America PL2480H 11183M2807013"; 
-            mode = "1920x1080";
-            position = "0,0";
-          }
-          { 
-            criteria =  "Iiyama North America PL2480H 11183M2807016"; 
-            mode = "1920x1080";
-            position = "1920,0";
-          }
-          {
-            criteria = "eDP-1";
-            status = "disable";
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/nixos/default.nix b/nixos/default.nix
index cc46503..3bfcf83 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,4 +1,5 @@
-{ config, pkgs, lib, stateVersion, hostname, username, hostConfig, ... }:
+{ config, pkgs, lib, stateVersion, hostname, username, ... }:
+
 {
   imports =
     [ # Include the results of the hardware scan.
@@ -11,32 +12,15 @@
       ./includes/system/lvm.nix
       ./includes/system/doas.nix
       ./includes/system/neovim.nix
-    ] ++ (
-      if hostConfig.desktop then 
-        [
-          ./includes/desktop/swaylock.nix
-          ./includes/desktop/pipewire.nix
-          ./includes/desktop/xdg-portal.nix
-        ]
-      else []
-    ) ++ (
-      if hostConfig.gaming then 
-        [
-          ./includes/gaming/steam.nix
-        ] 
-      else []
-    ) ++ (
-      if hostConfig.laptop then 
-        [
-          ./includes/hardware/iwd.nix
-        ]
-      else []
-    );
-
-
+      ./includes/desktop/swaylock.nix
+      ./includes/desktop/pipewire.nix
+      ./includes/desktop/xdg-portal.nix
+      ./includes/gaming/steam.nix
+    ];
+  
   nixpkgs.config.allowUnfree = true;
 
-
+  
   boot.kernelPackages = pkgs.linuxPackages_latest;
   networking.hostName = hostname;
 
@@ -55,26 +39,20 @@
   ];
 
   home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = {
-      inherit hostConfig;
-    };
-    users.${username} = {
-      home.stateVersion = stateVersion;
-      programs.home-manager.enable = true;
-      imports = [
-        ../modules/home/desktop
-        ../modules/home/webcord.nix
-        ../modules/home/cli
-        ../modules/home/firefox
-        ../modules/home/foot.nix
-        ../modules/home/zathura.nix
-      ] ++ (
-        if hostConfig.gaming then
-          [ ../modules/home/lutris.nix ]
-        else []
-      );
+      useGlobalPkgs = true;
+      useUserPackages = true;
+      users.${username} = {
+        home.stateVersion = stateVersion;
+        programs.home-manager.enable = true;
+        imports = [
+          ../modules/home/desktop
+          ../modules/home/webcord.nix
+          ../modules/home/cli
+          ../modules/home/firefox
+          ../modules/home/foot.nix
+          ../modules/home/lutris.nix
+          ../modules/home/zathura.nix
+        ];
     };
   };
 
diff --git a/nixos/includes/hardware/iwd.nix b/nixos/includes/hardware/iwd.nix
deleted file mode 100644
index 6dd5746..0000000
--- a/nixos/includes/hardware/iwd.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  networking.wireless.iwd.enable = true;
-}