From df4cc7dd374c8415da1be263de9fcd0524fbe033 Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Thu, 23 Jan 2025 20:16:27 +0100
Subject: update templates

---
 .config/X11/base                      | 13 +++++++++++++
 .config/X11/base##template            | 20 --------------------
 .config/i3/autostart##template        |  3 ---
 .config/i3/config##template           |  4 ----
 .config/mpd/mpd.conf##default         | 23 +++++++++++++++++++++++
 .config/mpd/mpd.conf##hostname.thoncc | 23 -----------------------
 .config/zathura/zathurarc             | 15 +++++++++++++++
 .config/zathura/zathurarc##template   | 20 --------------------
 8 files changed, 51 insertions(+), 70 deletions(-)
 create mode 100644 .config/X11/base
 delete mode 100644 .config/X11/base##template
 create mode 100644 .config/mpd/mpd.conf##default
 delete mode 100644 .config/mpd/mpd.conf##hostname.thoncc
 create mode 100644 .config/zathura/zathurarc
 delete mode 100644 .config/zathura/zathurarc##template

diff --git a/.config/X11/base b/.config/X11/base
new file mode 100644
index 0000000..a556ed2
--- /dev/null
+++ b/.config/X11/base
@@ -0,0 +1,13 @@
+*.font: JetBrainsMono Nerd Font:size=7.5:antialias=true:autohint=true
+*.borderpx: 10
+*.termname: st-256color
+*.tabspaces: 2
+
+Xft.dpi: 96
+Xft.hinting: 1
+Xft.hintstyle: hintslight
+Xft.antialias: 1
+Xft.rgba: rgb
+
+Xcursor.theme: OpenZone_Black_Slim
+
diff --git a/.config/X11/base##template b/.config/X11/base##template
deleted file mode 100644
index 04bf1d1..0000000
--- a/.config/X11/base##template
+++ /dev/null
@@ -1,20 +0,0 @@
-{% if yadm.hostname == "thoncc" %}
-*.font: JetBrainsMono Nerd Font:size=7.5:antialias=true:autohint=true
-*.borderpx: 8
-{% else %}
-*.font: JetBrainsMono Nerd Font:size=9:antialias=true:autohint=true
-*.borderpx: 16
-{% endif %}
-Xcursor.theme: OpenZone_Black_Slim
-
-*.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##template b/.config/i3/autostart##template
index 6b7f908..fd89bdd 100755
--- a/.config/i3/autostart##template
+++ b/.config/i3/autostart##template
@@ -1,7 +1,6 @@
 #!/bin/sh
 . "$HOME/.profile"
 xrdb -override < "$XDG_CONFIG_HOME/X11/base"
-mode --no-reload restore
 
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 polybar &
@@ -13,13 +12,11 @@ fcitx5 &
 xbindkeys --nodaemon &
 {% if yadm.hostname == "thoncc" %}
 xdimmer -t 45 -p 3 &
-light-locker --no-late-locking &
 {% else %}
 redshift -l 52:6 &
 nicotine --hidden &
 desktop2mqtt --config "$XDG_CONFIG_HOME/desktop2mqtt/config.yml" &
 {% endif %}
-flashfocus &
 
 # auto start lazy script after everything else
 [ -x "$HOME/do.sh" ] && "$HOME/do.sh" &
diff --git a/.config/i3/config##template b/.config/i3/config##template
index 2af8c10..66874a0 100644
--- a/.config/i3/config##template
+++ b/.config/i3/config##template
@@ -1,10 +1,6 @@
 # variables
 set $mod Mod4
-{% if yadm.hostname == "thoncc" %}
 set $inner_gaps 8
-{% else %}
-set $inner_gaps 10
-{% endif %}
 set $outer_gaps 0
 
 # set gaps
diff --git a/.config/mpd/mpd.conf##default b/.config/mpd/mpd.conf##default
new file mode 100644
index 0000000..a374418
--- /dev/null
+++ b/.config/mpd/mpd.conf##default
@@ -0,0 +1,23 @@
+music_directory "https://media.pipeframe.xyz/music"
+playlist_directory "/mnt/mpd/playlists"
+
+pid_file "/mnt/mpd/mpd.pid"
+state_file "/mnt/mpd/mpdstate"
+
+bind_to_address		"*"
+port				"6600"
+restore_paused		"yes"
+
+replaygain "track"
+replaygain_preamp "0"
+
+database {
+	plugin "proxy"
+	host "pipeframe.xyz"
+}
+
+audio_output {
+	type			"pulse"
+	name			"desktop output"
+}
+
diff --git a/.config/mpd/mpd.conf##hostname.thoncc b/.config/mpd/mpd.conf##hostname.thoncc
deleted file mode 100644
index a374418..0000000
--- a/.config/mpd/mpd.conf##hostname.thoncc
+++ /dev/null
@@ -1,23 +0,0 @@
-music_directory "https://media.pipeframe.xyz/music"
-playlist_directory "/mnt/mpd/playlists"
-
-pid_file "/mnt/mpd/mpd.pid"
-state_file "/mnt/mpd/mpdstate"
-
-bind_to_address		"*"
-port				"6600"
-restore_paused		"yes"
-
-replaygain "track"
-replaygain_preamp "0"
-
-database {
-	plugin "proxy"
-	host "pipeframe.xyz"
-}
-
-audio_output {
-	type			"pulse"
-	name			"desktop output"
-}
-
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
new file mode 100644
index 0000000..ff927ca
--- /dev/null
+++ b/.config/zathura/zathurarc
@@ -0,0 +1,15 @@
+set scroll-page-aware "true"
+set scroll-full-overlap 0.01
+set scroll-step 100
+set selection-clipboard clipboard
+
+# recolor (dark mode)
+map <C-i> recolor
+set recolor "true"
+
+set recolor-reverse-video "true"
+set recolor-keephue "true"
+set guioptions ""
+
+include ./colors
+
diff --git a/.config/zathura/zathurarc##template b/.config/zathura/zathurarc##template
deleted file mode 100644
index 932d1c7..0000000
--- a/.config/zathura/zathurarc##template
+++ /dev/null
@@ -1,20 +0,0 @@
-set scroll-page-aware "true"
-set scroll-full-overlap 0.01
-set scroll-step 100
-{% if yadm.hostname == "thoncc" %}
-set font "JetBrainsMono Nerd Font 8"
-{% else %}
-set font "JetBrainsMono Nerd Font 9"
-{% endif %}
-set selection-clipboard clipboard
-
-# recolor (dark mode)
-map <C-i> recolor
-set recolor "true"
-
-set recolor-reverse-video "true"
-set recolor-keephue "true"
-set guioptions ""
-
-include ./colors
-
-- 
cgit v1.2.3