diff --git a/.gitattributes b/.gitattributes index ed82dfa..b105668 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,2 @@ #pattern filter=crypt diff=crypt hosts/linode/synapse.nix.crypt filter=crypt diff=crypt -home/ssh/id_rsa* filter=crypt diff=crypt -modules/ssh/id_* filter=crypt diff=crypt diff --git a/home/home.nix b/home/home.nix index d04b9c6..8d85c1c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -42,6 +42,7 @@ nano nmap openssl + setup-ssh tmux transcrypt unzip diff --git a/home/ssh.nix b/home/ssh.nix index 05a513a..09ed6df 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -52,9 +52,4 @@ }; }; }; - - home.file = { - ".ssh/id_rsa".text = builtins.readFile ./ssh/id_rsa; - ".ssh/id_rsa.pub".text = builtins.readFile ./ssh/id_rsa.pub; - }; } diff --git a/home/ssh/authorized_keys b/home/ssh/authorized_keys new file mode 100644 index 0000000..171e42c --- /dev/null +++ b/home/ssh/authorized_keys @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQDLQRq55JKqLifX+31kEXyuoB8gfM+5thAlgR7XLPvvdu6g2a5cCWyozQ1I2oGbPRfJtzcJ5ifM7Ii2PuqAj3MdYFLHBEDOhIpBBWme9Ts2YB9HJ4NorBvB4zEfJd0Q7k2MmylyeBOwdwGz3bVqPRDcJbxWFMDHqr33FEs6SXdfyAQ5SvhWGARI84qz8zUUdOp6M4e3aIGO3cx1gA+YzYQ4FbUtL8+m1NFO8VoNFMZBMf5q0iF/SgEu5bmGWUCePia6DvfeBFQ2/y4Y7WmOj980WE+JmFTkIvmGruMYeGI8FuDQ2JIIIcehddy9bQbPF4VlGnTFsHqJYVRUUWc+vH1cPNMn01oB8s27ogf9e1lyhIN+cZOgp/jDt4eXcO4Wr04uwj7CI6m+d8iMQOa5Jv0hmNgqqiwOMVBlKeo0FCxlovzwvn/Lia9WZ74JqM6JwLCD8SZ0oFgiSIHOTHrQhr7iaCmj7X/0ey7VR8FnCrpeAJpG+ELTfWGshF1d9QR2zW7u4EsXTDLiuOmdJ+/KxwMvjMcWdlg2+Qch6SwulTQRxWaED2IWJo+YiAql8eaiVXu/eZJGLoiskGFZnONoLrzIT4pSjakPlrSpn/M/GkP1pDpaMkr24OhJsGpJNEU3F1ZcOMqy2iJzIxlPmU8Xg0I/OrnbJplpaXeRCqnmouJUJhWkaPzawaVyW7dtvprLWcpQtUgTRet18WLyOrLKlq1jwvNRMTPKUJ2IFJMpk2pNEP6bdiUxyMa4vrRIEU2p1zsYSUJpCRLtccZ/i/+yAqwnTA2L5TdAORi9nD2uCdM/Ljz52V3A14QapS6oqcoWx2soWKgnsbVXoG8DxmUTpll77Ze9t7Y5216SMInWuOu0vstP8ZcgFmWsiBgIYIuLA58abWHMxgD251phYidua6R3Gtkf8J/kYqTR1P6eJF1bt5efEg7FD2aL1QQZsYJo3CRNz7yVe1XqMdPbfe2mFXQVF9TDX5x6r9Ir3d0KiEmTlBdByz8nSyPJ8IQxC58NT4LNVQs3p2XH2Zcf6B4JOBSmV4NNBnLseFobsxniWjkWwZigED/D2iu3OXuuhmskCbw0hKy2rBcKffaSNMioVqYIiYNfKlMlSvAacQKqc/1HCpqgX8PwAcSgNSLy4K7/gIrTHmjY+g+CH7onzatWzkLo+0vsZRa/D/qwhhK2CU2FeU07mhnWxWuzqpJuqVaAwDTaEforK7nQUtAOFAZZP6qGhIoqsynYt4THb+QORb3QYfaP0PVgQwXfVU5Q8eUQFZ8A+siPtOASFjDumsIbseB5VzkF+UhvdseJwkX2+4pVFu8eHFDyvArYsHeGK6fBcQGJFQc2jSs6doIP9HD9IO2R ghelling@unknown38BAF87CD102 +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQCgg6FGmtWPjw5iYTlxJLz1WBCE7zhYhXgmfPvFRt6cd+sPdBdD3axkYPwuUxIa1dxwLEHn8BY9ZajFNrbD+Y0C82stxbBGLRhScj9phGP6LPJhNJsqeuU1rXcnUS127GlFayBb92UajpgMBVlQVJVgOikdK0GZWS4LMsTafkldS5leYr4o8pJ94ZQUk04m9Y2AhkLOMWDdLqqbVS7rFDKsfNDm6YUIrc4fCFvMwo2IhKb3VMv/CqPBFWx9YWFnLoNRAUhVTbcpDWBprvgAirf1rI9jXihX78gBLYqaI0shZg3mldIfQPaPudxXAYXZBFxZkcdnlEwOIL3jvR1bQKfRroAsLs4Nz66RDMIEC6cYm6QEIppFzx5pAXmjBHk8RPYPV0Z7gHxlp2yL0C3K6E1XN/A6cvK719VxEI8Sqmzl7Dd9/wikuyZhA/ZJfShpGTFX7M4wWKd9ZB6F01ATqAqACs4BHIIakl01C+lad2WQwxCXZo3dxGTMGoUrWTlTcAIKYHA0uun0k3oU0KRcSojpGMFCedR/HfLXZ/3TxeUHAZzSFKAQqZPE+6AZMoDSqVgWW6gPvRqVbtgG17qf6kPXM7XQRw/mNnjUWYrqSzDU4eEyN0AcfWhAN7defp+ERNlDyIdvYSiTniONuBMR5nz5xhLctKosJ1DaQcyNxYok9kGhG92pShRW11JmU/AmM3K6svD2tMRNRg2sJUNYHVzr/P65vZ43jXFV9hn5VTvhNofiDmAgTiPP+4Xo25FHtzu2CDwd7ve1zZZ8WyunmHx5kevdCQBcscKnpHO5MK1EBG2acThWD3HbfzncLkP6w5ZkLngGieIB1C3UjpzbbcBTeQ2NJnra59ZpouZ/ivqoxr/xqCakKlRmi201PV4DzB3HEYhODnmieykZcpSU77EuQb5H5w4k/YY0I9ZVrwyBuMfEducUPV8ghV6HRuZYUNWhOOr+rSmPSvi24kH8kkuoG7D+6aZbLpezyl6u6RvFuwGC784nr1nLXFSMOQpjND23SuGWn6iAcSCqxJ5eBIh50U2ZylsavBjaMDp94esBEG/YyWKcFO5b3xPr75/cwaeLGttdrnMfyWFG6Iz1yFxiMvTNqLKRlGNduK6OPTet89ymu1Gau+l5kfn9YE22gvwCRWU2GuCyTk/PigFyrAKmKduglUecW+Wgylh2OQ6YLJkE3nnJ2u+ujEJsqNdoQBJRFYm4efPFp0WK6DrAmOT/fAD6TyLitWwH+1XFgDR3IKynHgTVaG5SVhjBrT9NA59b90FDmQJmKiVMItDFTn6Ir2+qMw3mvl/xHoXJ6QRuNEOTWtqh8QeJIU5+tjr0pfW+Dz4/fydmOYX3khVZADR9 greg@jude diff --git a/home/ssh/id_rsa b/home/ssh/id_rsa deleted file mode 100644 index af1e346..0000000 --- a/home/ssh/id_rsa +++ /dev/null @@ -1,136 +0,0 @@ -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 diff --git a/home/ssh/id_rsa.pub b/home/ssh/id_rsa.pub deleted file mode 100644 index 60ddf64..0000000 --- a/home/ssh/id_rsa.pub +++ /dev/null @@ -1,30 +0,0 @@ -E3dmYp+uiptzaRBGQEin5Pfod25OMQM7QffdGm8f/tZDMg7m/g8y4z/EV1KIZYnS -IxoK5/Q0+tdwx2UAgdFHT/PeWFdsGTCn+m/Z8AUgc8+Suy1DSatk7E1KYfty1YKG -xzPU9TSz4kA46QI2jvgVsZCh25XjP43Sfx6DYyDd4CZMG9T05EIPVLBZYsvvmmzR -oTdvziVwqBBhUZuQf2tcoapfh+PN4+mDvJwng1QCB99QY7qNdgWR6S1HoEess9XA -HjbrAq0VEPfTq0mJZpuMFBEBgtlBgsj0Fy7+AtCUXYmiiDVl2pXuo6qYiCo3KlGb -YIuo6t9t7V5cZO4f4PWx62XF17wBef5a4i4ECBbFLMVxQtNbDs9ZJy+nkoaJ9k9l -/sYJ+2du4Yj/WSkBxySk/vq95yLU1lhmhJYO5gm8we0/OIaaQmUEWcgG/y3um7vx -Rp6Hbmd1n4VDkDPXmu/fEWFLbtVxf0dDFwxfxnL+WPFn2FddPeq+vgTfeYih0DhK -uBwN9+UPaQgqHOxphlOJlTcfxCQTrd+NIaMzYU2mejyrdxg6GAVPYK1zsSd6y0ik -agYPGMD+5GAZfIKvubYmojV2Dyo+EqM1L/sgM3M5uuA6urVaYiVVazPYH3pRpj4M -RHbX9o4QqMPeQ3qZkq351CP56GkK4oBG1m3uZfd5sBv+J3kMctsfrokrhJT7irA/ -WJY2HA1eZCBlV8oWLITDS/yJyFSR48tRwl6ZBkg1M6BoGuOm6SUaVqn9ZZxgbbgV -wsV/jyKkKngcKI6+iR4hopbuAmRrxlJC6NMcu2nHas/FwSgNv0QUcZaZGfVzOqMF -hd2hgmWaZ4bsr211QzEWsulaIkBJ7HduoOkG2DBx5shdEUKdaOwILXS7VNrltu2l -fHNuOB5PRfGaTEWXoO+pDMLFtxrvMTxdzjbwj0CoNZtRaZKZk2/vV8nkrBCMilHg -IKDrWggptyBQamnTOATTaLCJm2MZEQX5aNDUzYeoroUZG+sFOVn5uDRLmv/Hrktk -1Dd5o/f6L8pnx9Xm8xeA1eMwcyxjfWYGuaUTp2EaX1BS1y8fip8WC+d5rdaYaZhH -SGun/ytf2ehLG7RAwuqRdGWE8L0XKWDPFKWoxVok5cxroAjr2uPbdMyYjjB0qpLy -o1Jv6FKxvq8fYgYSEI1vcm9kVzgplgKXD1XBKFBH2k2rr6XltlJ402BSekeqMKve -7yWB/6QwHQPX36Z3VtppTvt/qY9frTVxa7DBmGMHMXT1yWHHnRfhw3Qql9+ivYQy -2wK07SwFqPgRV/fpyfV1fGek1NSTPXpMFCvtFmcS28Pj3oC7LD0/DQc4nrdm8m6/ -hB4vqJkzkMNnmJh+m426naCME+5qCD0L9Z4Lp5ZwzRkQVJNuw8lE+2e8x5HctU/6 -B0WqZ34BaLN1Zaguzavua6HDTNrzrCWf+SxvG9qj5gl4W9TwsrA3OuxnOpyHLW8/ -2GEOzlnVprA4Ehty+fc/IBpB1ulvZ7iF6COS0CmMc5MxGcGRVKmCy1NnzrkVZLDT -apGHJCZLEHaBoDcA7uAwQAPW1V15L8l1RkJ8Qmx079XwSX+/mRZsy1uH9tCAx9ZZ -ehidbc96v804R271y6RuXv/bNeN6RCkAfAlq5hYKOafg34R8GMJGcgxLZSKpSw3T -dNEcvBBqKzS7OxRGxKoTXe9mZT5YhFZG41dPy0smqMLLU/3CokruUKmSorw2L2M2 -rxvbhHEmCdXxIgvl/oDDNCUshmZhaS2rF0Ei+43qK/M2KSfpd1146mgb7xZlNMqf -s1eLMaB33tRwj1kzmLGhDgEjXA6GSrbXYcLxggyJJFQ8jrzdkDobwsq91reqJXLz -6SqzQHmjTy1F/550CEEUanyOYLYh8mElqRYnZFe/gKjjEY3L0cd59qVjWQLJthFG diff --git a/overlays/default.nix b/overlays/default.nix index 6223620..6bc2fbe 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -62,6 +62,9 @@ in rec { hms = super.callPackage ./hms.nix { pkgs = self.pkgs; }; + setup-ssh = super.callPackage ./setup-ssh.nix { + pkgs = self.pkgs; + }; kiwix-tools = super.callPackage ./kiwix-tools.nix {}; libkiwix = super.callPackage ./libkiwix.nix {}; zimlib = super.callPackage ./zimlib.nix {}; diff --git a/overlays/hms.sh b/overlays/hms.sh index d34fcf2..1c08bcd 100644 --- a/overlays/hms.sh +++ b/overlays/hms.sh @@ -7,9 +7,11 @@ if [ "$(uname -s)" == "Darwin" ]; then # On macOS src="${HOME}/.config/nix/" flavor="gui" + arch="${arch}-darwin" elif [ x"${WSL_DISTRO_NAME}" != "x" ]; then src=/etc/nixos flavor="cli" + arch="${arch}-linux" else # On Linux systems if [ -z "${DISPLAY}" ]; then @@ -18,6 +20,7 @@ else flavor="gdm" fi src=/etc/nixos + arch="${arch}-linux" fi # Build and switch diff --git a/overlays/setup-ssh.nix b/overlays/setup-ssh.nix new file mode 100644 index 0000000..7077e0b --- /dev/null +++ b/overlays/setup-ssh.nix @@ -0,0 +1,3 @@ +{ pkgs, ... }: + +pkgs.writeShellScriptBin "setup-ssh" (builtins.readFile ./setup-ssh.sh) diff --git a/overlays/setup-ssh.sh b/overlays/setup-ssh.sh new file mode 100644 index 0000000..c2dd88b --- /dev/null +++ b/overlays/setup-ssh.sh @@ -0,0 +1,11 @@ +# vim: set ft=bash: +if [ ! -f "${HOME}/.ssh/id_rsa" ]; then + echo "Generating a new key" + ssh-keygen -t rsa -b 8192 -f "${HOME}/.ssh/id_rsa" -N '' + cat "${HOME}/.ssh/id_rsa.pub" >> /etc/nixos/home/ssh/authorized_keys + + echo "Authing key to GitHub - may fail" + gh auth refresh -h github.com -s admin:public_key + gh ssh-key add -t ${HOSTNAME}-auto ~/.ssh/id_rsa.pub || true +fi +cp /etc/nixos/home/ssh/authorized_keys "${HOME}/.ssh/authorized_keys"