aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-08-09 19:26:42 +1200
committerTom Ryder <tom@sanctum.geek.nz>2022-08-09 19:26:42 +1200
commit0c2476a09b3a5c727cac5571b6dd70cecf1d2712 (patch)
tree8f3485c28c5b9d3b532caf3ab451288c1f8c0c23
parentMerge branch 'release/v12.18.0' (diff)
parentUpdate dotfiles(7) manual page (diff)
downloaddotfiles-12.19.0.tar.gz (sig)
dotfiles-12.19.0.zip
Merge branch 'release/v12.19.0'v12.19.0
* release/v12.19.0: Update dotfiles(7) manual page Better way to elide hostname prompt in screen/tmux Restore tmux history to defaults Don't update tmux environment at all Don't maintain GTK settings anymore
-rw-r--r--Makefile6
-rw-r--r--README.md2
-rw-r--r--VERSION4
-rw-r--r--bash/bashrc.d/prompt.bash4
-rw-r--r--gtk/gtk-3.0/settings.ini2
-rw-r--r--gtk/gtkrc-2.01
-rw-r--r--ksh/kshrc.d/prompt.ksh4
-rw-r--r--man/man7/dotfiles.7df3
-rw-r--r--sh/shrc.d/prompt.sh7
-rw-r--r--tmux/tmux.conf6
-rw-r--r--zsh/zshrc.d/prompt.zsh4
11 files changed, 14 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 1ad61a21..4cea49d8 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@
install-games-man \
install-git \
install-gnupg \
- install-gtk \
install-i3 \
install-ksh \
install-less \
@@ -454,11 +453,6 @@ install-git: git/config $(GIT_TEMPLATE_HOOKS)
install-gnupg: gnupg/profile.d/gnupg.sh install-sh
cp -p -- gnupg/profile.d/*.sh $(HOME)/.profile.d
-install-gtk:
- mkdir -p -- $(XDG_CONFIG_HOME)/gtk-3.0
- cp -p -- gtk/gtkrc-2.0 $(HOME)/.gtkrc-2.0
- cp -p -- gtk/gtk-3.0/settings.ini $(XDG_CONFIG_HOME)/gtk-3.0
-
install-i3: install-x
mkdir -p -- $(XDG_CONFIG_HOME)/i3
cp -p -- i3/* $(XDG_CONFIG_HOME)/i3
diff --git a/README.md b/README.md
index e59cb5e0..0953a61a 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,6 @@ Configuration is included for:
- [GNU Emacs](https://www.gnu.org/software/emacs/)---Extensible text editor
- [GnuPG](https://www.gnupg.org/)---GNU Privacy Guard, for private
communication and file encryption
-- [GTK+](https://www.gtk.org/)---GIMP Toolkit, for graphical user interface
- elements
- [i3](https://i3wm.org/)---Tiling window manager
- [less](https://www.gnu.org/software/less/)---Terminal pager
- [mpv](https://mpv.io/)---Media player
diff --git a/VERSION b/VERSION
index 7d4ecc34..0cffb1f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v12.18.0
-Sun, 07 Aug 2022 12:53:28 +0000
+tejr dotfiles v12.19.0
+Tue, 09 Aug 2022 07:26:36 +0000
diff --git a/bash/bashrc.d/prompt.bash b/bash/bashrc.d/prompt.bash
index bdea7ace..e0a03438 100644
--- a/bash/bashrc.d/prompt.bash
+++ b/bash/bashrc.d/prompt.bash
@@ -14,9 +14,9 @@ prompt() {
PROMPT_DIRTRIM=4
fi
- # Basic prompt shape depends on whether we're in SSH or not
+ # Prompt has hostname via SSH outside of screen/tmux
PS1=
- if [[ -n $SSH_CLIENT || -n $SSH_CONNECTION ]] ; then
+ if [[ -n $SSH_CLIENT && -z $STY && -z $TMUX ]] ; then
PS1=$PS1'\h:'
fi
PS1=$PS1'\w'
diff --git a/gtk/gtk-3.0/settings.ini b/gtk/gtk-3.0/settings.ini
deleted file mode 100644
index 4f93dfe4..00000000
--- a/gtk/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-theme-name = Clearlooks-Phenix
diff --git a/gtk/gtkrc-2.0 b/gtk/gtkrc-2.0
deleted file mode 100644
index 99fb22e2..00000000
--- a/gtk/gtkrc-2.0
+++ /dev/null
@@ -1 +0,0 @@
-gtk-theme-name = "Clearlooks-Phenix"
diff --git a/ksh/kshrc.d/prompt.ksh b/ksh/kshrc.d/prompt.ksh
index b0023670..99d999de 100644
--- a/ksh/kshrc.d/prompt.ksh
+++ b/ksh/kshrc.d/prompt.ksh
@@ -12,9 +12,9 @@ function prompt {
# Turn complex, colored PS1 and debugging PS4 prompts on
on)
- # Basic prompt shape depends on whether we're in SSH or not
+ # Prompt has hostname via SSH outside of screen/tmux
PS1=
- if [[ -n $SSH_CLIENT || -n $SSH_CONNECTION ]] ; then
+ if [[ -n $SSH_CLIENT && -z $STY && -z $TMUX ]] ; then
PS1=$PS1'${HOSTNAME%%.*}:'
fi
diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df
index cae361a2..16366c51 100644
--- a/man/man7/dotfiles.7df
+++ b/man/man7/dotfiles.7df
@@ -127,9 +127,6 @@ editor
GnuPG (https://www.gnupg.org/)\[em]GNU Privacy Guard, for private
communication and file encryption
.IP \[bu] 2
-GTK+ (https://www.gtk.org/)\[em]GIMP Toolkit, for graphical user
-interface elements
-.IP \[bu] 2
i3 (https://i3wm.org/)\[em]Tiling window manager
.IP \[bu] 2
less (https://www.gnu.org/software/less/)\[em]Terminal pager
diff --git a/sh/shrc.d/prompt.sh b/sh/shrc.d/prompt.sh
index cb32c113..72cf59b6 100644
--- a/sh/shrc.d/prompt.sh
+++ b/sh/shrc.d/prompt.sh
@@ -11,8 +11,7 @@ PS3='? '
unset PS4
PS4='+ '
-# If we have an SSH_CLIENT or SSH_CONNECTION environment variable, put the
-# hostname in PS1 too.
-if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_CONNECTION" ] ; then
- PS1=$(hostname -s)'$ '
+# Prompt has hostname via SSH outside of screen/tmux
+if [ -n "$SSH_CLIENT" ] && [ -z "$STY" ] && [ -z "$TMUX" ] ; then
+ PS1=$(hostname -s)$PS1
fi
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index e7f088bd..053921b3 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -1,3 +1,6 @@
+# Don't update the environment from anywhere; too confusing
+set-option -g update-environment ''
+
# Setting this makes each new pane a non-login shell, which suits me better
set-option -g default-command "exec $SHELL"
@@ -69,9 +72,6 @@ set-option -g base-index 1
# meta and prefer things to be snappier
set-option -g escape-time 0
-# Keep plenty of history
-set-option -g history-limit 100000
-
# Don't interfere with my system clipboard
set-option -g set-clipboard off
diff --git a/zsh/zshrc.d/prompt.zsh b/zsh/zshrc.d/prompt.zsh
index eb43484f..245f2973 100644
--- a/zsh/zshrc.d/prompt.zsh
+++ b/zsh/zshrc.d/prompt.zsh
@@ -8,9 +8,9 @@ prompt() {
on)
setopt promptsubst promptpercent
- # Basic prompt shape depends on whether we're in SSH or not
+ # Prompt has hostname via SSH outside of screen/tmux
PS1=
- if [[ -n $SSH_CLIENT || -n $SSH_CONNECTION ]] ; then
+ if [[ -n $SSH_CLIENT && -z $STY && -z $TMUX ]] ; then
PS1=$PS1'%m:'
fi
PS1=$PS1'%~'