diff --git a/debian/changelog b/debian/changelog index 99c363e7..b6a7fc13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +grml-console (0.20.0) unstable; urgency=medium + + * Reincarnate as grml-console. + + -- Chris Hofstaedtler Sun, 09 Mar 2025 16:23:53 +0100 + grml-etc-core (0.19.15) grml-testing; urgency=medium [ Chris Hofstaedtler ] diff --git a/debian/conffiles b/debian/conffiles deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/control b/debian/control index 41da0742..53ba4769 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: grml-etc-core +Source: grml-console Section: grml Priority: optional Maintainer: Michael Prokop @@ -7,31 +7,18 @@ Build-Depends: debhelper-compat (= 12), Standards-Version: 4.6.2 Rules-Requires-Root: no -Homepage: https://github.com/grml/grml-etc-core -Vcs-Git: https://github.com/grml/grml-etc-core.git -Vcs-Browser: https://github.com/grml/grml-etc-core +Homepage: https://github.com/grml/grml-console +Vcs-Git: https://github.com/grml/grml-console.git +Vcs-Browser: https://github.com/grml/grml-console Origin: Grml Bugs: mailto:bugs@grml.org -Package: grml-etc-core +Package: grml-console Architecture: all Conflicts: - grml-autoconfig (<< 0.5-7), - grml-etc (<< 0.8-11), - grml-scripts (<< 0.8-27), -Replaces: - vim-common, + grml-etc-core (<< 0.20.0~) Depends: ${misc:Depends}, - vim | nvi | editor, -Recommends: - grml-scripts-core, -Pre-Depends: - ${misc:Pre-Depends}, - zsh, -Description: core etcetera files for the Grml system - This package includes some /etc files for the - Grml system. Whereas the main grml-etc package is - meant for use on Grml systems this package can be - used on plain Debian (stable/testing/unstable) - systems as well. +Description: Grml Console Configuration + Provide configuration files for zsh, vim, + tmux and screen for the "Grml Console"-style setup. diff --git a/debian/grml-etc-core.lintian-overrides b/debian/grml-etc-core.lintian-overrides deleted file mode 100644 index faa5ec41..00000000 --- a/debian/grml-etc-core.lintian-overrides +++ /dev/null @@ -1,5 +0,0 @@ -grml-etc-core: unknown-section grml -grml-etc-core: diversion-for-unknown-file -grml-etc-core: orphaned-diversion -grml-etc-core: package-contains-file-in-etc-skel -grml-etc-core: bugs-field-does-not-refer-to-debian-infrastructure mailto:bugs@grml.org diff --git a/debian/install b/debian/install index e39f28a3..04d5ad88 100644 --- a/debian/install +++ b/debian/install @@ -1,2 +1,4 @@ -etc +skel usr/share/grml-console/ +vim usr/share/grml-console/ +zsh usr/share/grml-console/ usr_share_grml/* usr/share/grml/ diff --git a/debian/postrm b/debian/postrm deleted file mode 100755 index f1ca0476..00000000 --- a/debian/postrm +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Filename: postrm -# Purpose: postrm script for package grml-etc-core -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -set -e - -TO_UNDIVERT1="zlogin zprofile zshenv zshrc" -TO_UNDIVERT2=".zshrc" -TO_UNDIVERT3="vimrc" - -undivert_gen() { - if [ -f "$2/$1" -o "$2/$1".original ] ; then - DEXT=${3:-original} - dpkg-divert --remove --rename --package grml-etc-core \ - --divert $2/$1.$DEXT $2/$1 #> /dev/null - fi -} - -case "$1" in - purge) - for cmd in $TO_UNDIVERT1; do - undivert_gen $cmd /etc/zsh - done - for cmd in $TO_UNDIVERT2; do - undivert_gen $cmd /etc/skel - done - for cmd in $TO_UNDIVERT3; do - undivert_gen $cmd /etc/vim - done - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument $1" >&2 - exit 1 -esac - -#DEBHELPER# - -exit 0 - -## END OF FILE ################################################################# diff --git a/debian/preinst b/debian/preinst deleted file mode 100755 index 0080c006..00000000 --- a/debian/preinst +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# Filename: preinst -# Purpose: preinst script for package grml-etc-core -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -set -e - -case "$1" in - install|upgrade|configure) - TMP=$$ - for file in /etc/zsh/zlogin /etc/zsh/zprofile /etc/zsh/zshenv /etc/zsh/zshrc \ - /etc/vim/vimrc /etc/tmux.conf; do - # make sure we don't lose anything - # yes this is ugly :( - [ -e "$file".original ] || cp -f "$file" "${file}.tmp.$TMP" 2>/dev/null || true - [ -e "$file" ] && cp -f "$file" "$file".grml-etc-core && \ - [ -f "$file" ] && rm "$file" && \ - dpkg-divert --quiet --add --rename --package grml-etc-core --divert "$file".original $file && \ - [ -f "$file".grml-etc-core ] && mv -f "$file".grml-etc-core "$file" - [ -e "${file}.tmp.$TMP" ] && mv -f "${file}.tmp.$TMP" "$file.original" - done - - # we stopped shipping /etc/zsh/zlogout with v0.20.0, - # make sure we don't leave it behind on updated systems - if dpkg-divert --list grml-etc-core 2>/dev/null | grep -q '/etc/zsh/zlogout' ; then - mv -f /etc/zsh/zlogout /etc/zsh/zlogout.old && \ - dpkg-divert --remove --rename --package grml-etc-core /etc/zsh/zlogout - fi - ;; - *) - echo "preinst called with unknown argument $1" >&2 - exit 1 -esac - -#DEBHELPER# - -exit 0 - -## END OF FILE ################################################################# diff --git a/etc/apt/grml/listbugs b/etc/apt/grml/listbugs deleted file mode 100755 index fdfcb9cf..00000000 --- a/etc/apt/grml/listbugs +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# Filename: /etc/apt/listbugs -# Purpose: display bugs of currently running system (used inside grml-live) -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2 or any later version. -################################################################################ - -[ -n "$SEVERITY" ] || SEVERITY="critical,grave,serious" - -if ! [ -x /usr/sbin/apt-listbugs ] ; then - echo "Error: /usr/sbin/apt-listbugs not available. Exiting." - exit 1 -fi - -if ! [ -x /usr/bin/apt-show-source ] ; then - echo "Error: /usr/bin/apt-show-source not available. Exiting." - exit 1 -fi - -if ! [ -x /usr/bin/dpkg-query ] ; then - echo "Error: /usr/bin/dpkg-query not available. Exiting." - exit 1 -fi - -if apt-show-source 1>/dev/null 2>&1 ; then - apt-listbugs -q -n -s $SEVERITY list \ - $(apt-show-source | grep -v -e 'not installed' -e '--------------' -e \ - 'Version' | awk '{print $4;}' | grep -v '^[() ]*$'| sort | uniq) -else - apt-listbugs -q -n -s $SEVERITY list $(dpkg-query -W --showformat='${Package}\n') -fi - -# $ROOTCMD apt-listbugs -s $SEVERITY list \ -# $(dpkg --get-selections| grep ' install' | awk '{print $1}) - -## END OF FILE ################################################################# diff --git a/etc/grml/lsb-functions b/etc/grml/lsb-functions deleted file mode 100644 index 17a42a38..00000000 --- a/etc/grml/lsb-functions +++ /dev/null @@ -1,436 +0,0 @@ -# lsb init-functions -# -# based on: -# /lib/lsb/init-functions for Debian -*- shell-script -*- -# -# Copyright (c) 2002-03 Chris Lawrence -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of the author nor the names of other contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -# log_*() functions {{{ -TPUT="${TPUT:-"/usr/bin/tput"}" - -_have_tput() { - [ -x "$TPUT" ] && "$TPUT" hpa 60 >/dev/null 2>&1 \ - && return 0 \ - || return 1 -} - -log_success_msg() { - printf " * $@\n" -} - -log_failure_msg() { - if _have_tput ; then - RED="$("$TPUT" setaf 1)" - #NORMAL="$("$TPUT" op)" - printf " ${RED}*${NORMAL} $@\n" - else - printf " * $@\n" - fi -} - -log_warning_msg() { - if _have_tput ; then - YELLOW="$("$TPUT" setaf 3)" - #NORMAL="$("$TPUT" op")" - # printf " *${NORMAL} $@\n" - printf " ${BLUE}*${NORMAL} $@\n" - else - printf " * $@\n" - fi -} - -log_warning_msg_nn() { - if _have_tput ; then - YELLOW="$("$TPUT" setaf 3)" - printf " ${BLUE}*${NORMAL} $@" - else - printf " * $@" - fi -} - -# int log_begin_message (char *message) -log_begin_msg() { - if [ "$#" -eq 0 ]; then - return 1 - fi - printf " ${GREEN}*${NORMAL} $@\n" -} - -log_begin_msg_nn() { - if [ "$#" -eq 0 ]; then - return 1 - fi - printf " ${GREEN}*${NORMAL} $@" -} - - -SUBMSG=" ${GREEN}-${NORMAL} " - -# int log_end_message (int exitstatus) -log_end_msg() { - - # If no arguments were passed, return - [ "$#" -eq 0 ] && return 1 - - # Only do the fancy stuff if we have an appropriate terminal - # and if /usr is already mounted - if _have_tput ; then - COLS="$("$TPUT" cols)" - if [ -n "$COLS" ]; then - COL=$(( $COLS - 7 )) - else - COL=73 - fi - UP="$("$TPUT" cuu1)" - END="$("$TPUT" hpa "$COL")" - START="$("$TPUT" hpa 0)" - #RED="$("$TPUT" setaf 1)" - #NORMAL="$("$TPUT" op)" - if [ "$1" -eq 0 ]; then - printf "${UP}${END}${BLUE}[ ${GREEN}ok ${BLUE}]${NORMAL}\n" - else - printf "${UP}${START} ${RED}*${NORMAL}${END}[${RED}fail${NORMAL}]\n" - fi - else - if [ "$1" -eq 0 ]; then - printf " ...done.\n" - else - printf " ...fail!\n" - fi - fi - return "$1" -} -# }}} - -# e*() output functions {{{ -# heavily based on gentoo's functions.sh; stripped down and modified -# to match our needs. -# -# defined functions: -# ebegin() -# eend() -# eerror() -# eindent() -# einfo() -# einfon() -# eoutdent() -# esetdent() -# esyslog() -# ewarn() -# ewend() -# -# copyright 1999-2005 gentoo foundation -# distributed under the terms of the gnu general public license v2 -# $header: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v 1.81.2.6 2005/05/15 20:00:31 vapier exp $ - -# initialisation {{{ -# internal variables - -# Don't output to stdout? -RC_QUIET_STDOUT="no" - -# Default values for e-message indentation and dots -RC_INDENTATION='' -RC_DEFAULT_INDENT=2 -#RC_DOT_PATTERN=' .' -RC_DOT_PATTERN='' -# don't output to stdout? -rc_quiet_stdout="no" - -# default values for e-message indentation and dots -rc_indentation='' -rc_default_indent=2 -#rc_dot_pattern=' .' -rc_dot_pattern='' - -# should we use color? -if [ -r /proc/cmdline ] ; then - grep -q ' nocolor' /proc/cmdline && RC_NOCOLOR='yes' -fi -[ -n "$NOCOLORS" ] && RC_NOCOLOR='yes' -RC_NOCOLOR="${RC_NOCOLOR:-no}" -if [ "$RC_NOCOLOR" = "no" ] ; then - if [ -r /etc/grml_colors ] ; then - . /etc/grml_colors - fi -fi - -# Can the terminal handle endcols? -if [ "${RC_NOCOLOR}" = "yes" ]; then - RC_ENDCOL="no" -else - RC_ENDCOL="yes" -fi - -# Setup COLS and ENDCOL so eend can line up the [ ok ] -# width of [ ok ] == 7 -COLS="$(stty size 2>/dev/null | cut -d' ' -f2)" -if [ -z "${COLS}" ] || [ "${COLS}" -le 0 ] ; then - COLS=80 -fi - -if [ "${RC_ENDCOL}" = "yes" ]; then - ENDCOL="[$(( ${COLS} - 8 ))G" -else - ENDCOL='' -fi - -# Setup the colors so our messages all look pretty -if [ "${RC_NOCOLOR}" = "yes" ]; then - unset GOOD WARN BAD NORMAL HILITE BRACKET -else - GOOD='' - WARN='' - BAD='' - NORMAL='' - HILITE='' - BRACKET='' -fi -#}}} - -# void esyslog(char* priority, char* tag, char* message) -# -# use the system logger to log a message -# -esyslog() { - local pri - local tag - - [ "$#" -le 2 ] && return 0 - if [ -x /usr/bin/logger ] ; then - pri="$1" - tag="$2" - shift 2 - - /usr/bin/logger -p "${pri}" -t "${tag}" -- "$@" - fi - - return 0 -} - -# void eindent(int num) -# -# increase the indent used for e-commands. -# -eindent() { - local i="${1:-0}" - [ "$i" -gt 0 ] || i="${RC_DEFAULT_INDENT}" - esetdent $(( ${#RC_INDENTATION} + $i )) -} - -# void eoutdent(int num) -# -# decrease the indent used for e-commands. -# -eoutdent() { - local i="${1:-0}" - [ "$i" -gt 0 ] || i="${RC_DEFAULT_INDENT}" - esetdent $(( ${#RC_INDENTATION} - $i )) -} - -# void esetdent(int num) -# -# hard set the indent used for e-commands. -# num defaults to 0 -# -esetdent() { - local i="${1:-0}" - [ "$i" -lt 0 ] && i=0 - RC_INDENTATION="$(printf "%${i}s" '')" -} - -# void einfo(char* message) -# -# show an informative message (with a newline) -# -einfo() { - einfon "$*\n" - LAST_E_CMD=einfo - return 0 -} - -# void einfon(char* message) -# -# show an informative message (without a newline) -# -einfon() { - [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 - [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " ${GOOD}*${NORMAL} ${RC_INDENTATION}$*" - LAST_E_CMD=einfon - return 0 -} - -# void ewarn(char* message) -# -# show a warning message + log it -# -ewarn() { - if [ "${RC_QUIET_STDOUT}" = "yes" ]; then - printf " $*\n" - else - [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " ${WARN}*${NORMAL} ${RC_INDENTATION}$*\n" - fi - - # Log warnings to system log - esyslog "daemon.warning" "rc-scripts" "$@" - - LAST_E_CMD=ewarn - return 0 -} - -# void eerror(char* message) -# -# show an error message + log it -# -eerror() { - if [ "${RC_QUIET_STDOUT}" = "yes" ]; then - printf " $*\n" >&2 - else - [ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo - printf " ${BAD}*${NORMAL} ${RC_INDENTATION}$*\n" - fi - - # Log errors to system log - esyslog "daemon.err" "rc-scripts" "$@" - - LAST_E_CMD=eerror - return 0 -} - -# void ebegin(char* message) -# -# show a message indicating the start of a process -# -ebegin() { - local msg="$@" dots spaces - spaces="$(printf '%'"${#RC_DOT_PATTERN}"'s' '')" - [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 - - if [ -n "${RC_DOT_PATTERN}" ]; then - dots="$(printf "%$(( $COLS - 3 - ${#RC_INDENTATION} - ${#msg} - 7 ))s" '')" - while [ "${dots#${spaces}}" != "${dots}" ] ; do - dots="${dots#${spaces}}${RC_DOT_PATTERN}" - done - msg="${msg}${dots}" - else - msg="${msg} ..." - fi - einfon "${msg}" - [ "${RC_ENDCOL}" = "yes" ] && echo - - LAST_E_LEN=$(( 3 + ${#RC_INDENTATION} + ${#msg} )) - LAST_E_CMD=ebegin - return 0 -} - -# void _eend(int error, char *efunc, char* errstr) -# -# indicate the completion of process, called from eend/ewend -# if error, show errstr via efunc -# -# This function is private to functions.sh. Do not call it from a -# script. -# -_eend() { - local retval="${1:-0}" efunc="${2:-eerror}" msg - shift 2 - - if [ "${retval}" -eq 0 ]; then - [ "${RC_QUIET_STDOUT}" = "yes" ] && return 0 - msg="${BRACKET}[ ${GOOD}ok${BRACKET} ]${NORMAL}" - else - if [ "$#" -gt 0 ] ; then - "${efunc}" "$@" - fi - msg="${BRACKET}[ ${BAD}!!${BRACKET} ]${NORMAL}" - fi - - if [ "${RC_ENDCOL}" = "yes" ]; then - printf "${ENDCOL} ${msg}\n" - else - [ "${LAST_E_CMD}" = "ebegin" ] || LAST_E_LEN=0 - printf "%$(( ${COLS} - ${LAST_E_LEN} - 6 ))s%b\n" '' "${msg}" - fi - - return "${retval}" -} - -# void eend(int error, char* errstr) -# -# indicate the completion of process -# if error, show errstr via eerror -# -eend() { - local retval="${1:-0}" - shift - - _eend "${retval}" eerror "$@" - - LAST_E_CMD=eend - return "$retval" -} - -# void ewend(int error, char* errstr) -# -# indicate the completion of process -# if error, show errstr via ewarn -# -ewend() { - local retval="${1:-0}" - shift - - _eend "${retval}" ewarn "$@" - - LAST_E_CMD=ewend - return "$retval" -} -#}}} - -# if we're using systemd then redefine functions -# for output in systemd style -if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ] ; then - einfo() { - printf "[ ${GREEN}OK${NORMAL} ] %s\n" "$*" - } - - ewarn() { - printf "[ ${YELLOW}WARN${NORMAL} ] %s\n" "$*" - } - - eerror() { - printf "[ ${RED}FAIL${NORMAL} ] %s\n" "$*" - } - - eend() { - : - } -fi - -# vim: ft=sh tw=80 ts=4 foldmethod=marker diff --git a/etc/grml/screen_multisession b/etc/grml/screen_multisession deleted file mode 100644 index c5f7e7c0..00000000 --- a/etc/grml/screen_multisession +++ /dev/null @@ -1,21 +0,0 @@ -# Filename: /etc/grml/screen_multisession -# Purpose: configuration file for use in multisession mode of GNU screen -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2 or any later version. -################################################################################ - -# who is allowed to connect via multiuser-mode? -addacl root,grml - -# allow multiuser-mode -multiuser on - -# redefine C-a -defescape ^Bb -escape ^Bb - -# no nag-screen, please -startup_message off - -## END OF FILE ################################################################# diff --git a/etc/grml/screenrc b/etc/grml/screenrc deleted file mode 100644 index 3cabb03c..00000000 --- a/etc/grml/screenrc +++ /dev/null @@ -1,148 +0,0 @@ -# Filename: /etc/grml/screenrc -# Purpose: main configuration file for GNU screen -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - - backtick 1 0 60 /usr/bin/cpu-screen - backtick 2 0 60 /usr/bin/ip-screen - caption always "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}net: %2`) %-21=%{wk}%D %Y-%m-%d %0c" - hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" - -# switch order of caption and hardstatus: -# hardstatus alwayslastline "%{+b kr}$USER@%{kw}%H | %{ky}(load: %l |%{kr} cpu: %1` | %{kG}net: %2`) %-21=%{kw}%D %Y-%m-%d %0c" -# caption always "%{rw}%n%f %t %{wk} | %?%-Lw%?%{bw}%n*%f %t%?(%u)%?%{wk}%?%+Lw%? %{wk}" - -# detach on hangup - autodetach on # default: on - crlf off # default: off - deflogin off # default: on -# defsilence off # default: off -# hardcopy_append on # default: off - hardcopy_append off # default: off - nethack on # default: off -# don't display the copyright page - startup_message off # default: on -# no annoying audible bell, please - vbell on - - defscrollback 1000 # default: 100 -# msgminwait 3 # default: 1 - silencewait 15 # default: 30 - - hardcopydir $HOME/.hardcopy - -# fix the "screen.linux" terminal problem (see Debian BTS #238355 + #239776) -# term linux - -# shell /bin/zsh - -# "sorendition": set the colors for -# the "messages" and "text marking" -# (ie text you mark in copy mode): - sorendition 10 99 # default! - -# use %n to display the window number and %t for its title: - activity "activity in %n (%t) [%w:%s]~" - -# pass on the "beep" (CTRL-G) by adding a '~': - bell "bell in %n (%t) [%w:%s]~" - -# pow_detach_msg: Message shown when session -# gets power detached. - pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended." - -# vbell_msg: Message shown when the -# "virtual bell" rings. - vbell_msg " *beep* " - -# Key bindings -# Remove some default key bindings by binding -# them to "nothing" (empty right-hand-side): -# bind . dumptermcap # default - bind . -# bind ^\ -# bind \\ - bind . - bind k - bind ^k - bind ^h - -# 040126 To be able to select windows with n > 9 -> -# press "C-a - #" instead of just "C-a #" - bind - command -c select_1n - bind -c select_1n 0 select 10 - bind -c select_1n 1 select 11 - bind -c select_1n 2 select 12 - bind -c select_1n 3 select 13 - bind -c select_1n 4 select 14 - bind -c select_1n 5 select 15 - bind -c select_1n 6 select 16 - bind -c select_1n 7 select 17 - bind -c select_1n 8 select 18 - bind -c select_1n 9 select 19 - bind -c select_1n - command -c select_2n - bind -c select_2n 0 select 20 - bind -c select_2n 1 select 21 - bind -c select_2n 2 select 22 - bind -c select_2n 3 select 23 - bind -c select_2n 4 select 24 - bind -c select_2n 5 select 25 - bind -c select_2n 6 select 26 - bind -c select_2n 7 select 27 - bind -c select_2n 8 select 28 - bind -c select_2n 9 select 29 - bind -c select_2n - select - - -# Use the function keys F11 and F12 to cycle backwards/forwards in -# the list of existing windows: -# bindkey -k F1 prev -# bindkey -k F2 next - - bind h hardcopy -# make them better - bind 'K' kill - bind 'I' login on - bind 'O' login off - bind '}' history - -# Paste - use 'P' instead of ']': -# bind P # unbound by default - bind P paste . - -# Yet another hack: -# Prepend/append register [/] to the paste if ^a^] is pressed. -# This lets me have autoindent mode in vi. -# register [ "\033:se noai\015a" -# register ] "\033:se ai\015a" -# bind ^] paste [.] - -# X - a fast way to lock the current screen. - bind X lockscreen - -# 030511 Workaround for stupid machines without xmodmap ;-) - bindkey -t °a stuff "ä" - bindkey -t °A stuff "Ä" - bindkey -t °o stuff "ö" - bindkey -t °O stuff "Ö" - bindkey -t °u stuff "ü" - bindkey -t °U stuff "Ü" - bindkey -t °s stuff "ß" - - msgwait 1 - version -# change back to showing messages -# for duration of two seconds: - msgwait 2 - -# To get screen to add lines to xterm's scrollback buffer, uncomment the -# following termcapinfo line which tells xterm to use the normal screen buffer -# (which has scrollback), not the alternate screen buffer. - termcapinfo xterm|xterms|xs|rxvt ti@:te@ - -# Welcome the user: - echo "welcome BoFH!" - -# vim: ft=screen -## END OF FILE ################################################################# diff --git a/etc/grml/screenrc_acpi b/etc/grml/screenrc_acpi deleted file mode 100644 index 3fe82ead..00000000 --- a/etc/grml/screenrc_acpi +++ /dev/null @@ -1,146 +0,0 @@ -# Filename: /etc/grml/screenrc_acpi -# Purpose: configuration file for GNU screen providing ACPI output -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - - backtick 1 60 60 /usr/bin/cpu-screen - backtick 2 60 60 /usr/bin/yacpi -p - caption always "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}acpi: %2`) %-21=%{wk}%D %Y-%m-%d %0c" - hardstatus alwayslastline "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" - -# switch order of caption and hardstatus: -# hardstatus alwayslastline "%{+b rk}$USER@%{wk}%H | %{yk}(load: %l |%{rk} cpu: %1` | %{Gk}acpi: %2`) %-21=%{wk}%D %Y-%m-%d %0c" -# caption always "%{wr}%n%f %t %{kw} | %?%-Lw%?%{wb}%n*%f %t%?(%u)%?%{kw}%?%+Lw%? %{wk}" - -# detach on hangup - autodetach on # default: on - crlf off # default: off - deflogin off # default: on -# defsilence off # default: off -# hardcopy_append on # default: off - hardcopy_append off # default: off - nethack on # default: off -# don't display the copyright page - startup_message off # default: on -# no annoying audible bell, please - vbell on - - defscrollback 1000 # default: 100 -# msgminwait 3 # default: 1 - silencewait 15 # default: 30 - - hardcopydir $HOME/.hardcopy - -# fix the "screen.linux" terminal problem (see Debian BTS #238355 + #239776) -# term linux - -# shell /bin/zsh - -# "sorendition": set the colors for -# the "messages" and "text marking" -# (ie text you mark in copy mode): - sorendition 10 99 # default! - -# use %n to display the window number and %t for its title: - activity "activity in %n (%t) [%w:%s]~" - -# pass on the "beep" (CTRL-G) by adding a '~': - bell "bell in %n (%t) [%w:%s]~" - -# pow_detach_msg: Message shown when session -# gets power detached. - pow_detach_msg "Screen session of \$LOGNAME \$:cr:\$:nl:ended." - -# vbell_msg: Message shown when the -# "virtual bell" rings. - vbell_msg " *beep* " - -# Key bindings -# Remove some default key bindings by binding -# them to "nothing" (empty right-hand-side): -# bind . dumptermcap # default - bind . - bind ^\ - bind \\ - -# 040126 To be able to select windows with n > 9 -> -# press "C-a - #" instead of just "C-a #" - bind - command -c select_1n - bind -c select_1n 0 select 10 - bind -c select_1n 1 select 11 - bind -c select_1n 2 select 12 - bind -c select_1n 3 select 13 - bind -c select_1n 4 select 14 - bind -c select_1n 5 select 15 - bind -c select_1n 6 select 16 - bind -c select_1n 7 select 17 - bind -c select_1n 8 select 18 - bind -c select_1n 9 select 19 - bind -c select_1n - command -c select_2n - bind -c select_2n 0 select 20 - bind -c select_2n 1 select 21 - bind -c select_2n 2 select 22 - bind -c select_2n 3 select 23 - bind -c select_2n 4 select 24 - bind -c select_2n 5 select 25 - bind -c select_2n 6 select 26 - bind -c select_2n 7 select 27 - bind -c select_2n 8 select 28 - bind -c select_2n 9 select 29 - bind -c select_2n - select - - -# Use the function keys F11 and F12 to cycle backwards/forwards in -# the list of existing windows: -# bindkey -k F1 prev -# bindkey -k F2 next - -# remove some stupid / dangerous key bindings - bind k - bind ^k - bind . - bind ^\ - bind \\ - bind ^h - bind h hardcopy -# make them better - bind 'K' kill - bind 'I' login on - bind 'O' login off - bind '}' history - -# Paste - use 'P' instead of ']': -# bind P # unbound by default - bind P paste . - -# Yet another hack: -# Prepend/append register [/] to the paste if ^a^] is pressed. -# This lets me have autoindent mode in vi. - register [ "\033:se noai\015a" - register ] "\033:se ai\015a" - bind ^] paste [.] - -# X - a fast way to lock the current screen. - bind X lockscreen - -# 030511 Workaround for stupid machines without xmodmap ;-) - bindkey -t °a stuff "ä" - bindkey -t °A stuff "Ä" - bindkey -t °o stuff "ö" - bindkey -t °O stuff "Ö" - bindkey -t °u stuff "ü" - bindkey -t °U stuff "Ü" - bindkey -t °s stuff "ß" - - msgwait 1 - version -# change back to showing messages -# for duration of two seconds: - msgwait 2 -# -# Welcome the user: - echo "welcome BoFH!" - -# vim: ft=screen -## END OF FILE ################################################################# diff --git a/etc/grml/script-functions b/etc/grml/script-functions deleted file mode 100644 index 4d6bcea8..00000000 --- a/etc/grml/script-functions +++ /dev/null @@ -1,232 +0,0 @@ -# Filename: /etc/grml/script-functions -# Purpose: some often used functions for use in shellscripts -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -# {{{ set default PATH -setpath(){ - export PATH=${PATH:-'/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin'} -} -# }}} - -# {{{ check for root-permissions -check4root(){ - if [ "$(id -u 2>/dev/null)" != 0 ] ; then - echo 1>&2 "Error: please run this script with uid 0 (root)." ; return 1 - fi -} -# }}} - -# {{{ check for user permissions -check4user(){ - if [ "$(id -u 2>/dev/null)" = 0 ] ; then - echo 1>&2 "Error: please do not run this script with uid 0 (root)." ; return 1 - fi -} -# }}} - -# {{{ check for running zsh -iszsh(){ - if ! [ -z "$ZSH_VERSION" ] ; then - return 0 - else - return 1 - fi -} -# }}} - -# {{{ check for (X)dialog -setdialog(){ - if [ -n "$DISPLAY" ] ; then - [ -x /usr/bin/Xdialog ] && DIALOG="Xdialog" && export XDIALOG_HIGH_DIALOG_COMPAT=1 - else - [ -x /usr/bin/dialog ] && DIALOG='dialog' || ( echo 1>&2 "dialog not available" ; return 1 ) - fi -} -# }}} - -# {{{ check for availability of program(s) -# usage example: -# check4progs [-s,-q,--quiet,--silent] arg [arg .... argn] -# -# with option given either of: -# -s,-q,--quiet,--silent -# -# check for available progs but produce no output -check4progs() { - [ -n "${ZSH_VERSION}" ] && emulate -L sh - local RTN=0 - local oldifs="${IFS}" - local ARG d found - local VERBOSE=1 - - case ${1} in - -q | -s | --quiet | --silent) - VERBOSE=0 - shift 1 - ;; - - *) - ;; - esac - - while [ $# -gt 0 ] - do - ARG="$1" - shift - - found=0 - IFS=: - for d in $PATH - do - if [ -x "${d}/${ARG}" ] - then - found=1 - break - fi - done - IFS="${oldifs}" - - # check for availability - if [ ${found} -eq 0 ] - then - if [ ${VERBOSE} -eq 1 ] - then - printf "%s: binary not found\n" "${ARG}" >&2 - fi - RTN=1 - fi - done - - # return non zero, if at least one prog is missing! - return $RTN -} -# }}} - -# {{{ simple shell grep -stringinfile(){ - case "$(cat $2)" in *$1*) return 0;; esac - return 1 -} -# }}} - -# {{{ simple shell grep for strings -stringinstring(){ - case "$2" in *$1*) return 0;; esac - return 1 -} -# }}} - -# {{{ reread boot command line; echo last parameter's argument or return false. -getbootparam(){ - CMDLINE=$(cat /proc/cmdline) - stringinstring " $1=" "$CMDLINE" || return 1 - result="${CMDLINE##*$1=}" - result="${result%%[ ]*}" - echo "$result" - return 0 -} -# }}} - -# {{{ check boot commandline for specified option -checkbootparam(){ - stringinfile " $1" /proc/cmdline - return "$?" -} -# }}} - -# {{{ check whether $1 is yes -checkvalue(){ - if [ "$1" = "yes" -o "$1" = "YES" ] ; then - return 0 - else - return 1 - fi -} -# }}} - -# {{{ grml specific checks -isgrml(){ - [ -f /etc/grml_version ] && return 0 || return 1 -} - -grmlversion(){ - cat /etc/grml_version -} - -isgrmlcd(){ - [ -f /etc/grml_cd ] && return 0 || return 1 -} - -isgrmlhd(){ - [ -f /etc/grml_cd ] && return 1 || return 0 -} - -checkgrmlsmall(){ - grep -q small /etc/grml_version 2>/dev/null && return 0 || return 1 -} -# }}} - -# {{{ filesystems (proc, pts, sys) -mount_proc(){ - check4root || return 1 - [ -f /proc/version ] || mount -t proc /proc /proc 2>/dev/null -} - -mount_pts(){ - check4root || return 1 - stringinfile "/dev/pts" /proc/mounts || mount -t devpts /dev/pts /dev/pts 2>/dev/null -} - -mount_sys(){ - check4root || return 1 - [ -d /sys/devices ] || mount -t sysfs /sys /sys 2>/dev/null -} -# }}} - -# char *reverse_list(list) {{{ -# -# Returns the reversed order of list -# -reverse_list() { - local ret - ret='' - while [ "$#" -gt 0 ] ; do - if [ -z "${ret}" ] ; then - ret="$1" - else - ret="$1 ${ret}" - fi - shift - done - printf '%s' "${ret}" -} -#}}} - -# bool is_older_than(reference, files/dirs to check) {{{ -# -# return 0 if any of the files/dirs are newer than -# the reference file -# -# EXAMPLE: if is_older_than a.out *.o ; then ... -is_older_than() { - local x - local ref="$1" - shift - - for x in "$@" ; do - [ "${x}" -nt "${ref}" ] && return 0 - - if [ -d "${x}" ] ; then - is_older_than "${ref}" "${x}"/* && return 0 - fi - done - - return 1 -} -#}}} - -## END OF FILE ################################################################# -# vim:foldmethod=marker tw=80 ai expandtab shiftwidth=2 tabstop=8 ft=sh diff --git a/etc/grml/sysexits-sh b/etc/grml/sysexits-sh deleted file mode 100644 index 55e6d959..00000000 --- a/etc/grml/sysexits-sh +++ /dev/null @@ -1,53 +0,0 @@ -# -# Copyright (c) 1987, 1993 -# The Regents of the University of California. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 4. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# @(#)sysexits.h 8.1 (Berkeley) 6/2/93 -# - - -EX_OK=0 # successful termination - -EX__BASE=64 # base value for error messages - -EX_USAGE=64 # command line usage error -EX_DATAERR=65 # data format error -EX_NOINPUT=66 # cannot open input -EX_NOUSER=67 # addressee unknown -EX_NOHOST=68 # host name unknown -EX_UNAVAILABLE=69 # service unavailable -EX_SOFTWARE=70 # internal software error -EX_OSERR=71 # system error (e.g., can't fork) -EX_OSFILE=72 # critical OS file missing -EX_CANTCREAT=73 # can't create (user) output file -EX_IOERR=74 # input/output error -EX_TEMPFAIL=75 # temp failure; user is invited to retry -EX_PROTOCOL=76 # remote error in protocol -EX_NOPERM=77 # permission denied -EX_CONFIG=78 # configuration error - -EX__MAX=78 # maximum listed value diff --git a/etc/grml_colors b/etc/grml_colors deleted file mode 100644 index a78a9ab0..00000000 --- a/etc/grml_colors +++ /dev/null @@ -1,36 +0,0 @@ -# Filename: grml_colors -# Purpose: color definition file -# Authors: (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -# don't use highlighed colors under systemd to match its style -if [ "$(cat /proc/1/comm 2>/dev/null)" = "systemd" ] ; then - HIGHLIGHT=0 -else - HIGHLIGHT=1 -fi - -# ANSI COLORS -CRE=" " -NORMAL="" -# RED: Failure or error message -RED="[${HIGHLIGHT};31m" -# GREEN: Success message -GREEN="[${HIGHLIGHT};32m" -# YELLOW: Descriptions -YELLOW="[${HIGHLIGHT};33m" -# BLUE: System messages -BLUE="[${HIGHLIGHT};34m" -# MAGENTA: Found devices or drivers -MAGENTA="[${HIGHLIGHT};35m" -# CYAN: Questions -CYAN="[${HIGHLIGHT};36m" -# BOLD WHITE: Hint -WHITE="[${HIGHLIGHT};37m" - -# don't expose unneeded local variables -unset HIGHLIGHT - -## END OF FILE ################################################################# diff --git a/etc/grml_nocolors b/etc/grml_nocolors deleted file mode 100644 index 6fb9efbd..00000000 --- a/etc/grml_nocolors +++ /dev/null @@ -1,31 +0,0 @@ -# Filename: grml_nocolors -# Purpose: "no colors" definition file - don't use any escape sequences -# Authors: (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ -# Notice: if you want to use colors in your script you probably are -# searching for /etc/grml_colors. This file is meant to be used -# when you don't want to get escape sequences in output. For example -# this is useful when logging stuff to a file. -################################################################################ - -# ANSI COLORS -CRE='' -NORMAL='' -# RED: Failure or error message -RED='' -# GREEN: Success message -GREEN='' -# YELLOW: Descriptions -YELLOW='' -# BLUE: System messages -BLUE='' -# MAGENTA: Found devices or drivers -MAGENTA='' -# CYAN: Questions -CYAN='' -# BOLD WHITE: Hint -WHITE='' - -## END OF FILE ################################################################# diff --git a/etc/minimal-shellrc b/etc/minimal-shellrc deleted file mode 100644 index 23aa9a2d..00000000 --- a/etc/minimal-shellrc +++ /dev/null @@ -1,91 +0,0 @@ -# vim:ft=sh:fdm=marker -# Configuration for the `minimal-shell' function of grml's zsh setup. -# That function spawns a `mksh' shell with this file as its configuration. - -# skip this setup for non-interactive shells -[[ -o interactive && -t 0 ]] || return - -export PATH="/bin:/sbin/:/usr/bin/:/usr/sbin:/usr/local/bin:/usr/local/sbin:${HOME}/bin:/opt/bin" -export EDITOR='ed' - -if [[ -x $(which vim) ]] ; then - export VISUAL='vim' -else - export VISUAL='vi' -fi -if [[ -x $(which less) ]] ; then - export PAGER='less' -else - export PAGER='more' -fi - -# some options. -set -o bgnice \ - -o braceexpand \ - -o emacs \ - -o markdirs \ - -o monitor \ - -o nohup \ - -o trackall - -# aliases for various command shortcuts -alias ls='command ls --color=auto' # we're on grml, so we do have GNU ls. -alias ll='command ls -l --color=auto' -alias la='command ls -la --color=auto' -alias pu='ps -fu $USER' - -## Keybindings -bind '^L=clear-screen' -if [[ -x $(which infocmp) ]] && [[ -x $(which sed) ]] ; then - # Reading some special keys from terminfo database. If `infocmp' - # cannot be found, we rely on mksh to do the right thing. - infocmp -x1L | sed '/^\t[^k]/d;/^[^\t]/d;s/\t//;s/,$//' | \ - while read -r line ; do - key="${line%=*}" - [[ "${key}" != k* ]] && continue - seq="$(print -r -- "${line#*=}" | sed -e 's,\\\([1-7][0-7]*\),\\0\1,g')" - seq="$(print "${seq}")" - case "$key" in - key_left) bind "${seq}"='backward-char' ;; - key_right) bind "${seq}"='forward-char' ;; - key_up) bind "${seq}"='up-history' ;; - key_down) bind "${seq}"='down-history' ;; - key_ppage) bind "${seq}"='search-history-up' ;; - key_npage) bind "${seq}"='search-history-down' ;; - key_home) bind "${seq}"='beginning-of-line' ;; - key_end) bind "${seq}"='end-of-line' ;; - key_backspace) bind "${seq}"='delete-char-backward' ;; - key_dc) bind "${seq}"='delete-char-forward' ;; - esac - done -fi - -function _lrv { - local rv="$?" - if [[ "${rv}" != 0 ]]; then - print -- "[${rv}]-" - fi - return 0 -} -# put the current directory and history number in the prompt. -# use a wrapper for 'cd' to get '~' instead of /home/foo/. -function _cd { - "cd" "$@" - [[ $PWD = $HOME* && $HOME != / ]] && _pwd=\~"${PWD#$HOME}" && return - _pwd="$PWD" -} -alias cd=_cd -_cd . -PS1='$(_lrv)(!)-$_pwd' -if (( USER_ID )); then - PS1="$PS1"'\$ ' -else - PS1="$PS1"'# ' -fi - -HISTSIZE=500 -HISTEDIT="$EDITOR" -# This is the default in mksh, but we make sure in case people tempered -# with it in their environment. -unset HISTFILE -true diff --git a/etc/network/interfaces.examples b/etc/network/interfaces.examples deleted file mode 100644 index 02eba17a..00000000 --- a/etc/network/interfaces.examples +++ /dev/null @@ -1,142 +0,0 @@ -# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) -# Also check out /usr/share/doc/ifupdown/examples/network-interfaces.gz - -# The loopback interface -# automatically added when upgrading -auto lo -iface lo inet loopback - -# Sample entries: -# =============== - -# static entry: -# auto eth1 -# iface eth1 inet static -# address 192.168.0.1 -# netmask 255.255.255.0 -# network 192.168.0.0 -# broadcast 192.168.0.255 -# gateway 192.168.0.1 -# dns-search foo.example -# dns-nameservers 192.168.0.10 192.168.0.20 -# -# vconfig: -# auto eth0.1 -# iface eth0.1 inet manual -# pre-up vconfig add eth0.1 -# up ifconfig eth0 0.0.0.0 promisc up -# post-down vconfig rem eth0.1 - -# Ad-hoc WLAN Network: -# auto eth1 -# iface eth1 inet static -# address 192.168.0.1 -# netmask 255.255.255.0 -# wireless_mode ad-hoc -# wireless_essid foobar -# wireless_channel 11 - -# WLAN: -# auto eth1 -# iface eth1 inet dhcp -# wireless_essid foo -# wireless_nick bar -# wireless_key 11111111111111111111111111 -# wireless_keymode restricted -# wireless_keymode open -# wireless_mode managed - -# DSL Interface -# allow-hotplug dsl -# iface dsl inet manual -# up ip link set $IFACE up -# up ip -6 addr flush dev $IFACE || true -# down ip link set $IFACE down - -# Mapping - bring up via e.g. 'ifup eth0=dhcp': -# iface dhcp inet dhcp - -# Mapping - bring up via e.g. 'ifup -v eth0=home': -# auto eth1 -# iface home inet dhcp -# wireless_essid foo -# wireless_nick bar -# wireless_key 11111111111111111111111111 -# wireless_keymode restricted - -# More complex mapping-setup: -# auto eth0 -# mapping eth0 -# script /etc/network/ping-places.sh -# map 192.168.0.90/24 192.168.0.42 home -# map 129.27.140.238/24 129.27.140.241 spsc -# map 192.168.0.90/24 192.168.0.100 sevian7 -# map 192.168.0.90/24 192.168.0.1 work -# map 195.177.251.50/255.255.255.224 195.177.251.33 office -# -# iface home inet static -# address 192.168.0.90 -# netmask 255.255.255.0 -# gateway 192.168.0.42 -# mtu 1400 -# -# up cp /etc/apt/sources.list.home /etc/apt/sources.list -# up cp /etc/resolv.conf.home /etc/resolv.conf -# -# iface spsc inet static -# address 129.27.140.238 -# netmask 255.255.255.0 -# gateway 129.27.140.1 -# -# up cp /etc/apt/sources.list.spsc /etc/apt/sources.list -# up cp /etc/resolv.conf.spsc /etc/resolv.conf -# -# iface work inet static -# address 192.168.0.90 -# netmask 255.255.255.0 -# gateway 192.168.0.1 -# -# up cp /etc/resolv.conf.work /etc/resolv.conf -# -# iface dhcp inet dhcp -# -# iface office inet dhcp -# up cp /etc/apt/sources.list.office /etc/apt/sources.list -# -# iface realraum inet static -# wireless_essid graz.funkfeuer.at -# wireless_ap 08:CA:FF:EE:BA:BE -# wireless-mode Ad-Hoc -# address 10.13.0.13 -# netmask 255.255.255.224 -# gateway 10.13.0.1 -# dns-nameservers 83.64.208.23 -# -## Madwifi - http://madwifi.org/wiki/UserDocs/Distro/Debian/ConfiguringtheMadWifidevice -# iface ath0 inet static -# pre-up wlanconfig ath0 create wlandev wifi0 wlanmode ap -# post-down wlanconfig ath0 destroy -# wireless-essid my-essid -# -# iface home inet dhcp -# wireless-mode Managed -# wireless-essid secret -# wpa-ssid secret -# wpa-psk secret -# -# iface wpa inet dhcp -# wpa-conf /etc/wpa_supplicant.conf -# -# iface nat inet static -# address 10.23.42.1 -# netmask 255.255.255.0 -# up iptables -t nat -A POSTROUTING -o eth1 -j MASQUERADE -# up echo "1" > /proc/sys/net/ipv4/ip_forward -# -# iface oldwpa inet dhcp -# wireless-mode Managed -# wireless-essid mikaasus -# pre-up wpa_supplicant -Dwext -iipw -c/etc/wpa_supplicant.conf -B -# down killall wpa_supplicant -# -# EOF diff --git a/etc/skel/.hgrc b/etc/skel/.hgrc deleted file mode 100644 index 4c75c528..00000000 --- a/etc/skel/.hgrc +++ /dev/null @@ -1,90 +0,0 @@ -# Filename: $HOME/.hgrc -# Purpose: configuration file for mercurial -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -# See 'man 5 hgrc' and http://www.selenic.com/mercurial/hgrc.5.html -# for more details about possibilities for configuration of mercurial. - -[ui] -username = grml User -# debug = true -# verbose = true -# merge = hgmergevim - -# useful for patchbomb extension (e.g.: 'hg email -t grml@localhost tip') -[email] -from = grml User -method = /usr/sbin/sendmail - -# Extension stuff, see /etc/mercurial/hgrc.d/hgext.rc -# and http://www.selenic.com/mercurial/wiki/index.cgi/ExtensionHowto - -[extensions] - -# Hooks to control commit access to parts of a tree. -# acl=/usr/share/python-support/mercurial/hgext/acl.py - -# Update Bugzilla bugs when changesets mention them (> 0.9-1). -# bugzilla = /home/grml/mercurial-snapshot/hgext/bugzilla.py - -# Graph amount of code changed per author over time (> 0.9-1). -# churn = /home/grml/mercurial-snapshot/contrib/churn.py -# churn = - -# Extension for using an external program to diff repository (or -# selected files). Available in 0.9.1. -# extdiff=/usr/share/python-support/mercurial/hgext/extdiff.py -hgext.extdiff= - -# Convenience wrapper for pulling and merging. -# fetch = - -# Extension that provides commands to help working with trees -# composed of many Mercurial repositories. See -# http://www.terminus.org/hg/hgforest -# forest = - -# Extension for signing and checking signatures. -# gpg=/usr/share/python-support/mercurial/hgext/gpg.py -# gpg= - -# Extension for binary searching in O(log2(n)) for the changeset -# introducing a (mis)feature, see -# http://www.selenic.com/mercurial/wiki/index.cgi/UsingBisect -# hbisect=/usr/share/python-support/mercurial/hgext/hbisect.py - -# Graphical gitk-like repository browser, invoked with hg view. -# hgk=/usr/share/python-support/mercurial/hgext/hgk.py - -# Mercurial Queue management extension - see -# http://www.selenic.com/mercurial/wiki/index.cgi/MqExtension -# mq=/usr/share/python-support/mercurial/hgext/mq.py - -# Template-driven email notifications, see -# http://www.selenic.com/mercurial/wiki/index.cgi/NotifyExtension -# notify=/usr/share/python-support/mercurial/hgext/notify.py -# hgext.notify = - -# Extension providing the hg email command for sending a collection of -# Mercurial changesets as a series of patch emails. -# patchbomb=/usr/share/python-support/mercurial/hgext/patchbomb.py - -# Cherry-picking, rebasing and changeset rewriting - see -# http://www.selenic.com/mercurial/wiki/index.cgi/TransplantExtension -# transplant = - -# Extension for line ending conversion filters for the Windows platform. -# win32text=/usr/share/python-support/mercurial/hgext/win32text.py - -[extdiff] -# DirDiff script for Vim: http://www.vim.org/scripts/script.php?script_id=102 -# wget http://www.vim.org/scripts/download_script.php?src_id=5306 -O ~/.vim/plugin/DirDiff.vim -# Notice: opts.* works only in Mercurial >0.9.1, use hgvimdiff as wrapper therefore -cmd.vimdiff=/usr/bin/hgvimdiff -# cmd.vimdiff=/usr/bin/vim.basic -# opts.vimdiff=-f '+next' '+execute "DirDiff" argv(0) argv(1)' - -# vim: ft=config diff --git a/etc/zsh/zlogin b/etc/zsh/zlogin deleted file mode 100644 index 9ea6ff8f..00000000 --- a/etc/zsh/zlogin +++ /dev/null @@ -1,19 +0,0 @@ -# Filename: zlogin -# Purpose: system-wide .zlogin file for zsh(1) -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ -# This file is sourced only for login shells. It -# should contain commands that should be executed only -# in login shells. It should be used to set the terminal -# type and run a series of external commands (fortune, -# msgs, from, etc.) -# Note that using zprofile and zlogin, you are able to -# run commands for login shells before and after zshrc. -# -# Global Order: zshenv, zprofile, zshrc, zlogin -################################################################################ -# nothing yet. -## END OF FILE ################################################################# -# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4 diff --git a/etc/zsh/zprofile b/etc/zsh/zprofile deleted file mode 100644 index 11c21755..00000000 --- a/etc/zsh/zprofile +++ /dev/null @@ -1,15 +0,0 @@ -# Filename: zprofile -# Purpose: system-wide .zprofile file for zsh(1) -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ -# This file is sourced only for login shells (i.e. shells -# invoked with "-" as the first character of argv[0], and -# shells invoked with the -l flag). It's read after zshenv. -# -# Global Order: zshenv, zprofile, zshrc, zlogin -################################################################################ -# nothing yet -## END OF FILE ################################################################# -# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4 diff --git a/etc/skel/.gitconfig b/skel/gitconfig similarity index 100% rename from etc/skel/.gitconfig rename to skel/gitconfig diff --git a/etc/grml/screenrc_generic b/skel/screenrc similarity index 100% rename from etc/grml/screenrc_generic rename to skel/screenrc diff --git a/etc/tmux.conf b/skel/tmux.conf similarity index 100% rename from etc/tmux.conf rename to skel/tmux.conf diff --git a/etc/vim/vimrc b/skel/vimrc similarity index 100% rename from etc/vim/vimrc rename to skel/vimrc diff --git a/etc/skel/.zshrc b/skel/zshrc similarity index 93% rename from etc/skel/.zshrc rename to skel/zshrc index a6239fa7..7b2f5b32 100644 --- a/etc/skel/.zshrc +++ b/skel/zshrc @@ -5,7 +5,7 @@ # License: This file is licensed under the GPL v2 or any later version. ################################################################################ # Nowadays, grml's zsh setup lives in only *one* zshrc file. -# That is the global one: /etc/zsh/zshrc (from grml-etc-core). +# That is the global one: /usr/share/grml-console/zsh/zshrc (from grml-console). # It is best to leave *this* file untouched and do personal changes to # your zsh setup via ${HOME}/.zshrc.local which is loaded at the end of # the global zshrc. @@ -15,20 +15,7 @@ # Adjustments would still go to the .zshrc.local file. ################################################################################ -## Inform users about upgrade path for grml's old zshrc layout, assuming that: -## /etc/skel/.zshrc was installed as ~/.zshrc, -## /etc/zsh/zshrc was installed as ~/.zshrc.global and -## ~/.zshrc.local does not exist yet. -if [ -r ~/.zshrc -a -r ~/.zshrc.global -a ! -r ~/.zshrc.local ] ; then - printf '-!-\n' - printf '-!- Looks like you are using the old zshrc layout of grml.\n' - printf '-!- Please read the notes in the grml-zsh-refcard, being' - printf '-!- available at: http://grml.org/zsh/\n' - printf '-!-\n' - printf '-!- If you just want to get rid of this warning message execute:\n' - printf '-!- touch ~/.zshrc.local\n' - printf '-!-\n' -fi +source /usr/share/grml-console/zsh/zshrc ## Settings for umask #if (( EUID == 0 )); then diff --git a/etc/skel/.vim/ftplugin/c.vim b/vim/ftplugin/c.vim similarity index 100% rename from etc/skel/.vim/ftplugin/c.vim rename to vim/ftplugin/c.vim diff --git a/etc/skel/.vim/klammerpaare.vim b/vim/klammerpaare.vim similarity index 100% rename from etc/skel/.vim/klammerpaare.vim rename to vim/klammerpaare.vim diff --git a/etc/skel/.vim/plugin/DirDiff.vim b/vim/plugin/DirDiff.vim similarity index 100% rename from etc/skel/.vim/plugin/DirDiff.vim rename to vim/plugin/DirDiff.vim diff --git a/etc/skel/.vim/spellfile.add b/vim/spellfile.add similarity index 100% rename from etc/skel/.vim/spellfile.add rename to vim/spellfile.add diff --git a/etc/zsh/keephack b/zsh/keephack similarity index 100% rename from etc/zsh/keephack rename to zsh/keephack diff --git a/etc/zsh/zshenv b/zsh/zshenv similarity index 100% rename from etc/zsh/zshenv rename to zsh/zshenv diff --git a/etc/zsh/zshrc b/zsh/zshrc similarity index 99% rename from etc/zsh/zshrc rename to zsh/zshrc index 9b6732fc..e6e46cfc 100644 --- a/etc/zsh/zshrc +++ b/zsh/zshrc @@ -2696,7 +2696,7 @@ isgrml && grmlstuff grmlcomp # keephack -xsource "/etc/zsh/keephack" +xsource "/usr/share/grml-console/zsh/keephack" # wonderful idea of using "e" glob qualifier by Peter Stephenson # You use it as follows: