diff --git a/devices/p14s/default.nix b/devices/p14s/default.nix
index b65a0f7..eeb74d5 100644
--- a/devices/p14s/default.nix
+++ b/devices/p14s/default.nix
@@ -1,12 +1,13 @@
-{ pkgs, lib, ... }:
+{ pkgs, ... }:
 {
   imports = [
-    ../../modules/nixos
-    ../../modules/boot
-    ../../modules/
-    ../../modules/boot/plymouth.nix
-    ../../modules/boot/secure-boot.nix
     ./hardware-configuration.nix
+
+    ../../modules/boot
+    ../../modules/desktop
+    ../../modules/develop
+    ../../modules/networking
+    ../../modules/virtualisation
   ];
 
   networking.hostName = "p14s";
diff --git a/modules/boot/default.nix b/modules/boot/default.nix
index 50d146f..c3aa943 100644
--- a/modules/boot/default.nix
+++ b/modules/boot/default.nix
@@ -1,4 +1,10 @@
 { pkgs, ... }:
 {
+  imports = [
+    ./systemd-boot.nix
+    ./secure-boot.nix
+    ./plymouth.nix
+  ];
+
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/modules/boot/secure-boot.nix b/modules/boot/secure-boot.nix
index fe1747b..46e5235 100644
--- a/modules/boot/secure-boot.nix
+++ b/modules/boot/secure-boot.nix
@@ -1,9 +1,5 @@
-{ lib, pkgs, inputs, ... }:
+{ lib, pkgs, ... }:
 {
-  inputs = [
-    inputs.lanzaboote.nixosModules.lanzaboote
-  ];
-
   environment.systemPackages = [ pkgs.sbctl ];
   boot.loader.systemd-boot.enable = lib.mkForce false;
 
diff --git a/modules/boot/systemd-boot.nix b/modules/boot/systemd-boot.nix
index d262e00..28c67de 100644
--- a/modules/boot/systemd-boot.nix
+++ b/modules/boot/systemd-boot.nix
@@ -1,4 +1,4 @@
-{ }:
+{ ... }:
 {
   boot.loader.systemd-boot.enable = true;
   boot.loader.timeout = 0;
diff --git a/modules/desktop/audio.nix b/modules/desktop/audio.nix
index 4fd626e..8455c34 100644
--- a/modules/desktop/audio.nix
+++ b/modules/desktop/audio.nix
@@ -1,4 +1,4 @@
-{ }:
+{ ... }:
 {
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index ec7896c..21277de 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,5 +1,11 @@
-{ }:
+{ ... }:
 {
+  imports = [
+    ./audio.nix
+    ./printing.nix
+    ./gnome.nix
+  ];
+
   nixpkgs.config.allowUnfree = true;
   programs.firefox.enable = true;
   programs.virt-manager.enable = true;
diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index 30fab43..30d4792 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -1,4 +1,4 @@
-{}:
+{ ... }:
 {
   services.xserver.enable = true;
 
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 1f85630..1725bf5 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -16,9 +16,8 @@
   };
 
   services.openssh.enable = true;
-
+  programs.zsh.enable = true;
   programs.nix-ld.enable = true;
-  programs.home-manager.enable = true;
   
   nix = {
     settings = {