Update makehome.sh

Remove commented unused sections, remove unneeded Tmux sections

makehome.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 # A self-contained script to install my personal dotfiles.
-# It overwrites .vimrc and .tmux.conf, and .bashrc with my customizations.
+# It writes or overwrites .vimrc, .tmux.conf, and
+# .bashrc with my preferred customizations.
 
 echo "Setting up server environment..."
 
@@ -26,81 +27,38 @@ EOF
 
 echo "Overwriting .tmux.conf"
 cat << 'EOF' > ~/.tmux.conf
-# Set the status bar style: white text on a green background
 set -g status-style fg=colour231,bg=colour2
-
 set -g status-interval 5
 
-# Add a space to the beginning of the status bar
-# This keeps the default session name '[#S]' and adds a space before it
 set -g status-left-length 300
-set -g status-left '#[bold]   #(pretty=$(hostnamectl --pretty 2>/dev/null); [ -n "$pretty" ] && echo "$pretty" || hostname)#[nobold] | #{user}@#{host} | #(hostname -I | tr " " "\n" | grep -E "^(10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[01])\.)"|head -1||echo "no-private") / #(timeout 2 curl -s ifconfig.me 2>/dev/null||echo "no-public") | #(if docker info >/dev/null 2>&1; then echo " $(docker ps -q | wc -l)/$(docker ps -aq | wc -l)"; else echo "#[fg=red] down#[default]"; fi) | '
+set -g status-left '#[bold]   #(pretty=$(hostnamectl --pretty 2>/dev/null); [ -n "$pretty" ] && echo "$pretty" || hostname)#[nobold] | #{user}@#{host} | #(hostname -I | tr " " "\n" | grep -E "^(10\.|192\.168\.|172\.(1[6-9]|2[0-9]|3[01])\.)"|head -1||echo "no-private") | '
 
-# Add a space to the end of the status bar
-# This keeps the default hostname and date/time, and adds a space after
 set -g status-right ' %b %d %H:%M:%S (#(TZ="America/Los_Angeles" date "+%%I:%%M %%p")) '
 EOF
 
 echo "Overwriting .bashrc"
 cat << 'EOF' > ~/.bashrc
-# ~/.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
 case $- in
     *i*) ;;
       *) return;;
 esac
 
-# 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=10000
 HISTFILESIZE=10000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
 shopt -s checkwinsize
 
-# 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|*-256color) color_prompt=yes;;
 esac
 
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#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
@@ -108,7 +66,6 @@ else
 fi
 unset color_prompt force_color_prompt
 
-# 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"
@@ -117,43 +74,22 @@ xterm*|rxvt*)
     ;;
 esac
 
-# enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
     alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
     alias grep='grep --color=auto'
     alias fgrep='fgrep --color=auto'
     alias egrep='egrep --color=auto'
 fi
 
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
 alias ll='ls -alF'
 alias la='ls -A'
 alias l='ls -CF'
 
-# Add an "alert" alias for long running commands.  Use like so:
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 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 ! shopt -oq posix; then
   if [ -f /usr/share/bash-completion/bash_completion ]; then
     . /usr/share/bash-completion/bash_completion
@@ -162,7 +98,6 @@ if ! shopt -oq posix; then
   fi
 fi
 
-# Automatically start tmux if not already running in an interactive session
 if [[ -z "$TMUX" ]] && [[ "$-" == *i* ]]; then
   tmux attach -t "$HOSTNAME" || tmux new -s "$HOSTNAME"
 fi
@@ -170,4 +105,3 @@ EOF
 
 echo ""
 echo "Done! Log out and log back in, or run 'source ~/.bashrc' to apply all changes."
-