diff options
Diffstat (limited to 'accounts')
| -rw-r--r-- | accounts/gkleen@sif/ssh-hosts.nix | 5 | ||||
| -rw-r--r-- | accounts/gkleen@sif/zshrc | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/accounts/gkleen@sif/ssh-hosts.nix b/accounts/gkleen@sif/ssh-hosts.nix index 44dc27f5..a250509b 100644 --- a/accounts/gkleen@sif/ssh-hosts.nix +++ b/accounts/gkleen@sif/ssh-hosts.nix | |||
| @@ -428,6 +428,11 @@ in { | |||
| 428 | { hostname = "dpl-fai01.mathinst.loc"; | 428 | { hostname = "dpl-fai01.mathinst.loc"; |
| 429 | user = "root"; | 429 | user = "root"; |
| 430 | }; | 430 | }; |
| 431 | "dpl-fai02" = | ||
| 432 | { hostname = "dpl-fai02.mathinst.loc"; | ||
| 433 | user = "root"; | ||
| 434 | proxyJump = "mgmt01"; | ||
| 435 | }; | ||
| 431 | "math05" = | 436 | "math05" = |
| 432 | { hostname = "math05.mathinst.loc"; | 437 | { hostname = "math05.mathinst.loc"; |
| 433 | proxyCommand = autosshProxy "mathw0h"; | 438 | proxyCommand = autosshProxy "mathw0h"; |
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc index 3a524bf1..c628e2e9 100644 --- a/accounts/gkleen@sif/zshrc +++ b/accounts/gkleen@sif/zshrc | |||
| @@ -59,7 +59,7 @@ dir() { | |||
| 59 | cleanup() | 59 | cleanup() |
| 60 | { | 60 | { |
| 61 | cd ${modifyPDF:h} | 61 | cd ${modifyPDF:h} |
| 62 | [[ -n ${modifyPDF} ]] && nix shell nixos#imagemagick -c convert -verbose ${dir}/${modifyPDF:t:r}_*.png(on) ${modifyPDF} | 62 | [[ -n ${modifyPDF} ]] && nix shell 'nixos#imagemagick' -c convert -verbose ${dir}/${modifyPDF:t:r}_*.png(on) ${modifyPDF} |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | ( | 65 | ( |
| @@ -98,7 +98,7 @@ dir() { | |||
| 98 | unpack=false | 98 | unpack=false |
| 99 | ;; | 99 | ;; |
| 100 | application/vnd.debian.binary-package) | 100 | application/vnd.debian.binary-package) |
| 101 | nix shell nixos#binutils --command ar x ${templateArchive} | 101 | nix shell 'nixos#binutils' --command ar x ${templateArchive} |
| 102 | mkdir control data | 102 | mkdir control data |
| 103 | tar -C control -xvaf control.* | 103 | tar -C control -xvaf control.* |
| 104 | tar -C data -xvaf data.* | 104 | tar -C data -xvaf data.* |
| @@ -106,7 +106,7 @@ dir() { | |||
| 106 | ;; | 106 | ;; |
| 107 | application/x-rpm) | 107 | application/x-rpm) |
| 108 | cpioArchive=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t:r}.cpio") | 108 | cpioArchive=$(mktemp -t "archive.XXXXXXXXXX.${templateArchive:t:r}.cpio") |
| 109 | nix shell nixos#busybox --command rpm2cpio ${templateArchive} > ${cpioArchive} | 109 | nix shell 'nixos#busybox' --command rpm2cpio ${templateArchive} > ${cpioArchive} |
| 110 | templateArchive=${cpioArchive} | 110 | templateArchive=${cpioArchive} |
| 111 | unpack=true | 111 | unpack=true |
| 112 | ;; | 112 | ;; |
| @@ -115,12 +115,12 @@ dir() { | |||
| 115 | unpack=false | 115 | unpack=false |
| 116 | ;; | 116 | ;; |
| 117 | application/pdf) | 117 | application/pdf) |
| 118 | nix shell nixos#ghostscript nixos#imagemagick -c convert -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png | 118 | nix shell 'nixos#ghostscript' 'nixos#imagemagick' -c convert -verbose -density 400 ${templateArchive} ${modifyPDF:t:r}_%0d.png |
| 119 | unpack=false | 119 | unpack=false |
| 120 | ;; | 120 | ;; |
| 121 | application/octet-stream) | 121 | application/octet-stream) |
| 122 | if [[ $(file --brief --dereferenc ${templateArchive}) =~ Squashfs ]]; then | 122 | if [[ $(file --brief --dereferenc ${templateArchive}) =~ Squashfs ]]; then |
| 123 | nix shell nixos#squashfsTools -c unsquashfs -d . ${templateArchive} | 123 | nix shell 'nixos#squashfsTools' -c unsquashfs -d . ${templateArchive} |
| 124 | unpack=false | 124 | unpack=false |
| 125 | fi | 125 | fi |
| 126 | ;; | 126 | ;; |
