diff --git a/modules/hosts/desktop/configuration.nix b/modules/hosts/desktop/configuration.nix
index ce4ec5d..9887c4c 100644
--- a/modules/hosts/desktop/configuration.nix
+++ b/modules/hosts/desktop/configuration.nix
@@ -27,13 +27,22 @@ flake.nixosModules.lily-desktop = { pkgs, ... }:{
   # Enable touchpad support (enabled default in most desktopManager).
   # services.libinput.enable = true;
 
-	programs.firefox.enable = true;
+	programs = {
+		firefox.enable = true;
+		niri = {
+			enable = true;
+			package = self.packages.${pkgs.stdenv.hostPlatform.system}.niri;
+		};
+	};
+
 	nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
    environment.systemPackages = with pkgs; [
 	tree
+	noctalia-shell
+	quickshell
 	git
 	vim
 	wget
diff --git a/modules/hosts/laptop/configuration.nix b/modules/hosts/laptop/configuration.nix
index e5e15a7..8da2465 100644
--- a/modules/hosts/laptop/configuration.nix
+++ b/modules/hosts/laptop/configuration.nix
@@ -1,24 +1,14 @@
 {self, inputs, ...}: {
 	flake.nixosModules.laptopConfig = { pkgs, ... }: {
-		imports =
-			[ # Include the results of the hardware scan.
-#./hardware-configuration.nix
-#	../../modules/nixos/localization.nix
-#	../../modules/nixos/applications.nix
-#	../../modules/nixos/fonts.nix
-#	../../modules/nixos/programming.nix
-			];
-
-# Bootloader.
+		imports = [ ];
 		boot.loader = {
 			systemd-boot.enable = true;
 			efi.canTouchEfiVariables = true;
 		};
 
-		networking.hostName = "lily-laptop"; 			networking.networkmanager.enable = true;
+		networking.hostName = "lily-laptop";
+		networking.networkmanager.enable = true;
 
-# Enable the X11 windowing system.
-# You can disable this if you're only using the Wayland session.
 		services.xserver.enable = true;
 		services.displayManager.sddm.enable = true;
 		#services.displayManager.cosmic-greeter.enable = true;
@@ -45,20 +35,20 @@
 			};
 		};
 		nixpkgs.config.allowUnfree = true;
-		environment.systemPackages = [
-			pkgs.vim
-			pkgs.noctalia-shell
-			pkgs.quickshell
-				pkgs.git
-				pkgs.gimp
-				pkgs.home-manager
-				pkgs.bluez
-				pkgs.kdePackages.plasma-keyboard
-				pkgs.kdePackages.bluedevil
-				pkgs.kdePackages.bluez-qt
-				pkgs.lf
-				pkgs.fuzzel
-				pkgs.alacritty
+		environment.systemPackages = with pkgs; [
+			vim
+			noctalia-shell
+			quickshell
+				git
+				gimp
+				home-manager
+				bluez
+				kdePackages.plasma-keyboard
+				kdePackages.bluedevil
+				kdePackages.bluez-qt
+				lf
+				fuzzel
+				alacritty
 
 				self.packages.${pkgs.stdenv.hostPlatform.system}.nh
 #  wget