cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more resilient deescalate script

Browse source
This commit is contained in:
Cyryl Płotnicki 2020-02-22 15:02:48 +00:00
parent 9101ebbfe8
commit b32499179e
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/cli.nix
View file

@ -2,7 +2,7 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
wget git gnupg curl tmux python36Packages.glances htop atop pciutils powertop ripgrep-all fd dnsutils wget git gnupg curl tmux python36Packages.glances htop atop pciutils powertop ripgrep-all fd dnsutils du-dust
( pass.withExtensions (ext: [ ext.pass-otp ext.pass-import ext.pass-genphrase ext.pass-audit ext.pass-update ])) ( pass.withExtensions (ext: [ ext.pass-otp ext.pass-import ext.pass-genphrase ext.pass-audit ext.pass-update ]))
cabal-install stack hsetroot lm_sensors cabal-install stack hsetroot lm_sensors
wirelesstools ranger apvlv wirelesstools ranger apvlv

9
tools/mount-vault
View file

@ -1,6 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
set -o pipefail
VERACRYPT="veracrypt" VERACRYPT="veracrypt"
if [[ "$OSTYPE" == "darwin"* ]]; then if [[ "$OSTYPE" == "darwin"* ]]; then
VERACRYPT="/Applications/VeraCrypt.app/Contents/MacOS/VeraCrypt" VERACRYPT="/Applications/VeraCrypt.app/Contents/MacOS/VeraCrypt"
@ -19,6 +21,8 @@ if [[ -z "$MOUNT_SOURCE" ]]; then
MOUNT_SOURCE="$HOME/vaults/vault.vera" MOUNT_SOURCE="$HOME/vaults/vault.vera"
fi fi
chmod a+x "$MOUNT_SOURCE"
if [[ -z "$VAULT_PASSWORD" ]]; then if [[ -z "$VAULT_PASSWORD" ]]; then
echo "interactive mount" echo "interactive mount"
$VERACRYPT -t --mount "$MOUNT_SOURCE" "$MOUNT_TARGET" $VERACRYPT -t --mount "$MOUNT_SOURCE" "$MOUNT_TARGET"
@ -26,9 +30,10 @@ else
echo "non-interactive mount of '$MOUNT_SOURCE' to '$MOUNT_TARGET'" echo "non-interactive mount of '$MOUNT_SOURCE' to '$MOUNT_TARGET'"
sudo $VERACRYPT -t --non-interactive -p $VAULT_PASSWORD --mount "$MOUNT_SOURCE" "$MOUNT_TARGET" sudo $VERACRYPT -t --non-interactive -p $VAULT_PASSWORD --mount "$MOUNT_SOURCE" "$MOUNT_TARGET"
fi fi
echo "mounted"
sudo chown $USER "$MOUNT_TARGET" sudo chown $USER "$MOUNT_TARGET"
echo "chowned"
echo "$MOUNT_SOURCE -> $MOUNT_TARGET" echo "$MOUNT_SOURCE -> $MOUNT_TARGET"
$MOUNT_TARGET/install "$MOUNT_TARGET/install"