Rename 10_terminal to 11_terminal to enforce ordering

First the keyboard should be set up, then the terminal.

diff --git a/core/10_terminal/10_terminal.zprofile b/core/10_terminal/10_terminal.zprofile
deleted file mode 100644 (file)
index 1ddb802..0000000
--- a/core/10_terminal/10_terminal.zprofile
+++ /dev/null
@@ -1,12 +0,0 @@
-# AX-ZSH: Alex' Modular ZSH Configuration
-# 10_terminal.zprofile: Initialize terminal settings
-
-# Use tset(1) to validate TERM when stdin as a tty. Explicitly set SHELL to
-# /bin/sh to force tset to output sh-compliant commands even when SHELL was not
-# set correctly or for an other shell.
-[[ -t 0 ]] && eval `SHELL=/bin/sh tset -Is -m "dec-vt52:vt52"`
-
-# Is TERM still unset?
-[[ -z "$TERM" ]] && TERM="dumb"
-
-export TERM

diff --git a/core/10_terminal/10_terminal.zshrc b/core/10_terminal/10_terminal.zshrc
deleted file mode 100644 (file)
index b90fbc5..0000000
--- a/core/10_terminal/10_terminal.zshrc
+++ /dev/null
@@ -1,129 +0,0 @@
-# AX-ZSH: Alex' Modular ZSH Configuration
-# 10_terminal.zshrc: Initialize terminal settings
-
-# Fix up TERM. Do this here (and not in zprofile), because terminal emulators
-# often don't start a new login shell but "only" a new interactive shell.
-
-# VTE based terminals (like GNOME Terminal) support 256 colors, but old(er)
-# versions of GNOME Terminal (at least) set TERM=xterm ...
-[[ "$TERM" = "xterm" && "$VTE_VERSION" != "" ]] && TERM="xterm-256color"
-
-# Common helper functions
-
-# Check if terminal supports Unicode.
-# <https://wiki.grml.org/doku.php?id=utf8>
-function axzsh_is_utf_terminal {
-       case "$LANG $CHARSET $LANGUAGE" in
-               (*utf*) return 0 ;;
-               (*UTF*) return 0 ;;
-               (*) return 1 ;;
-       esac
-}
-alias isutfenv=axzsh_is_utf_terminal
-
-# Test for "modern" terminal
-function axzsh_is_modern_terminal {
-       [[ "$TERM" = screen* ]] && return 0
-       [[ "$TERM" = tmux* ]] && return 0
-       [[ "$TERM" = xterm* ]] && return 0
-       return 1
-}
-
-# Test for "dumb" terminal
-function axzsh_is_dumb_terminal {
-       axzsh_is_modern_terminal && return 1
-       [[ "$TERM" = dumb* ]] && return 0
-       [[ "$TERM" = "vt52" ]] && return 0
-       return 1
-}
-
-# Resize terminal window (when possible)
-function axzsh_resize_terminal {
-       printf '\e[8;%d;%dt' "$2" "$1"
-}
-
-# Set terminal title
-
-# Set terminal "hardstatus" and "icon title"
-function axzsh_terminal_set_icon_title {
-       [[ "$TERM" == "screen"* ]] && printf '\ek%s\e\\' "$1"
-       printf '\e]1;%s\a' "$1"
-}
-
-# Set terminal window title
-function axzsh_terminal_set_window_title {
-       printf '\e]2;%s\a' "$1"
-}
-
-# Update terminal titles befor echoing the shell prompt
-function axzsh_terminal_title_precmd {
-       axzsh_is_modern_terminal || return
-       axzsh_terminal_set_icon_title 'zsh'
-       if [[ "$TERM_PROGRAM" == "Apple_Terminal" && "$TERM" != "screen"* ]]; then
-               axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST"
-               # Update CWD in Terminal.app
-               local url=$(echo "file://$HOSTNAME$PWD" | sed -e 's| |%20|g')
-               printf '\e]7;%s\a' "$url"
-       else
-               axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST:$PWD"
-       fi
-}
-
-precmd_functions+=(axzsh_terminal_title_precmd)
-
-# Update terminal titles befor executing a command
-function axzsh_terminal_title_preexec {
-       axzsh_is_modern_terminal || return
-
-       local cmd="${1[(w)1]}"
-       local remote=""
-
-       case "$cmd" in
-         "mosh"*|"root"*|"ssh"*|"telnet"*)
-               remote=1
-               ;;
-       esac
-       if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
-               # Apple Terminal.app ...
-               if [[ -n "$remote" ]]; then
-                       # Reset CWD for remote commands
-                       printf '\e]7;%s\a' ''
-               fi
-       fi
-       if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
-               # iTerm.app ...
-               [[ -n "$cmd" ]] && TITLE_ADD=" – $cmd"
-       fi
-
-       axzsh_terminal_set_icon_title "$cmd"
-
-       [[ -z "$remote" ]] \
-               && axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST$TITLE_ADD" \
-               || axzsh_terminal_set_window_title "$1"
-}
-
-preexec_functions+=(axzsh_terminal_title_preexec)
-
-axzsh_is_dumb_terminal && return 0
-
-# Colors
-
-autoload -Uz colors
-colors
-
-# Text effects (FX)
-
-typeset -Ag fx
-fx=(
-       reset           "\e[00m"
-       bold            "\e[01m"
-       no-bold         "\e[22m"
-       italic          "\e[03m"
-       no-italic       "\e[23m"
-       underline       "\e[04m"
-       no-underline    "\e[24m"
-       blink           "\e[05m"
-       no-blink        "\e[25m"
-       reverse         "\e[07m"
-       no-reverse      "\e[27m"
-)

