diff --git a/niri.nix b/niri.nix
index 35e6dbd..7b0285c 100644
--- a/niri.nix
+++ b/niri.nix
@@ -1,20 +1,23 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
+let
+  useNoctalia = true;
+in
 {
   # ── Niri desktop environment ─────────────────────────────────────────────────
   xdg.configFile."niri".source = ./config/niri;
   xdg.configFile."foot".source = ./config/foot;
-  xdg.configFile."waybar".source = ./config/waybar;
-  xdg.configFile."fuzzel/fuzzel.ini".source = ./config/fuzzel/fuzzel.ini;
+  xdg.configFile."waybar" = lib.mkIf (!useNoctalia) { source = ./config/waybar; };
+  xdg.configFile."fuzzel/fuzzel.ini" = lib.mkIf (!useNoctalia) { source = ./config/fuzzel/fuzzel.ini; };
 
   home.file.".local/bin/wallpaper.sh" = {
     source = ./config/niri/wallpaper.sh;
     executable = true;
   };
-  home.file.".local/bin/waybar-network.sh" = {
+  home.file.".local/bin/waybar-network.sh" = lib.mkIf (!useNoctalia) {
     source = ./config/waybar/network.sh;
     executable = true;
   };
-  home.file.".local/bin/waybar-weather.sh" = {
+  home.file.".local/bin/waybar-weather.sh" = lib.mkIf (!useNoctalia) {
     source = ./config/waybar/weather.sh;
     executable = true;
   };
@@ -60,13 +63,10 @@
     grim
     satty
     wlogout
-    fuzzel
     swaylock
     swayidle
     brightnessctl
     awww
-    waybar
-    noctalia-shell
     lxqt.lxqt-policykit
 
     # messaging
@@ -74,5 +74,10 @@
     signal-desktop
     vesktop
     karere
+  ] ++ lib.optionals (!useNoctalia) [
+    fuzzel
+    waybar
+  ] ++ lib.optionals useNoctalia [
+    noctalia-shell
   ];
 }