diff --git a/common/graphix.nix b/common/graphix.nix
new file mode 100644
index 0000000..c8220f2
--- /dev/null
+++ b/common/graphix.nix
@@ -0,0 +1,8 @@
+{
+  config,
+  pkgs,
+  ...
+}:
+{
+  security.pam.services.hyprlock = { };
+}
diff --git a/common/home/default.nix b/common/home/default.nix
index 2d0d2a9..f37f70a 100644
--- a/common/home/default.nix
+++ b/common/home/default.nix
@@ -458,6 +458,9 @@ in
     };
     # Let Home Manager install and manage itself.
     home-manager.enable = true;
+    hyprlock = {
+      enable = enableGraphical;
+    };
     # add `play funny video` as alias because why not
     zsh.shellAliases.bzzt = lib.mkIf enableGraphical ''nix-shell -p mpv --command "mpv ~/Videos/BZZZM.mp4"'';
     # lsd makes files look better
@@ -504,10 +507,6 @@ in
         };
       };
     };
-    zoxide = {
-      enable = true;
-      enableZshIntegration = true;
-    };
   };
 
   services = {
@@ -561,7 +560,6 @@ in
     targets = {
       neovim.enable = false;
       waybar.enable = false;
-      swaylock.enable = true;
       fuzzel.enable = false;
       firefox.profileNames = [ "profile_0" ];
       qt = {
diff --git a/hosts/lambdaos/root.nix b/hosts/lambdaos/root.nix
index d670067..6340e48 100644
--- a/hosts/lambdaos/root.nix
+++ b/hosts/lambdaos/root.nix
@@ -126,7 +126,6 @@
     targets = {
       neovim.enable = false;
       waybar.enable = false;
-      swaylock.enable = true;
       firefox.profileNames = [ "profile_0" ];
       qt = {
         enable = true;
diff --git a/hosts/muos/configuration.nix b/hosts/muos/configuration.nix
index 930114e..b4fbc7d 100644
--- a/hosts/muos/configuration.nix
+++ b/hosts/muos/configuration.nix
@@ -12,6 +12,8 @@
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
 
+    ../../common/graphix.nix
+
     ../../common
     ../../common/configuration.nix
 
diff --git a/hosts/muos/root.nix b/hosts/muos/root.nix
index 995b210..b6e33f1 100644
--- a/hosts/muos/root.nix
+++ b/hosts/muos/root.nix
@@ -126,7 +126,6 @@
     targets = {
       neovim.enable = false;
       waybar.enable = false;
-      swaylock.enable = true;
       firefox.profileNames = [ "profile_0" ];
       qt = {
         enable = true;
diff --git a/modules/applications/firefox.nix b/modules/applications/firefox.nix
index 4d895e1..93ebc77 100644
--- a/modules/applications/firefox.nix
+++ b/modules/applications/firefox.nix
@@ -24,6 +24,7 @@ in
           isDefault = true;
           search = {
             default = "ddg";
+            force = true;
             order = [
               "ddg"
               "google"
diff --git a/modules/waybar/power.nix b/modules/waybar/power.nix
index a1ed166..de62669 100644
--- a/modules/waybar/power.nix
+++ b/modules/waybar/power.nix
@@ -20,7 +20,7 @@ in
       settings.mainBar."${name}" = {
         format = "";
         on-click = "${inputs.self.packages.${pkgs.system}.fuzzel-power}/bin/fuzzel-power";
-        on-click-right = "${pkgs.swaylock}/bin/swaylock"; # TODO: change to whatever lock screen i want
+        on-click-right = "${pkgs.hyprlock}/bin/hyprlock";
       };
       style = ''
         #custom-poweroff {
diff --git a/packages/fuzzel-power.nix b/packages/fuzzel-power.nix
index 6294591..27f22db 100644
--- a/packages/fuzzel-power.nix
+++ b/packages/fuzzel-power.nix
@@ -10,7 +10,7 @@ pkgs.writeShellScriptBin "fuzzel-power" ''
   if [ "$selected_option" == "$lock" ]
   then
   echo "lock"
-  ${pkgs.swaylock}/bin/swaylock
+  ${pkgs.hyprlock}/bin/hyprlock
   elif [ "$selected_option" == "$poweroff" ]
   then
   echo "poweroff"
diff --git a/packages/niri-config/default.nix b/packages/niri-config/default.nix
index 41d425b..3d0b798 100644
--- a/packages/niri-config/default.nix
+++ b/packages/niri-config/default.nix
@@ -8,7 +8,7 @@ let
   terminal = "${pkgs.kitty}/bin/kitty";
   launcher = "${self-pkgs.fuzzel-launch}/bin/fuzzel-launch";
   power-menu = "${self-pkgs.fuzzel-power}/bin/fuzzel-power";
-  lockscreen = "${pkgs.swaylock}/bin/swaylock";
+  lockscreen = "${pkgs.hyprlock}/bin/hyprlock";
   autostart-string =
     "spawn-at-startup \""
     + pkgs.lib.strings.concatStringsSep "\nspawn-at-startup \"" [