diff --git a/modules/linux/home-manager/hyprland.nix b/modules/linux/home-manager/hyprland.nix
index 8ca85d2..8724578 100644
--- a/modules/linux/home-manager/hyprland.nix
+++ b/modules/linux/home-manager/hyprland.nix
@@ -40,8 +40,8 @@
     #!/usr/bin/env sh
 
     case "$(printf "shutdown\\nreboot" | tofi --prompt "Choose your poison")" in
-    "shutdown") systemctl poweroff ;;
-    "reboot") systemctl reboot ;;
+    "shutdown") poweroff ;;
+    "reboot") reboot ;;
     esac
   '';
   grim = "${pkgs.grim}/bin/grim";
@@ -123,13 +123,6 @@ in {
           "hyprctl monitors | grep 'HDMI' && hyprctl keyword monitor 'eDP-1, disable'"
         ];
 
-        # Setup plugins
-        plugin = {
-          wslayout = {
-            default_layout = "master";
-          };
-        };
-
         cursor = {
           no_break_fs_vrr = 1;
           no_hardware_cursors = 1;
@@ -176,6 +169,7 @@ in {
           gaps_in = 3;
           gaps_out = 6;
           allow_tearing = true;
+          layout = "master";
         };
 
         misc = {
@@ -197,6 +191,11 @@ in {
           allow_workspace_cycles = true;
         };
 
+        workspace = [
+          "1, layout:monocle"
+          "5, layout:monocle"
+        ];
+
         bind = [
           "$mod,        Return, exec, $terminal"
           "$mod SHIFT,  Q, killactive"
diff --git a/modules/linux/nixos/general-services.nix b/modules/linux/nixos/general-services.nix
index 528df32..33ec0be 100644
--- a/modules/linux/nixos/general-services.nix
+++ b/modules/linux/nixos/general-services.nix
@@ -27,7 +27,10 @@
     # Enable dconf
     programs.dconf.enable = true;
 
+    # Enable gnome keyring
+    services.gnome.gnome-keyring.enable = true;
+
     # Setup dbus broker
-    # services.dbus.implementation = "broker";
+    services.dbus.implementation = "broker";
   };
 }