Add threema submodule

This commit is contained in:
Fabian Hauser 2022-04-11 15:28:30 +02:00
parent 4064593e44
commit 66092ec8e5
11 changed files with 66 additions and 58 deletions

View file

@ -25,42 +25,6 @@ let
${pkgs.pass-wayland}/bin/pass show -c "$password" 2>/dev/null
'';
threema-vpn = pkgs.writeScriptBin "threema-vpn" ""; # ''
# #!${pkgs.stdenv.shell}
# set -eo pipefail
# SERVICE=openvpn-threema
# SERVICE_EXEC="${config.systemd.services.openvpn-threema.serviceConfig.ExecStart}"
# exec sudo ${pkgs.openvpn}/sbin/openvpn''${SERVICE_EXEC#@* openvpn}
#'';
threema-env = pkgs.writeScriptBin "threema-env" ''
#!/usr/bin/env bash
set -eo pipefail
# Nix shell might fail on some PWDs, so go to home
OLD_PWD=`pwd`
cd $HOME
ENV_NAME="$1"
ENV_FILE="$HOME/shares/cloud.threema.ch/envs/''${ENV_NAME}.nix"
COMMAND="''${2-bash}"
if [ -z "$ENV_NAME" ]; then
echo "Error: No env name provided" >&2
exit 2
fi
if [ ! -f "$ENV_FILE" ]; then
echo "Error: Env file does not exist" >&2
exit 3
fi
echo "Starting '$COMMAND' in env '$ENV_FILE'"
${pkgs.nix}/bin/nix-shell ''${ENV_FILE} --run "(cd $OLD_PWD; $COMMAND)"
'';
wsudo = with pkgs.xorg;
pkgs.writeScriptBin "wsudo" ''
#!/usr/bin/env bash
@ -73,4 +37,4 @@ let
ed
${xhost}/bin/xhost
'';
in { home.packages = [ passbemenu threema-vpn threema-env wsudo ]; }
in { home.packages = [ passbemenu wsudo ]; }