diff --git a/home/crow/common/optional/desktops/sway/default.nix b/home/crow/common/optional/desktops/sway/default.nix
index ea145bd..8dbf765 100644
--- a/home/crow/common/optional/desktops/sway/default.nix
+++ b/home/crow/common/optional/desktops/sway/default.nix
@@ -27,11 +27,8 @@ in
 
   home.packages = with pkgs; [
     foot
-    polkit_gnome
     swayidle
     sway-audio-idle-inhibit
-    swaylock-effects
-    hyprlock
     wljoywake
   ];
 
diff --git a/home/crow/common/optional/desktops/sway/sway.conf b/home/crow/common/optional/desktops/sway/sway.conf
index e5a7835..ec96177 100644
--- a/home/crow/common/optional/desktops/sway/sway.conf
+++ b/home/crow/common/optional/desktops/sway/sway.conf
@@ -5,8 +5,6 @@
 set $mod Mod4
 set $term foot
 
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # FIXME: Look at dank polkit
-
 #######
 # DMS #
 #######
@@ -57,14 +55,15 @@ exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP WA
 exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 
-###############
-# IDLE CONFIG # # FIXME: Switch to DankGreeter
-###############
+####################
+# IDLE/LOCK CONFIG #
+####################
 
-exec swayidle -w timeout 300 'hyprlock'
+set $lock 'dms ipc call lock lock'
+
+exec swayidle -w timeout 300 $lock
 exec wljoywake # prevent screen sleep on joystick input
 
-set $lock 'hyprlock'
 bindswitch --reload --locked lid:on exec $lock
 for_window [app_id="firefox"] inhibit_idle fullscreen
 bindsym $mod+Shift+z exec $lock
diff --git a/hosts/common/optional/battery.nix b/hosts/common/optional/battery.nix
new file mode 100644
index 0000000..66e2b8f
--- /dev/null
+++ b/hosts/common/optional/battery.nix
@@ -0,0 +1,5 @@
+{
+  services.upower = {
+    enable = true;
+  };
+}
diff --git a/hosts/nixos/Incarceron/default.nix b/hosts/nixos/Incarceron/default.nix
index 7a357a8..a6ecf91 100644
--- a/hosts/nixos/Incarceron/default.nix
+++ b/hosts/nixos/Incarceron/default.nix
@@ -35,6 +35,7 @@
 
       # Optional configs
       "hosts/common/optional/audio.nix"
+      "hosts/common/optional/battery.nix"
       "hosts/common/optional/bluetooth.nix"
       "hosts/common/optional/keyd.nix"
       "hosts/common/optional/pentesting.nix"