Merge branch 'master' of rygel.us:~/mitch/dotfiles

2 files changed, 36 insertions, 0 deletions

diff --git a/lvm-snapshot.sh b/lvm-snapshot.sh
new file mode 100644
index 0000000..4991495
--- /dev/null
+++ b/lvm-snapshot.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+
+vg="x230"
+lv="root"
+snap_name="${lv}-snap"
+mountpoint="/mnt/snap"
+PERCENT="100"
+
+mount_fs() {
+	_device="$1"; shift
+	_opts="nouuid,rw"
+	_mntpoint="$1"; shift
+	if ! [ -d "$_mntpoint" ] ; then
+		mkdir "$_mntpoint"
+	fi
+	mount -o "$_opts" "$_device" "$_mntpoint"
+}
+
+# If snapshot doesn't exist
+if ! lvm lvs "$vg/$snap_name" >/dev/null 2>&1 ; then
+	lvm lvcreate "$vg/$lv" -s --name "$snap_name" -l "${PERCENT}%ORIGIN"
+	mount_fs "/dev/$vg/$snap_name" "$mountpoint"
+	sed -i.bak -r "s@(/dev/${vg}/${lv})@\1${snap_name}@" \
+		"$mountpoint/etc/fstab"
+	umount "$mountpoint"
+else
+	printf 'Cannot continue snapshot "%s" already exists.\n' \
+			"$vg/$snap_name"
+	exit 1;
+fi
diff --git a/mkshrc b/mkshrc
index 758313d..3d78f8c 100644
--- a/mkshrc
+++ b/mkshrc
@@ -140,6 +140,8 @@ setaliases() {
 	alias rot13="tr 'A-Za-z' 'N-ZA-Mn-za-m'"
 	alias setxkbmap-list="man xkeyboard-config"
 	alias showsshhosts="cat ~/.ssh/config ~/.ssh/inc/* | awk '/^[hH]ost /{print \$2}'"
+	# docker-getip $container_id
+	alias docker-getip="docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'"
 	alias xa='xargs -I{}'
 	alias gdb='gdb -q'
 	alias bc='bc -q'
@@ -262,8 +264,11 @@ pulltermcolors() {
 	chmod +x $file
 }
 set_nocaps() {
+	setxkbmap -layout "us,de"
 	setxkbmap -option ctrl:nocaps
 	setxkbmap -option shift:breaks_caps
+	setxkbmap -option numpad:microsoft
+	setxkbmap -option grp:alt_space_toggle
 }
 set_go() {
 	export GOPATH="${GOPATH:-$HOME/go}"