diff --git a/hosts/x1g9/default.nix b/hosts/x1g9/default.nix
index 907e285..201ab25 100644
--- a/hosts/x1g9/default.nix
+++ b/hosts/x1g9/default.nix
@@ -8,6 +8,7 @@
   imports =
     [
       inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-9th-gen
+      ./../modules/drivers/intel-drivers.nix
       ./hardware-configuration.nix
     ];
 }
diff --git a/modules/core/greetd.nix b/modules/core/greetd.nix
index cd189da..750f9cb 100644
--- a/modules/core/greetd.nix
+++ b/modules/core/greetd.nix
@@ -5,7 +5,7 @@
     settings = {
       default_session = {
         user = "greeter";
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri";
       };
     };
   };
diff --git a/modules/core/niri.nix b/modules/core/niri.nix
new file mode 100644
index 0000000..5449afb
--- /dev/null
+++ b/modules/core/niri.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  programs.niri = {
+    enable = true;
+  }
+}
\ No newline at end of file
diff --git a/modules/core/packages.nix b/modules/core/packages.nix
index 55f13d1..19f3b51 100644
--- a/modules/core/packages.nix
+++ b/modules/core/packages.nix
@@ -1,15 +1,10 @@
 { pkgs, inputs, ... }:
 {
   programs = {
-    hyprland = {
-      enable = true;
-      withUWSM = false;
-    };
     dconf.enable = true;
     seahorse.enable = true;
     fuse.userAllowOther = true;
     adb.enable = true;
-    hyprlock.enable = true;
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
diff --git a/modules/drivers/default.nix b/modules/drivers/default.nix
deleted file mode 100644
index c4c7809..0000000
--- a/modules/drivers/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./intel-drivers.nix
-  ];
-}
diff --git a/profiles/laptop.nix b/profiles/laptop.nix
new file mode 100644
index 0000000..ab82792
--- /dev/null
+++ b/profiles/laptop.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  imports = [
+    ./cli-minimal.nix
+    ./../modules/core/niri.nix
+  ];
+
+  home-manager.users.moons.imports = [
+    ./../modules/home/vscode.nix
+  ]
+}
\ No newline at end of file