diff --git a/flake.lock b/flake.lock
index 84519ec..43ae981 100644
--- a/flake.lock
+++ b/flake.lock
@@ -569,11 +569,11 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1700204040,
-        "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=",
+        "lastModified": 1700390070,
+        "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad",
+        "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb",
         "type": "github"
       },
       "original": {
diff --git a/hosts/catbook-j/configuration.nix b/hosts/catbook-j/configuration.nix
index 35fd1e6..b0daeeb 100644
--- a/hosts/catbook-j/configuration.nix
+++ b/hosts/catbook-j/configuration.nix
@@ -19,6 +19,7 @@
       social.enable = true;
       mail.enable = true;
       gaming.enable = true;
+      evremap.enable = true;
     };
     terminal.enable = true;
   };
diff --git a/hosts/monosodium-glutamate-g/configuration.nix b/hosts/monosodium-glutamate-g/configuration.nix
index 0fcf53a..2bc7bcf 100644
--- a/hosts/monosodium-glutamate-g/configuration.nix
+++ b/hosts/monosodium-glutamate-g/configuration.nix
@@ -37,8 +37,8 @@
       cloud.enable = true;
       social.enable = true;
       gaming.enable = true;
-      ios-compat.enable = true;
       mail.enable = true;
+      evremap.enable = false;
     };
     terminal.enable = true;
   };
diff --git a/modules/desktop/evremap.nix b/modules/desktop/evremap.nix
index dc9be06..98e8380 100644
--- a/modules/desktop/evremap.nix
+++ b/modules/desktop/evremap.nix
@@ -1,5 +1,6 @@
-{ pkgs, config, ... }: 
+{ pkgs, config, lib, ... }: 
 let
+  cfg = config.jade.desktop.evremap;
   evremap = pkgs.rustPlatform.buildRustPackage {
     pname = "evremap";
     version = "0.1.0";
@@ -17,12 +18,17 @@ let
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = [ pkgs.libevdev ];
   };
-in {
-  systemd.services.evremap = {
-    script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}";
-    wantedBy = [ "multi-user.target" ];
-    unitConfig = {
-      Restart = "on-failure";
+in with lib; {
+  options.jade.desktop.evremap = {
+    enable = mkEnableOption "Enable evremap";
+  };
+  config = mkIf cfg.enable {
+    systemd.services.evremap = {
+      script = "${evremap}/bin/evremap remap ${../../other/remaps-${config.networking.hostName}.toml}";
+      wantedBy = [ "multi-user.target" ];
+      unitConfig = {
+        Restart = "on-failure";
+      };
     };
   };
 }