diff --git a/hosts/perso-desktop/home.nix b/hosts/perso-desktop/home.nix
index 196e7fc..72a2638 100644
--- a/hosts/perso-desktop/home.nix
+++ b/hosts/perso-desktop/home.nix
@@ -9,6 +9,8 @@
       kitty.enable = true;
     };
 
+    configs.monado.enable = true;
+
     editors = {
       neovim.enable = true;
       vscode.enable = true;
diff --git a/modules/home/configs/default.nix b/modules/home/configs/default.nix
new file mode 100644
index 0000000..166afb3
--- /dev/null
+++ b/modules/home/configs/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./monado.nix
+  ];
+}
diff --git a/modules/home/configs/monado.nix b/modules/home/configs/monado.nix
new file mode 100644
index 0000000..7608757
--- /dev/null
+++ b/modules/home/configs/monado.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.modules.home.configs.monado;
+in
+{
+  options.modules.home.configs.monado = {
+    enable = mkEnableOption ''
+      Enable monado
+    '';
+  };
+  config = mkIf cfg.enable {
+    home.file.".local/share/monado/hand-tracking-models".source =
+      pkgs.fetchgit
+      {
+        url = "https://gitlab.freedesktop.org/monado/utilities/hand-tracking-models";
+        sha256 = "x/X4HyyHdQUxn3CdMbWj5cfLvV7UyQe1D01H93UCk+M=";
+        fetchLFS = true;
+      };
+  };
+}
\ No newline at end of file
diff --git a/modules/home/default.nix b/modules/home/default.nix
index ffed88c..6c65cee 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -4,6 +4,7 @@
   imports = [
     ../common.nix
     ./apps
+    ./configs
     ./editors
     ./desktop
     ./shell
diff --git a/modules/system/services/monado.nix b/modules/system/services/monado.nix
index 1fa61fd..48605ca 100644
--- a/modules/system/services/monado.nix
+++ b/modules/system/services/monado.nix
@@ -15,6 +15,7 @@ in
     services.monado = {
       enable = true;
       defaultRuntime = true;
+      forceDefaultRuntime = true;
     };
     
     systemd.user.services.monado.environment = {
@@ -26,16 +27,6 @@ in
       STEAMVR_LH_ENABLE = "1";
       XRT_COMPOSITOR_COMPUTE = "1";
       WMR_HANDTRACKING = "0";
-
-      VIT_SYSTEM_LIBRARY_PATH = "${pkgs.basalt-monado}/lib/libbasalt.so";
     };
-
-    home-manager.users.florian.home.file.".local/share/monado/hand-tracking-models".source =
-      pkgs.fetchgit
-      {
-        url = "https://gitlab.freedesktop.org/monado/utilities/hand-tracking-models";
-        sha256 = "x/X4HyyHdQUxn3CdMbWj5cfLvV7UyQe1D01H93UCk+M=";
-        fetchLFS = true;
-      };
   };
 }
\ No newline at end of file