diff --git a/lib/mksystem.nix b/lib/mksystem.nix
index bc46fa3..78765b1 100644
--- a/lib/mksystem.nix
+++ b/lib/mksystem.nix
@@ -70,6 +70,8 @@ in
         )
         ../hosts/${hostname}/hardware-configuration.nix
 
+        inputs.nix-index-database.nixosModules.nix-index
+
         home-manager.home-manager
         {
           home-manager = {
@@ -81,7 +83,6 @@ in
                 [
                   ../modules/cli/home.nix
                   (../environments + "/${env}/home.nix")
-                  inputs.nix-index-database.hmModules.nix-index
                 ]
                 ++ customHome;
             };
@@ -106,5 +107,8 @@ in
           };
         })
       ]
+      ++ nixpkgs.lib.optionals darwin [
+        inputs.nix-index-database.darwinModules.nix-index
+      ]
       ++ custom;
   }
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 5188fc6..d571585 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -47,7 +47,7 @@
 
   programs.zsh.enable = true;
   environment.shells = with pkgs; [zsh];
-  programs.command-not-found.enable = false;
+  programs.nix-index-database.comma.enable = true;
 
   services.locate = {
     enable = true;
diff --git a/modules/cli/zsh/default.nix b/modules/cli/zsh/default.nix
index bafe411..82527bc 100644
--- a/modules/cli/zsh/default.nix
+++ b/modules/cli/zsh/default.nix
@@ -237,7 +237,6 @@
     };
   };
 
-  programs.command-not-found.enable = false;
   programs.nix-index = {
     enable = true;
     enableZshIntegration = true;
diff --git a/modules/wm/default.nix b/modules/wm/default.nix
index 39de9cb..6643fa6 100644
--- a/modules/wm/default.nix
+++ b/modules/wm/default.nix
@@ -21,32 +21,20 @@
     pulse.enable = true;
   };
 
-  powerManagement = {
-    powerDownCommands = ''
-      for device_wu in /sys/bus/usb/devices/*/power/wakeup; do
-        echo enabled > $device_wu
-      done
-      ${pkgs.util-linux}/bin/rfkill block bluetooth
-    '';
-    powerUpCommands = ''
-      ${pkgs.util-linux}/bin/rfkill unblock bluetooth
-    '';
-  };
+  # allow keyboard to wakeup from suspend
+  services.udev.extraRules = ''
+    ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="615e", ATTR{power/wakeup}="enabled"
+  '';
 
   services.printing.enable = true;
   security.polkit.enable = true;
   security.rtkit.enable = true;
   services.upower.enable = true;
-  services.gvfs.enable = true;
-  services.udisks2.enable = true;
   services.libinput.enable = true;
-  services.colord.enable = true;
   services.system-config-printer.enable = true;
   services.gnome.glib-networking.enable = true;
   services.gnome.gnome-settings-daemon.enable = true;
 
-  services.avahi.enable = true;
-
   environment.systemPackages = with pkgs; [
     gnome-bluetooth
     polkit_gnome