diff --git a/core/11_terminal/11_terminal.zprofile b/core/11_terminal/11_terminal.zprofile
new file mode 100644 (file)
index 0000000..1ddb802
--- /dev/null
+++ b/core/11_terminal/11_terminal.zprofile
@@ -0,0 +1,12 @@
+# AX-ZSH: Alex' Modular ZSH Configuration
+# 10_terminal.zprofile: Initialize terminal settings
+
+# Use tset(1) to validate TERM when stdin as a tty. Explicitly set SHELL to
+# /bin/sh to force tset to output sh-compliant commands even when SHELL was not
+# set correctly or for an other shell.
+[[ -t 0 ]] && eval `SHELL=/bin/sh tset -Is -m "dec-vt52:vt52"`
+
+# Is TERM still unset?
+[[ -z "$TERM" ]] && TERM="dumb"
+
+export TERM

diff --git a/core/11_terminal/11_terminal.zshrc b/core/11_terminal/11_terminal.zshrc
new file mode 100644 (file)
index 0000000..b90fbc5
--- /dev/null
+++ b/core/11_terminal/11_terminal.zshrc
@@ -0,0 +1,129 @@
+# AX-ZSH: Alex' Modular ZSH Configuration
+# 10_terminal.zshrc: Initialize terminal settings
+
+# Fix up TERM. Do this here (and not in zprofile), because terminal emulators
+# often don't start a new login shell but "only" a new interactive shell.
+
+# VTE based terminals (like GNOME Terminal) support 256 colors, but old(er)
+# versions of GNOME Terminal (at least) set TERM=xterm ...
+[[ "$TERM" = "xterm" && "$VTE_VERSION" != "" ]] && TERM="xterm-256color"
+
+# Common helper functions
+
+# Check if terminal supports Unicode.
+# <https://wiki.grml.org/doku.php?id=utf8>
+function axzsh_is_utf_terminal {
+       case "$LANG $CHARSET $LANGUAGE" in
+               (*utf*) return 0 ;;
+               (*UTF*) return 0 ;;
+               (*) return 1 ;;
+       esac
+}
+alias isutfenv=axzsh_is_utf_terminal
+
+# Test for "modern" terminal
+function axzsh_is_modern_terminal {
+       [[ "$TERM" = screen* ]] && return 0
+       [[ "$TERM" = tmux* ]] && return 0
+       [[ "$TERM" = xterm* ]] && return 0
+       return 1
+}
+
+# Test for "dumb" terminal
+function axzsh_is_dumb_terminal {
+       axzsh_is_modern_terminal && return 1
+       [[ "$TERM" = dumb* ]] && return 0
+       [[ "$TERM" = "vt52" ]] && return 0
+       return 1
+}
+
+# Resize terminal window (when possible)
+function axzsh_resize_terminal {
+       printf '\e[8;%d;%dt' "$2" "$1"
+}
+
+# Set terminal title
+
+# Set terminal "hardstatus" and "icon title"
+function axzsh_terminal_set_icon_title {
+       [[ "$TERM" == "screen"* ]] && printf '\ek%s\e\\' "$1"
+       printf '\e]1;%s\a' "$1"
+}
+
+# Set terminal window title
+function axzsh_terminal_set_window_title {
+       printf '\e]2;%s\a' "$1"
+}
+
+# Update terminal titles befor echoing the shell prompt
+function axzsh_terminal_title_precmd {
+       axzsh_is_modern_terminal || return
+       axzsh_terminal_set_icon_title 'zsh'
+       if [[ "$TERM_PROGRAM" == "Apple_Terminal" && "$TERM" != "screen"* ]]; then
+               axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST"
+               # Update CWD in Terminal.app
+               local url=$(echo "file://$HOSTNAME$PWD" | sed -e 's| |%20|g')
+               printf '\e]7;%s\a' "$url"
+       else
+               axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST:$PWD"
+       fi
+}
+
+precmd_functions+=(axzsh_terminal_title_precmd)
+
+# Update terminal titles befor executing a command
+function axzsh_terminal_title_preexec {
+       axzsh_is_modern_terminal || return
+
+       local cmd="${1[(w)1]}"
+       local remote=""
+
+       case "$cmd" in
+         "mosh"*|"root"*|"ssh"*|"telnet"*)
+               remote=1
+               ;;
+       esac
+       if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]]; then
+               # Apple Terminal.app ...
+               if [[ -n "$remote" ]]; then
+                       # Reset CWD for remote commands
+                       printf '\e]7;%s\a' ''
+               fi
+       fi
+       if [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then
+               # iTerm.app ...
+               [[ -n "$cmd" ]] && TITLE_ADD=" – $cmd"
+       fi
+
+       axzsh_terminal_set_icon_title "$cmd"
+
+       [[ -z "$remote" ]] \
+               && axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST$TITLE_ADD" \
+               || axzsh_terminal_set_window_title "$1"
+}
+
+preexec_functions+=(axzsh_terminal_title_preexec)
+
+axzsh_is_dumb_terminal && return 0
+
+# Colors
+
+autoload -Uz colors
+colors
+
+# Text effects (FX)
+
+typeset -Ag fx
+fx=(
+       reset           "\e[00m"
+       bold            "\e[01m"
+       no-bold         "\e[22m"
+       italic          "\e[03m"
+       no-italic       "\e[23m"
+       underline       "\e[04m"
+       no-underline    "\e[24m"
+       blink           "\e[05m"
+       no-blink        "\e[25m"
+       reverse         "\e[07m"
+       no-reverse      "\e[27m"
+)