diff --git a/.config/i3/config b/.config/i3/config
index 863e311..ac10ead 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -389,9 +389,8 @@ exec --no-startup-id mpd
 
 # Stuff
 exec aw-qt
-exec "bash /home/pavel/bin/bukuserver.sh"
 exec dunst
 exec kde-connect-indicator
 exec copyq
-exec "bash /home/pavel/bin/tabliss.sh"
+exec "bash ~/bin/autostart.sh"
 # exec emacs --daemon
\ No newline at end of file
diff --git a/.tridactylrc b/.tridactylrc##template
similarity index 95%
rename from .tridactylrc
rename to .tridactylrc##template
index 4c51fee..6f2c274 100644
--- a/.tridactylrc
+++ b/.tridactylrc##template
@@ -26,7 +26,9 @@ guiset_quiet tabs always
 
 set searchurls.g https://google.com/search?q=
 
+{% if yadm.hostname == 'pdsk' %}
 set newtab http://127.0.0.1:8101/
+{% endif %}
 
 command fixamo_quiet jsb tri.excmds.setpref("privacy.resistFingerprinting.block_mozAddonManager", "true").then(tri.excmds.setpref("extensions.webextensions.restrictedDomains", '""'))
 command fixamo js tri.excmds.setpref("privacy.resistFingerprinting.block_mozAddonManager", "true").then(tri.excmds.setpref("extensions.webextensions.restrictedDomains", '""').then(tri.excmds.fillcmdline_tmp(3000, "Permissions added to user.js. Please restart Firefox to make them take affect.")))
diff --git a/bin/autostart.sh b/bin/autostart.sh
new file mode 100755
index 0000000..d51c108
--- /dev/null
+++ b/bin/autostart.sh
@@ -0,0 +1,5 @@
+hostname=$(hostname)
+if [ "$hostname" = "pdsk" ] ; then
+    bash "$HOME/bin/autostart.sh" &
+    bash "$HOME/bin/tabliss.sh" &
+fi