From 13289d07544e9979135a668587fe0a3da372eade Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 8 Aug 2022 20:54:11 +1200 Subject: Don't maintain GTK settings anymore This was only a theme selection anyway, and it's not aging too well. Let's just use Adwaita or whatever it wants for now. --- Makefile | 6 ------ README.md | 2 -- gtk/gtk-3.0/settings.ini | 2 -- gtk/gtkrc-2.0 | 1 - 4 files changed, 11 deletions(-) delete mode 100644 gtk/gtk-3.0/settings.ini delete mode 100644 gtk/gtkrc-2.0 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/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" -- cgit v1.2.3 From 6f70fa0f130db9d38a01433e5e8ee7b033832163 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 9 Aug 2022 18:52:47 +1200 Subject: Don't update tmux environment at all Not even DISPLAY or WINDOWID---it's too confusing. --- tmux/tmux.conf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index e7f088bd..ca4e7172 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -1,3 +1,15 @@ +# Strip out a lot of machine and X11 dependent crap from the initial +# environment +set-environment -gru DISPLAY +set-environment -gru SSH_CLIENT +set-environment -gru SSH_CONNECTION +set-environment -gru SSH_TTY +set-environment -gru WINDOWID + +# Otherwise, use the environment we had when we started; don't touch it during +# a session unless I specifically ask +set-option -g update-environment 'COLORFGBG COLORTERM' + # Setting this makes each new pane a non-login shell, which suits me better set-option -g default-command "exec $SHELL" -- cgit v1.2.3 From 1e4eb01207e83a3a116bf6cf60122d410560243d Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 9 Aug 2022 19:07:13 +1200 Subject: Restore tmux history to defaults To coax me out of relying on it. --- tmux/tmux.conf | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index ca4e7172..053921b3 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -1,14 +1,5 @@ -# Strip out a lot of machine and X11 dependent crap from the initial -# environment -set-environment -gru DISPLAY -set-environment -gru SSH_CLIENT -set-environment -gru SSH_CONNECTION -set-environment -gru SSH_TTY -set-environment -gru WINDOWID - -# Otherwise, use the environment we had when we started; don't touch it during -# a session unless I specifically ask -set-option -g update-environment 'COLORFGBG COLORTERM' +# 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" @@ -81,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 -- cgit v1.2.3 From 79f1da9ffb26d24ae752491076df600c40b124ed Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 9 Aug 2022 19:26:12 +1200 Subject: Better way to elide hostname prompt in screen/tmux --- bash/bashrc.d/prompt.bash | 4 ++-- ksh/kshrc.d/prompt.ksh | 4 ++-- sh/shrc.d/prompt.sh | 7 +++---- zsh/zshrc.d/prompt.zsh | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) 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/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/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/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'%~' -- cgit v1.2.3 From 6b64e51920566b2a124a9ac95ccb564ae8e45bdb Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 9 Aug 2022 19:26:37 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3 From 31bee980c8894c8dda39c71302b8be828e0efb95 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 9 Aug 2022 19:26:40 +1200 Subject: Update dotfiles(7) manual page --- man/man7/dotfiles.7df | 3 --- 1 file changed, 3 deletions(-) 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 -- cgit v1.2.3