Compare commits

...

6 Commits

7 changed files with 219 additions and 1 deletions

1
.bash-aliases Normal file
View File

@ -0,0 +1 @@
alias please=`sudo -p 'What's the magic word? '`

131
.bashrc Normal file
View File

@ -0,0 +1,131 @@
# ~/.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=1000
HISTFILESIZE=2000
# 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
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
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"
;;
*)
;;
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 -l'
#alias la='ls -A'
#alias l='ls -CF'
# 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
elif [ -f /etc/bash_completion ]; then
. /etc/bash_completion
fi
fi
# Stop Ctrl+S from freezing the terminal
bind -r '\C-s'
stty -ixon
EDITOR=/usr/bin/vim
SUDO_EDITOR=/usr/bin/vim
VISUAL=/usr/bin/vim
source ~/.bash-aliases
function _update_ps1() {
PS1=$(powerline-shell $?)
}
if [[ $TERM != linux && ! $PROMPT_COMMAND =~ _update_ps1 ]]; then
PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
fi

9
.gitconfig Normal file
View File

@ -0,0 +1,9 @@
[init]
defaultBranch = main
[user]
name = Jono Targett
email = jono.targett@gmail.com
[alias]
tree = log --graph --decorate --pretty=oneline --abbrev-commit

2
.vimrc
View File

@ -1,4 +1,4 @@
color desert color slate
syntax on syntax on
set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab

22
export Executable file
View File

@ -0,0 +1,22 @@
#! /bin/bash
set -eu
repo_root=$(git rev-parse --show-toplevel)
# Test for newer changes in the dotfiles. Protection against clobbering changes you might want to preserve.
dry_run=$(rsync -avu --itemize-changes --dry-run --files-from=./tracked-files --exclude-from=./.gitignore . ~)
if echo "${dry_run}" | grep -q '^<'; then
echo "Some installed files have newer mtimes than the repository versions. Please import the changes first."
exit 1
elif echo "${dry_run}" | grep -q '^>'; then
echo "Some installed files differ from the repository versions. Creating a backup..."
backup_dir=$(mktemp -d -t backupXXXXXXXX)
${repo_root}/import ${backup_dir} y > /dev/null
mkdir -p ${repo_root}/.backup/
tar -czf ${repo_root}/.backup/$(basename $backup_dir).tgz $backup_dir
fi
# Actually perform the copy
rsync -avu --itemize-changes --files-from=./tracked-files --exclude-from=./.gitignore . ~

49
import Executable file
View File

@ -0,0 +1,49 @@
#! /bin/bash
set -eu
function check_clean() {
if ! git diff-index --quiet HEAD -- ; then
echo "Git repository is dirty, aborting."
git status --short --untracked-files=no
exit 1
fi
}
function dry_run() {
rsync -HPrlm \
--itemize-changes \
--dry-run \
--files-from=./tracked-files \
--exclude-from=./.gitignore \
"${source}" "${destination}"
}
source=${HOME}
repo_root=$(git rev-parse --show-toplevel)
destination="${1:-$repo_root}"
echo "Importing working dotfiles to $destination"
dry_run
if [ -z "${1+x}" ]; then
echo "Performing git repository check..."
check_clean
fi
if [ -z "${2+x}" ]; then
read -r -p "Are you sure? [y/N] " response
response=${response,,}
else
response=$2
fi
if [[ "$response" =~ ^(yes|y)$ ]]; then
rsync -HPrlm \
--itemize-changes \
--files-from=./tracked-files \
--exclude-from=./.gitignore \
"${source}" "${destination}"
fi

6
tracked-files Normal file
View File

@ -0,0 +1,6 @@
.vim/
.vimrc
.gitconfig
.bashrc
.bash-aliases