From b54786c4cb50b43360367e1b061bcb763a30b6f6 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Thu, 22 Sep 2022 13:21:14 +0200
Subject: fix more templates

---
 .config/X11/base                      | 16 ----------------
 .config/X11/base##template            | 21 +++++++++++++++++++++
 .config/i3/autostart                  | 24 +++++++++++++++++++++++-
 .config/i3/autostart##hostname.thoncc | 23 -----------------------
 .config/i3/autostart##template        | 28 ++++++++++++++++++++++++++++
 5 files changed, 72 insertions(+), 40 deletions(-)
 delete mode 100644 .config/X11/base
 create mode 100644 .config/X11/base##template
 mode change 120000 => 100644 .config/i3/autostart
 delete mode 100644 .config/i3/autostart##hostname.thoncc
 create mode 100644 .config/i3/autostart##template

diff --git a/.config/X11/base b/.config/X11/base
deleted file mode 100644
index 3e41052..0000000
--- a/.config/X11/base
+++ /dev/null
@@ -1,16 +0,0 @@
-*.font: JetBrainsMono Nerd Font:size=9:antialias=true:autohint=true
-
-*.termname: st-256color
-*.shell: /bin/sh
-
-*.tabspaces: 4
-*.borderpx: 16
-
-Xcursor.theme: OpenZone_Black
-
-Xft.dpi: 96
-Xft.hinting: 1
-Xft.hintstyle: hintslight
-Xft.antialias: 1
-Xft.rgba: rgb
-
diff --git a/.config/X11/base##template b/.config/X11/base##template
new file mode 100644
index 0000000..473ea97
--- /dev/null
+++ b/.config/X11/base##template
@@ -0,0 +1,21 @@
+{% if yadm.hostname == "thoncc" %}
+*.font: JetBrainsMono Nerd Font:style=Medium,Regular:size=7.5
+*.borderpx: 8
+Xcursor.theme: OpenZone_Black_Slim
+{% else %}
+*.font: JetBrainsMono Nerd Font:size=9:antialias=true:autohint=true
+*.borderpx: 16
+Xcursor.theme: OpenZone_Black
+{% endif %}
+
+*.termname: st-256color
+*.shell: /bin/sh
+
+*.tabspaces: 4
+
+Xft.dpi: 96
+Xft.hinting: 1
+Xft.hintstyle: hintslight
+Xft.antialias: 1
+Xft.rgba: rgb
+
diff --git a/.config/i3/autostart b/.config/i3/autostart
deleted file mode 120000
index 9a8ccbb..0000000
--- a/.config/i3/autostart
+++ /dev/null
@@ -1 +0,0 @@
-autostart##hostname.thoncc
\ No newline at end of file
diff --git a/.config/i3/autostart b/.config/i3/autostart
new file mode 100644
index 0000000..c6daa43
--- /dev/null
+++ b/.config/i3/autostart
@@ -0,0 +1,23 @@
+#!/bin/sh
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+cat ~/.config/X11/base ~/.config/X11/light | xrdb &
+polybar main -c ~/.config/polybar/config &
+zsh -c "rwall" &
+picom -b
+xbanish &
+dunst &
+flashfocus &
+xset r rate 250 40
+autocutsel &
+fcitx5 -d
+zsh -c "xbindkeys -f ~/.config/xbindkeys/main"
+xdimmer -t 45 -p 3 &
+light-locker --no-late-locking &
+
+# bw unlock <password> --raw | keyctl padd user bw_session @u
+sh ~/.config/i3/unlock_bitwarden &
+
+# auto start lazy script
+sleep 2
+[[ -f ~/do.sh ]] && source ~/do.sh
+
diff --git a/.config/i3/autostart##hostname.thoncc b/.config/i3/autostart##hostname.thoncc
deleted file mode 100644
index c6daa43..0000000
--- a/.config/i3/autostart##hostname.thoncc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-cat ~/.config/X11/base ~/.config/X11/light | xrdb &
-polybar main -c ~/.config/polybar/config &
-zsh -c "rwall" &
-picom -b
-xbanish &
-dunst &
-flashfocus &
-xset r rate 250 40
-autocutsel &
-fcitx5 -d
-zsh -c "xbindkeys -f ~/.config/xbindkeys/main"
-xdimmer -t 45 -p 3 &
-light-locker --no-late-locking &
-
-# bw unlock <password> --raw | keyctl padd user bw_session @u
-sh ~/.config/i3/unlock_bitwarden &
-
-# auto start lazy script
-sleep 2
-[[ -f ~/do.sh ]] && source ~/do.sh
-
diff --git a/.config/i3/autostart##template b/.config/i3/autostart##template
new file mode 100644
index 0000000..22bd22d
--- /dev/null
+++ b/.config/i3/autostart##template
@@ -0,0 +1,28 @@
+#!/bin/sh
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+cat ~/.config/X11/base ~/.config/X11/light | xrdb &
+polybar main -c ~/.config/polybar/config &
+zsh -c "rwall" &
+picom -b
+xbanish &
+dunst &
+flashfocus &
+xset r rate 250 40
+autocutsel &
+fcitx5 -d
+zsh -c "xbindkeys -f ~/.config/xbindkeys/main"
+{% if yadm.hostname == "thoncc" %}
+xdimmer -t 45 -p 3 &
+light-locker --no-late-locking &
+{% else %}
+redshift -l 52:6 &
+nicotine &
+{% endif %}
+
+# bw unlock <password> --raw | keyctl padd user bw_session @u
+sh ~/.config/i3/unlock_bitwarden &
+
+# auto start lazy script
+sleep 2
+[[ -f ~/do.sh ]] && source ~/do.sh
+
-- 
cgit v1.2.3