From 118d58d3fefd7cbaa18f34a8c0fd42c29bbc9636 Mon Sep 17 00:00:00 2001
From: Lucie Scarlet <lucie@scarlet.moe>
Date: Sat, 6 Jul 2024 23:10:38 +0200
Subject: [PATCH] Changed out i3lock and separated out autostart apps

'i3lock' replaced by 'dm-tool lock' as I primarily use lightdm.
The autostart apps are now in autoload.conf.
---
 i3/autoload.conf |  4 ++++
 i3/i3config      | 12 ++++++------
 i3/install.sh    |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 i3/autoload.conf

diff --git a/i3/autoload.conf b/i3/autoload.conf
new file mode 100644
index 0000000..2721aeb
--- /dev/null
+++ b/i3/autoload.conf
@@ -0,0 +1,4 @@
+exec --no-startup-id sleep 2 && nitrogen --restore
+exec --no-startup-id variety --profile ~/.config/variety
+# exec_always feh --bg-fill /home/lucie/Pictures/stretched-1920-1080-1307768.jpg
+exec --no-startup-id nextcloud
diff --git a/i3/i3config b/i3/i3config
index 2c6388a..4975100 100644
--- a/i3/i3config
+++ b/i3/i3config
@@ -13,7 +13,8 @@ set $mod Mod1
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:monospace 8
+# font pango:monospace 8
+font pango:Iosevka Nerd Font 9
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -28,7 +29,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 -- dm-tool lock
 
 # 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.
@@ -158,6 +159,8 @@ bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 
+bindsym Mod4+l exec dm-tool lock
+
 # resize window (you can also use the mouse for that)
 mode "resize" {
         # These bindings trigger as soon as you enter the resize mode
@@ -191,7 +194,4 @@ bar {
         status_command i3status
 }
 
-exec --no-startup-id sleep 2 && nitrogen --restore
-exec --no-startup-id variety --profile ~/.config/variety
-
-# exec_always feh --bg-fill /home/lucie/Pictures/stretched-1920-1080-1307768.jpg
+include ./autoload.conf
diff --git a/i3/install.sh b/i3/install.sh
index 1d02421..7deacb0 100755
--- a/i3/install.sh
+++ b/i3/install.sh
@@ -5,6 +5,7 @@ set -euxo pipefail
 echo "Installing i3 config"
 mkdir -p ~/.config/i3
 cp ./i3config ~/.config/i3/config
+cp ./autoload.conf ~/.config/i3/autoload.conf
 
 echo  "Installing i3status config"
 mkdir -p ~/.config/i3status
-- 
2.45.2