diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-06-25 14:33:06 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-06-25 14:33:06 +0200 |
| commit | 564263512e6425ae68ef431350edcfde8a3f1075 (patch) | |
| tree | 2e483266b85a032d7425ec838dd7ac0283dd19c5 /bash | |
| parent | First commit (diff) | |
| download | dotfiles-564263512e6425ae68ef431350edcfde8a3f1075.tar.gz dotfiles-564263512e6425ae68ef431350edcfde8a3f1075.tar.bz2 dotfiles-564263512e6425ae68ef431350edcfde8a3f1075.tar.xz | |
Use asroot instead of sudo and add emacs configs
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'bash')
| -rw-r--r-- | bash/Makefile | 8 | ||||
| -rw-r--r-- | bash/aliases-Zenith | 23 |
2 files changed, 20 insertions, 11 deletions
diff --git a/bash/Makefile b/bash/Makefile index 7ea782a..e1e62ae 100644 --- a/bash/Makefile +++ b/bash/Makefile @@ -25,7 +25,13 @@ install: ln -sf -- ~/.dotfiles/bash/bashrc_palette ~/.config/bash/bashrc_palette ln -sf -- ~/.dotfiles/bash/bashrc_prompt ~/.config/bash/bashrc_prompt ln -sf -- ~/.dotfiles/bash/aliases ~/.config/bash/aliases - ln -sf -- ~/.dotfiles/bash/aliases-Zenith ~/.config/bash/aliases-Zenith + if test "$$(hostname | tr '[[:upper:]]' '[[:lower:]]')" = zenith; then \ + test "$$(hostname)" = Zenith && \ + pacman -Qq -- asroot </dev/null >/dev/null && \ + pacman -Qq -- gnupg </dev/null >/dev/null && \ + pacman -Qq -- cryptsetup </dev/null >/dev/null && \ + ln -sf -- ~/.dotfiles/bash/aliases-Zenith ~/.config/bash/aliases-Zenith; \ + fi uninstall: -unlink -- ~/.bash_history diff --git a/bash/aliases-Zenith b/bash/aliases-Zenith index ac794c9..419de1d 100644 --- a/bash/aliases-Zenith +++ b/bash/aliases-Zenith @@ -1,17 +1,20 @@ # -*- shell-script -*- mount-crypt () { - sudo printf '' && \ - device="$(sudo losetup --show -f -P /media/Secondary/.crypt/crypt.img)" && \ - printf '%s\n' "${device}" > "${XDG_RUNTIME_DIR}/CryptCrypt" && \ - gpg --decrypt /media/Secondary/.crypt/crypt.key | sudo cryptsetup -d - open "${device}" CryptCrypt && \ - mkdir -p ~/Crypt && \ - sudo mount /dev/mapper/CryptCrypt ~/Crypt + asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" CRYPT_DIR=~/Crypt sh -ec ' + device="$(losetup --show -f -P /media/Secondary/.crypt/crypt.img)" + printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/CryptCrypt" + gpg --decrypt /media/Secondary/.crypt/crypt.key | cryptsetup -d - open "${device}" CryptCrypt + mkdir -p "${CRYPT_DIR}" + mount /dev/mapper/CryptCrypt "${CRYPT_DIR}" + ' } umount-crypt () { - sudo umount ~/Crypt - rmdir ~/Crypt - sudo cryptsetup close CryptCrypt - sudo losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/CryptCrypt")" + asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" CRYPT_DIR=~/Crypt sh -c ' + umount "${CRYPT_DIR}" + rmdir "${CRYPT_DIR}" + cryptsetup close CryptCrypt + losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/CryptCrypt")" + ' } |