Vylpes/nixos
1
0
Fork 0
Code Issues 24 Pull requests Wiki Activity

Resolve conflict

Browse source
This commit is contained in:
Ethan Lane 2024-07-07 19:29:10 +01:00
parent c6de5703f7
commit b542641b28
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/home.nix
View file

@ -38,7 +38,6 @@ in {
hack-font hack-font
hugo hugo
i3 i3
i3lock
i3lock-fancy i3lock-fancy
keepassxc keepassxc
keepmenu keepmenu

2
config/packages/i3/config
View file

@ -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 # 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. # 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, # 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. # and nm-applet is a desktop environment-independent system tray GUI for it.