Update clawsrc and make python and st exclusive to zenith

Signed-off-by: Mattias Andrée <maandree@kth.se>

7 files changed, 47 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index 1c80c03..f543b59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,20 @@
 .POSIX:
 
 update:
-	+@for PKG in *; do \
-		if test -d "$${PKG}"; then \
-			if ./check-installed "$${PKG}" 2>/dev/null; then \
-				if ! ./check-installed "$$(readlink -- "$${PKG}")" 2>/dev/null; then \
-					printf -- '\033[1mcd %s && %s install\033[m\n' "$${PKG}" '$(MAKE)'; \
-					(cd -- "$${PKG}" && $(MAKE) install); \
+	+@for PKGDIR in *; do \
+		if test -d "$${PKGDIR}"; then \
+			PKG="$$(printf '%s@\n' "$${PKGDIR}" | cut -d @ -f 1)"; \
+			HOST="$$(printf '%s@\n' "$${PKGDIR}" | cut -d @ -f 2 | tr A-Z a-z)"; \
+			if test -z "$${HOST}" || test "$${HOST}" = "$$(hostname | tr A-Z a-z)"; then \
+				if ./check-installed "$${PKG}" 2>/dev/null; then \
+					if ! ./check-installed "$$(readlink -- "$${PKG}")" 2>/dev/null; then \
+						printf -- '\033[1mcd %s && %s install\033[m\n' "$${PKGDIR}" '$(MAKE)'; \
+						(cd -- "$${PKGDIR}" && $(MAKE) install); \
+					fi; \
+				else\
+					printf -- '\033[1mcd %s && %s uninstall\033[m\n' "$${PKGDIR}" '$(MAKE)'; \
+					(cd -- "$${PKGDIR}" && $(MAKE) uninstall || :); \
 				fi; \
-			else\
-				printf -- '\033[1mcd %s && %s uninstall\033[m\n' "$${PKG}" '$(MAKE)'; \
-				(cd -- "$${PKG}" && $(MAKE) uninstall || :); \
 			fi; \
 		fi; \
 	done
diff --git a/claws-mail/clawsrc b/claws-mail/clawsrc
index 8fbec64..636287b 100644
--- a/claws-mail/clawsrc
+++ b/claws-mail/clawsrc
@@ -27,8 +27,8 @@ close_receive_dialog=1
 save_message=1
 confirm_send_queued_messages=0
 send_dialog_mode=0
-sendwin_width=1920
-sendwin_height=1200
+sendwin_width=960
+sendwin_height=1138
 outgoing_charset=UTF-8
 encoding_method=0
 outgoing_fallback_to_ascii=1
@@ -158,13 +158,13 @@ summary_col_pos_score=1
 summary_col_pos_locked=2
 summary_col_pos_to=9
 summary_col_pos_tags=3
-summary_col_size_mark=10
-summary_col_size_unread=13
-summary_col_size_mime=10
-summary_col_size_subject=508
+summary_col_size_mark=15
+summary_col_size_unread=15
+summary_col_size_mime=15
+summary_col_size_subject=574
 summary_col_size_from=227
-summary_col_size_to=189
-summary_col_size_date=199
+summary_col_size_to=259
+summary_col_size_date=219
 summary_col_size_size=138
 summary_col_size_number=40
 summary_col_size_score=40
@@ -217,7 +217,7 @@ sourcewin_width=960
 sourcewin_height=1138
 compose_width=960
 compose_height=1138
-compose_notebook_height=150
+compose_notebook_height=134
 compose_x=1920
 compose_y=38
 enable_color=1
@@ -260,7 +260,7 @@ attach_desc=1
 attach_save_directory=/home/mattias
 attach_load_directory=/home/mattias/
 mime_textviewer=
-mime_open_command=brave '%s'
+mime_open_command=/usr/bin/xdg-open %s
 show_inline_attachments=1
 layout_mode=0
 open_selected_message_on_folder_open=0
@@ -286,7 +286,7 @@ mark_as_read_delay=0
 immediate_execution=1
 nextunreadmsg_dialog=1
 summary_from_show=0
-pixmap_theme_path=INTERNAL_DEFAULT
+pixmap_theme_path=/usr/share/claws-mail/themes/simple
 enable_alpha_svg=1
 enable_pixmap_scaling=1
 pixmap_scaling_auto=1
@@ -308,7 +308,7 @@ clean_trash_on_exit=0
 ask_on_cleaning=1
 warn_queued_on_exit=1
 work_offline=0
-summary_quicksearch_type=4
+summary_quicksearch_type=3
 summary_quicksearch_recurse=1
 io_timeout_secs=60
 hide_score=-9999
@@ -342,8 +342,8 @@ color_new=#2495be
 filteringwin_width=800
 filteringwin_height=1138
 filteringactionwin_width=490
-filteringactionwin_height=-1
-matcherwin_width=550
+filteringactionwin_height=370
+matcherwin_width=630
 matcherwin_height=431
 templateswin_width=480
 templateswin_height=-1
@@ -357,18 +357,18 @@ sslmanwin_width=486
 sslmanwin_height=-1
 uriopenerwin_width=-1
 uriopenerwin_height=-1
