summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dots/git/.gitconfig.j22
-rw-r--r--dots/sway/.config/sway/config.d/10-autostart-applications4
-rw-r--r--dots/swaylock/.config/swaylock/config.j24
3 files changed, 5 insertions, 5 deletions
diff --git a/dots/git/.gitconfig.j2 b/dots/git/.gitconfig.j2
index dc8d3e3..430c518 100644
--- a/dots/git/.gitconfig.j2
+++ b/dots/git/.gitconfig.j2
@@ -1,3 +1,5 @@
+[init]
+ defaultBranch = main
[user]
signingkey = {{ pgp.signing }}
user = {{ user.name }}
diff --git a/dots/sway/.config/sway/config.d/10-autostart-applications b/dots/sway/.config/sway/config.d/10-autostart-applications
index 114cb51..25bfc02 100644
--- a/dots/sway/.config/sway/config.d/10-autostart-applications
+++ b/dots/sway/.config/sway/config.d/10-autostart-applications
@@ -12,8 +12,8 @@ exec swww-daemon -f xrgb
exec systemctl start --user wallpaper
exec swayidle -w \
- timeout 300 'swaylock' \
- timeout 600 'swaymsg "output * dpms off"' \
+ timeout 900 'swaylock' \
+ timeout 1200 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"'
exec gnome-keyring-daemon --daemonize --start --components=gpg,pkcs11,secrets,ssh
diff --git a/dots/swaylock/.config/swaylock/config.j2 b/dots/swaylock/.config/swaylock/config.j2
index a43037d..8db54be 100644
--- a/dots/swaylock/.config/swaylock/config.j2
+++ b/dots/swaylock/.config/swaylock/config.j2
@@ -30,10 +30,8 @@ ring-clear-color={{ theme.colors.bright6 }}
line-clear-color={{ theme.colors.bright5 }}
line-wrong-color={{ theme.colors.bright1 }}
bs-hl-color={{ theme.colors.bright3 }}
-grace=2
+grace=5
fade-in=0.4
-grace-no-mouse
-grace-no-touch
datestr=%a, %B %e
timestr=%I:%M %p
ignore-empty-password