commit 957a2b39bc6a3cd59f7950d647b0917859766f04
parent f7f8f4552075519bab60e963ee9874f1834892d9
Author: Chris Bracken <chris@bracken.jp>
Date: Fri, 17 Nov 2017 09:49:12 -0800
Eliminate bash config files
Only the zsh config files are tested for any new changes and at this
point I'm not convinced the bash config files still behave the way I
expect them to.
Diffstat:
| D | .bash_logout | | | 7 | ------- |
| D | .bashrc | | | 124 | ------------------------------------------------------------------------------- |
| D | .profile | | | 21 | --------------------- |
| M | Makefile | | | 9 | --------- |
4 files changed, 0 insertions(+), 161 deletions(-)
diff --git a/.bash_logout b/.bash_logout
@@ -1,7 +0,0 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
-
-# when leaving the console clear the screen to increase privacy
-
-if [ "$SHLVL" = 1 ]; then
- [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
-fi
diff --git a/.bashrc b/.bashrc
@@ -1,124 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# environment vars
-export EDITOR=/usr/bin/vim
-export GNUPGHOME="$HOME/.gnupg"
-export TERMINAL=urxvt
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# vi mode
-set -o vi
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
- debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
- xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability.
-force_color_prompt=yes
-if [ -n "$force_color_prompt" ]; then
- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
- # We have color support; assume it's compliant with Ecma-48
- # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
- # a case would tend to support setf rather than setaf.)
- color_prompt=yes
- else
- color_prompt=
- fi
-fi
-
-if [ "$color_prompt" = yes ]; then
- PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\W\[\033[00m\]\$ '
-else
- PS1='${debian_chroot:+($debian_chroot)}\u@\h:\W\$ '
-fi
-unset color_prompt force_color_prompt
-
-if [ "$COLORTERM" = "gnome-terminal" ] || \
- [ "$(tput colors 2>/dev/null || echo 0)" = "256" ]; then
- export TERM=xterm-256color
-fi
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
- PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
- ;;
-*)
- ;;
-esac
-
-# path additions
-if [ -f ~/.paths ]; then
- . ~/.paths
-fi
-# aliases
-if [ -f ~/.aliases ]; then
- . ~/.aliases
-fi
-# color
-if [ -f ~/.colors ]; then
- . ~/.colors
-fi
-# functions
-if [ -f ~/.sh_functions ]; then
- . ~/.sh_functions
-fi
-# tools
-if [ -f ~/.tools ]; then
- . ~/.tools
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
- . /etc/bash_completion
-fi
-
-# Disable Ubuntu Menu Proxy (I don't like it and causes gvim to write errors to stderr)
-UBUNTU_MENUPROXY=0
-
-# Use ibus for Japanese input
-export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-
-# login message
-if [ -x "/usr/games/fortune" ]; then
- /usr/games/fortune
-elif [ -x "/opt/local/bin/fortune" ]; then
- /opt/local/bin/fortune
-fi
-echo
diff --git a/.profile b/.profile
@@ -1,21 +0,0 @@
-# ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-umask 022
-
-# gnome keyring
-if [[ $(which gnome-keyring-daemon) == 0 ]]; then
- export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)
-fi
-
-if [ -n "$BASH_VERSION" ]; then
- # bash doesn't read .bashrc in login shells, do it manually
- if [ -f "$HOME/.bashrc" ]; then
- . "$HOME/.bashrc"
- fi
-fi
diff --git a/Makefile b/Makefile
@@ -12,15 +12,6 @@ install-zsh:
ln -s "$(mkfile_dir)/.zshrc" ~/
ln -s "$(mkfile_dir)/.zlogin" ~/
-install-bash:
- ln -s "$(mkfile_dir)/.aliases" ~/
- ln -s "$(mkfile_dir)/.colors" ~/
- ln -s "$(mkfile_dir)/.paths" ~/
- ln -s "$(mkfile_dir)/.sh_functions" ~/
- ln -s "$(mkfile_dir)/.profile" ~/
- ln -s "$(mkfile_dir)/.bashrc" ~/
- ln -s "$(mkfile_dir)/.bash_logout" ~/
-
install-x:
ln -s "$(mkfile_dir)/.Xdefaults" ~/
ln -s "$(mkfile_dir)/.Xmodmap" ~/