-foldersortwin_width=400
-foldersortwin_height=300
+foldersortwin_width=960
+foldersortwin_height=1138
 addressbookwin_width=960
-addressbookwin_height=1138
-addressbookeditpersonwin_width=640
-addressbookeditpersonwin_height=320
+addressbookwin_height=1162
+addressbookeditpersonwin_width=960
+addressbookeditpersonwin_height=1162
 addressbookeditgroupwin_width=580
 addressbookeditgroupwin_height=340
-pluginswin_width=418
+pluginswin_width=432
 pluginswin_height=300
-prefswin_width=960
-prefswin_height=1138
+prefswin_width=944
+prefswin_height=862
 folderitemwin_width=700
 folderitemwin_height=550
 zero_replacement_char=0
@@ -376,7 +376,7 @@ editaccountwin_width=700
 editaccountwin_height=550
 accountswin_width=500
 accountswin_height=380
-logwin_width=979
+logwin_width=960
 logwin_height=1138
 filtering_debugwin_width=600
 filtering_debugwin_height=-1
@@ -425,22 +425,22 @@ print_margin_top=-1
 print_margin_bottom=-1
 print_margin_left=-1
 print_margin_right=-1
-print_use_color=0
+print_use_color=1
 print_use_collate=0
 print_use_reverse=0
 print_use_duplex=0
 print_imgs=1
-print_previewwin_width=600
-print_previewwin_height=-1
+print_previewwin_width=960
+print_previewwin_height=1138
 use_networkmanager=1
 use_shred=0
 two_line_vertical=1
 inherit_folder_properties=0
 flush_metadata=1
 nav_history_length=50
-diff_added_color=#008b8b
-diff_deleted_color=#6a5acd
-diff_hunk_color=#a52a2a
+diff_added_color=#32a679
+diff_deleted_color=#cd656c
+diff_hunk_color=#00a09f
 folder_search_wildcard=1
 address_search_wildcard=1
 enable_avatars=3
@@ -541,7 +541,6 @@ hotkeys_toggle_mainwindow=
 /usr/lib/claws-mail/plugins/attachwarner.so
 /usr/lib/claws-mail/plugins/att_remover.so
 /usr/lib/claws-mail/plugins/clamd.so
-/usr/lib/claws-mail/plugins/fancy.so
 /usr/lib/claws-mail/plugins/fetchinfo.so
 /usr/lib/claws-mail/plugins/mailmbox.so
 /usr/lib/claws-mail/plugins/notification.so
@@ -551,7 +550,6 @@ hotkeys_toggle_mainwindow=
 /usr/lib/claws-mail/plugins/pgpmime.so
 /usr/lib/claws-mail/plugins/smime.so
 /usr/lib/claws-mail/plugins/spamreport.so
-/usr/lib/claws-mail/plugins/tnef_parse.so
 
 [ClamAV]
 clamav_enable=0
@@ -568,8 +566,8 @@ no_mail_action=0
 unread_mail_action=0
 new_mail_action=1
 blink_on_err=1
-on_param=
-off_param=
+on_param=1
+off_param=0
 file_path=
 
 [AddressKeeper]
diff --git a/python/Makefile b/python@zenith/Makefile
index f0d75f6..4a20fbe 100644
--- a/python/Makefile
+++ b/python@zenith/Makefile
@@ -6,11 +6,11 @@ install:
 	ln -sf .var/cache/python_history ~/.python_history
 	mkdir -p -- ~/.config/profile.d
 	test ! -d ~/.config/profile.d/python
-	ln -sf -- ~/.dotfiles/python/user-profile ~/.config/profile.d/python
+	ln -sf -- ~/.dotfiles/python@zenith/user-profile ~/.config/profile.d/python
 	if test "$$(python --version 2>&1 | cut -d ' ' -f 2 | cut -d . -f 1)" = 2; then \
 		mkdir -p -- ~/.config/bash/aliases.d && \
 		test ! -d ~/.config/bash/aliases.d/python && \
-		ln -sf -- ~/.dotfiles/python/bash-aliases ~/.config/bash/aliases.d/python; \
+		ln -sf -- ~/.dotfiles/python@zenith/bash-aliases ~/.config/bash/aliases.d/python; \
 	fi
 
 uninstall:
diff --git a/python/bash-aliases b/python@zenith/bash-aliases
index 90ef57b..90ef57b 100644
--- a/python/bash-aliases
+++ b/python@zenith/bash-aliases
diff --git a/python/user-profile b/python@zenith/user-profile
index 8c9f982..8c9f982 100644
--- a/python/user-profile
+++ b/python@zenith/user-profile
diff --git a/st/Makefile b/st@zenith/Makefile
index f288c78..70a49ee 100644
--- a/st/Makefile
+++ b/st@zenith/Makefile
@@ -3,7 +3,7 @@
 install:
 	../check-installed-shebang st
 	mkdir -p -- ~/.local/bin
-	ln -sf -- ~/.dotfiles/st/st ~/.local/bin/
+	ln -sf -- ~/.dotfiles/st@zenith/st ~/.local/bin/
 
 uninstall:
 	+! ../check-installed st
diff --git a/st/st b/st@zenith/st
index ae7ad89..ae7ad89 100755
--- a/st/st
+++ b/st@zenith/st