diff --git a/home-manager/home.nix b/home-manager/home.nix
index 819b4e9..1ebf1ad 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -18,8 +18,8 @@
   # States home manager version that config was originally compatible with, do not change without reading all patch notes since this version and altering as needed
   home.stateVersion = "24.05";
 
-  services.pass-secret-service.enable = true; # for use with protonmail-bridge
-#  services.gnome-keyring.enable = true; # should be easier for protonmail-bridge
+#  services.pass-secret-service.enable = true; # for use with protonmail-bridge
+  services.gnome-keyring.enable = true; # should be easier for protonmail-bridge
 
   # Cursor configuration that I hope to one day understand, currently has a scaling issue but thats probably my fault
   home.pointerCursor = 
diff --git a/home-manager/hyprland.nix b/home-manager/hyprland.nix
index ad60b95..85e533e 100644
--- a/home-manager/hyprland.nix
+++ b/home-manager/hyprland.nix
@@ -5,61 +5,60 @@
     enable = true;
     package = pkgs.hyprland;
     xwayland.enable = true;
+
     # Autostart using systemd
     systemd.enable = true;
-    extraConfig = ''
-      exec-once = waybar
-      exec-once = swaync
+    settings = {
 
-      # Monitor settings
-      monitor = eDP-2, 2560x1600@165, 0x0, auto # main laptop monitor
-      monitor = DP-3, 1920x1080@119.98, -1280x-1080, auto # left external monitor
-      monitor = DP-2, 1920x1080@119.98, 640x-1080, auto # right external monitor
-    '';
-  };
-  # Hyprland configuration
-  wayland.windowManager.hyprland.settings = {
-    "$mod" = "SUPER";
-    input = { kb_layout = "gb"; };
-    bindm = [
-      "$mod, mouse:272, movewindow"
-      "$mod, mouse:273, resizewindow"
-    ];
-    bind =
-      [
-        # Keybinds for starting programs
-        "$mod, F, exec, firefox"
-        "$mod, 1, exec, alacritty"
-        "$mod, D, exec, vesktop"
-        "$mod, space, exec, anyrun"
+      monitor =
+        [
+          "eDP-2, 2560x1600@165, 0x0, auto" # main laptop monitor
+          "DP-3, 1920x1080@119.98, -1280x-1080, auto" # left external monitor
+          "DP-2, 1920x1080@119.98, 640x-1080, auto" # right external monitor
+        ];    
 
-        # Screenshot tool
-        ", Print, exec, grimblast copy area"
+      "$mod" = "SUPER";
+      input = { kb_layout = "gb"; };
+      bindm = [
+        "$mod, mouse:272, movewindow"
+        "$mod, mouse:273, resizewindow"
+      ];
+      bind =
+        [
+          # Keybinds for starting programs
+          "$mod, F, exec, firefox"
+          "$mod, 1, exec, alacritty"
+          "$mod, D, exec, vesktop"
+          "$mod, space, exec, anyrun"
 
-        # Screen locking tool
-        "$mod, l, exec, hyprlock" 
+          # Screenshot tool
+          ", Print, exec, grimblast copy area"
 
-        # Window management
-        "$mod, x, killactive"
-        "$mod, tab, togglefloating"
-      ]
-      ++ (
-        # workspaces
-        # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
-        builtins.concatLists (builtins.genList (
-          x: let
-            ws = let
-              c = (x + 1) / 10;
-            in
-              builtins.toString (x + 1 - (c * 10));
-            in [
-              "$mod, ${ws}, workspace, ${toString (x + 1)}"
-              "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
-            ]
-          ) 10)
-      );
-    xwayland = {
-      force_zero_scaling = true;
+          # Screen locking tool
+          "$mod, l, exec, hyprlock" 
+
+          # Window management
+          "$mod, x, killactive"
+          "$mod, tab, togglefloating"
+        ]
+        ++ (
+          # workspaces
+          # binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
+          builtins.concatLists (builtins.genList (
+            x: let
+              ws = let
+                c = (x + 1) / 10;
+              in
+                builtins.toString (x + 1 - (c * 10));
+              in [
+                "$mod, ${ws}, workspace, ${toString (x + 1)}"
+                "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}"
+              ]
+            ) 10)
+        );
+      xwayland = {
+        force_zero_scaling = true;
+      };
     };
   };
 }
diff --git a/home-manager/swaync.nix b/home-manager/swaync.nix
index 13a131e..f140285 100644
--- a/home-manager/swaync.nix
+++ b/home-manager/swaync.nix
@@ -1,5 +1,6 @@
 {config, pkgs, ...}:
 {
+  # Enables swaync and automatically includes systemd user service to auto-start on login, this cannot be disabled so I am using it instead of hyprland exec-once otherwise home-manager complains that the service failed to start
   services.swaync = {
     enable = true;
     style = ''
diff --git a/home-manager/waybar.nix b/home-manager/waybar.nix
index 0924582..d05c4f6 100644
--- a/home-manager/waybar.nix
+++ b/home-manager/waybar.nix
@@ -2,7 +2,7 @@
 {  
   programs.waybar = {
     enable = true;
-    systemd.enable = false;
+    systemd.enable = true; # using these instead of exec-once beacuse SOME packages (swaync) dont let you disable them
     settings = {
       mainBar = {
         layer = "top";
diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix
index c570105..fd4b8a4 100644
--- a/hosts/gabbielaptop/configuration.nix
+++ b/hosts/gabbielaptop/configuration.nix
@@ -138,9 +138,11 @@
   programs.steam.remotePlay.openFirewall = true;  
 
   # This desperately needs moving to home.nix but the home-manager module is not yet available
+  
   services.protonmail-bridge = {
     enable = true;
-    path = [ pkgs.pass-secret-service ]
+    path = [ pkgs.gnome-keyring ];
+    logLevel = "debug";
   };
 
   # protonmail daemon config