diff --git a/configurations/laptop/configuration.nix b/configurations/laptop/configuration.nix
index 91c98b40..e1b3d11f 100644
--- a/configurations/laptop/configuration.nix
+++ b/configurations/laptop/configuration.nix
@@ -30,8 +30,8 @@
   # cspark-desktop-plasma.enable = true;
   # cspark-desktop-gnome.enable = true;
   # cspark-desktop-sway.enable = true;
-  # cspark-desktop-niri.enable = true;
-  cspark-desktop-exwm.enable = true;
+  cspark-desktop-niri.enable = true;
+  # cspark-desktop-exwm.enable = true;
 
   # Home Manager Configuration
   home-manager = {
diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix
index c0d429cb..22baa72f 100644
--- a/configurations/laptop/home.nix
+++ b/configurations/laptop/home.nix
@@ -20,8 +20,8 @@
   # cspark-desktop-plasma-config-1.enable = true;
   # cspark-desktop-gnome-config-1.enable = true;
   # cspark-desktop-sway-config-1.enable = true;
-  # cspark-desktop-niri-config-1.enable = true;
-  cspark-desktop-exwm-config-1.enable = true;
+  cspark-desktop-niri-config-1.enable = true;
+  # cspark-desktop-exwm-config-1.enable = true;
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix
index faaa7325..c4aa9d2d 100644
--- a/modules/nixos/cspark-desktop-niri/home.nix
+++ b/modules/nixos/cspark-desktop-niri/home.nix
@@ -32,7 +32,7 @@ in
     home.packages = with pkgs; [
       (writeShellScriptBin "niri-autostart"
         ''
-                  # waybar &
+		  [[ $(hostname) == *"laptop"* ]] && waybar &
                   mako &
 		  swaybg -i $(find ${config.home.homeDirectory}/Pictures/Wallpapers/ggg/. -type f | shuf -n1) -m stretch &
                   wlsunset -l 51.5 -L 0.1 &