From b542641b28385ba8116d3d8967c474c936e9c798 Mon Sep 17 00:00:00 2001
From: Ethan Lane <ethan@vylpes.com>
Date: Sun, 7 Jul 2024 19:29:10 +0100
Subject: [PATCH] Resolve conflict

---
 config/home.nix           | 1 -
 config/packages/i3/config | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/home.nix b/config/home.nix
index de90316..5c52bc1 100644
--- a/config/home.nix
+++ b/config/home.nix
@@ -38,7 +38,6 @@ in {
         hack-font
         hugo
         i3
-        i3lock
         i3lock-fancy
         keepassxc
         keepmenu
diff --git a/config/packages/i3/config b/config/packages/i3/config
index 780894c..acd2ee8 100644
--- a/config/packages/i3/config
+++ b/config/packages/i3/config
@@ -28,7 +28,7 @@ exec --no-startup-id dex --autostart --environment i3
 
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
-exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock-fancy --nofork
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.