Resolve conflict
This commit is contained in:
parent
c6de5703f7
commit
b542641b28
2 changed files with 1 additions and 2 deletions
|
@ -38,7 +38,6 @@ in {
|
|||
hack-font
|
||||
hugo
|
||||
i3
|
||||
i3lock
|
||||
i3lock-fancy
|
||||
keepassxc
|
||||
keepmenu
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue