diff --git a/common/os/default.nix b/common/os/default.nix
index 4af39fb..cf5474f 100644
--- a/common/os/default.nix
+++ b/common/os/default.nix
@@ -9,10 +9,11 @@ let
 in
 {
   imports = [
+    ./configuration.nix
+    ./lix.nix
+    ./niri.nix
     ./programs
     ./services
     ./tweaks
-    ./configuration.nix
-    ./niri.nix
   ];
 }
diff --git a/common/os/lix.nix b/common/os/lix.nix
new file mode 100644
index 0000000..3d4ddaa
--- /dev/null
+++ b/common/os/lix.nix
@@ -0,0 +1,29 @@
+{
+  config,
+  pkgs,
+  inputs,
+  lib,
+  ...
+}:
+lib.mkMerge [
+  {
+    nixpkgs.overlays = [
+      (final: prev: {
+        inherit (prev.lixPackageSets.stable)
+          nixpkgs-review
+          nix-eval-jobs
+          nix-fast-build
+          colmena
+          ;
+      })
+    ];
+  }
+  (lib.mkIf config.nix.monitored.enable {
+    nix.monitored = {
+      package = pkgs.nix-monitored.override {
+        nix = pkgs.lixPackageSets.stable.lix;
+      };
+    };
+  })
+  (lib.mkIf (!config.nix.monitored.enable) { nix.package = pkgs.lixPackageSets.stable.lix; })
+]
diff --git a/hosts/kaoru/os/configuration.nix b/hosts/kaoru/os/configuration.nix
index fee74d3..9016ed2 100644
--- a/hosts/kaoru/os/configuration.nix
+++ b/hosts/kaoru/os/configuration.nix
@@ -8,10 +8,13 @@
 {
 
   networking.hostName = "kaoru";
-  nix.settings = {
-    keep-outputs = true;
-    max-jobs = 4;
-    cores = 8; # avoid thermal throttling
+  nix = {
+    monitored.enable = true;
+    settings = {
+      keep-outputs = true;
+      max-jobs = 4;
+      cores = 8; # avoid thermal throttling
+    };
   };
   services = {
     supergfxd.enable = true;
diff --git a/hosts/kaoru/os/default.nix b/hosts/kaoru/os/default.nix
index 3ce8606..ffae71b 100644
--- a/hosts/kaoru/os/default.nix
+++ b/hosts/kaoru/os/default.nix
@@ -9,7 +9,6 @@
   imports = [
     ./configuration.nix
     ./hardware-configuration.nix
-    ./lix.nix
     ./networkMounts.nix
     ./virtualbox.nix
   ];
diff --git a/hosts/kaoru/os/lix.nix b/hosts/kaoru/os/lix.nix
deleted file mode 100644
index 4e59fe5..0000000
--- a/hosts/kaoru/os/lix.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      inherit (prev.lixPackageSets.stable)
-        nixpkgs-review
-        nix-eval-jobs
-        nix-fast-build
-        colmena
-        ;
-    })
-  ];
-  # nix.package = pkgs.lixPackageSets.stable.lix;
-  nix.monitored = {
-    enable = true;
-    package = pkgs.nix-monitored.override {
-      nix = pkgs.lixPackageSets.stable.lix;
-    };
-  };
-}
diff --git a/hosts/shizuka/default.nix b/hosts/shizuka/default.nix
index bfc0aa6..4274c7a 100644
--- a/hosts/shizuka/default.nix
+++ b/hosts/shizuka/default.nix
@@ -23,6 +23,7 @@
   };
 
   services.xserver.xkb.layout = "gb,us";
+  nix.monitored.enable = true;
 
   system.stateVersion = "25.05";
   programs.kdeconnect.enable = true;
diff --git a/hosts/yuhata/os/configuration.nix b/hosts/yuhata/os/configuration.nix
index 703d36b..3da8fd1 100644
--- a/hosts/yuhata/os/configuration.nix
+++ b/hosts/yuhata/os/configuration.nix
@@ -20,6 +20,7 @@
     flavor = "mocha";
     accent = "lavender";
   };
+  nix.monitored.enable = true;
   networking.hostName = "yuhata";
   system.stateVersion = "25.05";
   sidonia = {
diff --git a/hosts/yuhata/os/default.nix b/hosts/yuhata/os/default.nix
index 4f2b0f7..c26d20d 100644
--- a/hosts/yuhata/os/default.nix
+++ b/hosts/yuhata/os/default.nix
@@ -10,7 +10,6 @@
     ./configuration.nix
     ./gamemode.nix
     ./hardware-configuration.nix
-    # ./lix.nix
     ./networkMounts.nix
     ./steam.nix
   ];
diff --git a/hosts/yuhata/os/lix.nix b/hosts/yuhata/os/lix.nix
deleted file mode 100644
index e70169f..0000000
--- a/hosts/yuhata/os/lix.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  inputs,
-  lib,
-  ...
-}:
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      inherit (prev.lixPackageSets.stable)
-        nixpkgs-review
-        nix-eval-jobs
-        nix-fast-build
-        colmena
-        ;
-    })
-  ];
-  nix.package = pkgs.lixPackageSets.stable.lix;
-}
diff --git a/hosts/yure/default.nix b/hosts/yure/default.nix
index 567d198..a95bc5a 100644
--- a/hosts/yure/default.nix
+++ b/hosts/yure/default.nix
@@ -10,7 +10,10 @@
     ./hardware-configuration.nix
   ];
   networking.hostName = "yure";
-  nix.settings.max-jobs = 1; # set to 0 to use remote builder only
+  nix = {
+    monitored.enable = true;
+    settings.max-jobs = 1; # set to 0 to use remote builder only
+  };
   catppuccin = {
     enable = true;
     flavor = "mocha";