diff --git a/platforms/home-manager/modules/nmasur/presets/programs/rofi/power.nix b/platforms/home-manager/modules/nmasur/presets/programs/rofi/power.nix
index 433fcbf..a368ff2 100644
--- a/platforms/home-manager/modules/nmasur/presets/programs/rofi/power.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/rofi/power.nix
@@ -14,56 +14,61 @@ in
   # https://gitlab.com/vahnrr/rofi-menus/-/blob/b1f0e8a676eda5552e27ef631b0d43e660b23b8e/scripts/rofi-power
   # A rofi powered menu to execute power related action.
 
-  config.powerCommand = lib.mkIf config.nmasur.presets.programs.rofi.enable builtins.toString (
-    pkgs.writeShellScript "powermenu" ''
-      power_off=''
-      reboot=''
-      lock=''
-      suspend='󰒲'
-      log_out=''
+  config.nmasur.presets.services.i3.commands.power =
+    lib.mkIf config.nmasur.presets.programs.rofi.enable
+      (
+        builtins.toString (
+          pkgs.writeShellScript "powermenu" # bash
+            ''
+              power_off=''
+              reboot=''
+              lock=''
+              suspend='󰒲'
+              log_out=''
 
-      chosen=$(printf '%s;%s;%s;%s;%s\n' \
-          "$power_off" \
-          "$reboot" \
-          "$lock" \
-          "$suspend" \
-          "$log_out" \
-          | ${lib.getExe rofi} \
-              -theme-str '@import "power.rasi"' \
-              -hover-select \
-              -me-select-entry "" \
-              -me-accept-entry MousePrimary \
-              -dmenu \
-              -sep ';' \
-              -selected-row 2)
+              chosen=$(printf '%s;%s;%s;%s;%s\n' \
+                  "$power_off" \
+                  "$reboot" \
+                  "$lock" \
+                  "$suspend" \
+                  "$log_out" \
+                  | ${lib.getExe rofi} \
+                      -theme-str '@import "power.rasi"' \
+                      -hover-select \
+                      -me-select-entry "" \
+                      -me-accept-entry MousePrimary \
+                      -dmenu \
+                      -sep ';' \
+                      -selected-row 2)
 
-      confirm () {
-          ${builtins.readFile ./rofi-prompt.sh}
-      }
+              confirm () {
+                  ${builtins.readFile ./rofi-prompt.sh}
+              }
 
-      case "$chosen" in
-          "$power_off")
-              confirm 'Shutdown?' && doas shutdown now
-              ;;
+              case "$chosen" in
+                  "$power_off")
+                      confirm 'Shutdown?' && doas shutdown now
+                      ;;
 
-          "$reboot")
-              confirm 'Reboot?' && doas reboot
-              ;;
+                  "$reboot")
+                      confirm 'Reboot?' && doas reboot
+                      ;;
 
-          "$lock")
-              ${lib.getExe pkgs.betterlockscreen} --lock --display 1 --blur 0.5 --span
-              ;;
+                  "$lock")
+                      ${lib.getExe pkgs.betterlockscreen} --lock --display 1 --blur 0.5 --span
+                      ;;
 
-          "$suspend")
-              systemctl suspend
-              ;;
+                  "$suspend")
+                      systemctl suspend
+                      ;;
 
-          "$log_out")
-              confirm 'Logout?' && i3-msg exit
-              ;;
+                  "$log_out")
+                      confirm 'Logout?' && i3-msg exit
+                      ;;
 
-          *) exit 1 ;;
-      esac
-    ''
-  );
+                  *) exit 1 ;;
+              esac
+            ''
+        )
+      );
 }
diff --git a/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix b/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix
index e05f82a..9b76477 100644
--- a/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/linux-gui.nix
@@ -33,7 +33,6 @@ in
       services = {
         dunst.enable = lib.mkDefault false; # Off by default
         i3.enable = lib.mkDefault true;
-        kanata.enable = lib.mkDefault true;
         keybase.enable = lib.mkDefault true;
         mbsync.enable = lib.mkDefault true;
         picom.enable = lib.mkDefault true;
diff --git a/platforms/home-manager/modules/nmasur/presets/services/kanata.nix b/platforms/nixos/modules/nmasur/presets/services/kanata.nix
similarity index 100%
rename from platforms/home-manager/modules/nmasur/presets/services/kanata.nix
rename to platforms/nixos/modules/nmasur/presets/services/kanata.nix
diff --git a/platforms/nixos/modules/nmasur/profiles/gui.nix b/platforms/nixos/modules/nmasur/profiles/gui.nix
index 78fa3cf..f95089d 100644
--- a/platforms/nixos/modules/nmasur/profiles/gui.nix
+++ b/platforms/nixos/modules/nmasur/profiles/gui.nix
@@ -16,6 +16,8 @@ in
 
   config = lib.mkIf cfg.enable {
 
+    nmasur.presets.services.kanata.enable = lib.mkDefault true;
+
     # Mouse customization
     services.ratbagd.enable = lib.mkDefault true;