Fix.

diff --git a/testing/aptmark/user b/testing/aptmark/user
index e4588c7e253fafe63d65737e1b4974dcb7e1e135..1ae29726eb3e05857137ca123d19c753ea0b5278 100644 (file)
--- a/testing/aptmark/user
+++ b/testing/aptmark/user
@@ -1,3 +1,5 @@
+# stuff we want on any system with interactive plom user account
+#
 # ping won't work for user without this – see <https://shallowsky.com/blog/linux/ping-permissions.html>
 linux-sysctl-defaults
 # generally useful

diff --git a/testing/home/all/.bashrc b/testing/home/all/.bashrc
index ec686eb0b684ac5c23389f88504bcafd1403e23e..851118b9cd8841bf33f7cabd6118c40abd593b5c 100644 (file)
--- a/testing/home/all/.bashrc
+++ b/testing/home/all/.bashrc
@@ -24,6 +24,5 @@ PS2="${tput_color}> ${tput_reset}"
 PS3="${tput_color}select: ${tput_reset}"
 PS4="${tput_color}+ ${tput_reset}"
 
-# Optional additional stuff.
-PATH_BASHRC_BONUS="${HOME}/.bashrc_bonus"
-[ -f "${PATH_BASHRC_BONUS}" ] && . "${PATH_BASHRC_BONUS}"
+# include others
+dot_shell_file_variants "${HOME}/\.bashrc"

diff --git a/testing/home/desktop/.bashrc.desktop b/testing/home/desktop/.bashrc.desktop
new file mode 100644 (file)
index 0000000..baa8d8b
--- /dev/null
+++ b/testing/home/desktop/.bashrc.desktop
@@ -0,0 +1,4 @@
+# mere "kb" might be more flexible, but this way I won't accidentally try for
+# a non-existing "en" layout
+alias kb_de="swaymsg 'input * xkb_layout de'"
+alias kb_us="swaymsg 'input * xkb_layout us'"

diff --git a/testing/home/desktop/.bashrc_bonus b/testing/home/desktop/.bashrc_bonus
deleted file mode 100644 (file)
index baa8d8b..0000000
--- a/testing/home/desktop/.bashrc_bonus
+++ /dev/null
@@ -1,4 +0,0 @@
-# mere "kb" might be more flexible, but this way I won't accidentally try for
-# a non-existing "en" layout
-alias kb_de="swaymsg 'input * xkb_layout de'"
-alias kb_us="swaymsg 'input * xkb_layout us'"