From 7e8695c0bdabb8c594ba5dd1590477395d183c28 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 5 Apr 2020 19:19:16 +0200 Subject: [PATCH] extract SSH host config to a secrets repo --- .gitmodules | 6 ++++++ create_symlinks.sh | 2 +- home/home.nix | 9 +++++++++ home/secrets | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 home/secrets diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..73a44e4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "all-hies"] + path = all-hies + url = https://github.com/Infinisil/all-hies +[submodule "home/secrets"] + path = home/secrets + url = ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git diff --git a/create_symlinks.sh b/create_symlinks.sh index e19c51b..85af626 100755 --- a/create_symlinks.sh +++ b/create_symlinks.sh @@ -8,7 +8,7 @@ HOMECONFIGPATH="${HOME}/.config/nixpkgs" NIXOSCONFIGPATH="/etc/nixos" mkdir -p "${HOMECONFIGPATH}" -for F in `find ./home -mindepth 1 -maxdepth 1`; do +for F in `find ./home -mindepth 1 -maxdepth 2`; do ABS_F=`readlink -f "${F}"` ln -s "$ABS_F" "${HOMECONFIGPATH}/`basename ${F}`" done diff --git a/home/home.nix b/home/home.nix index ac05b43..59c9bd4 100644 --- a/home/home.nix +++ b/home/home.nix @@ -243,6 +243,7 @@ let twemoji-color-font opensans-ttf (iosevka.override { design = [ "slab" "term" ]; set = "serif"; }) + (iosevka.override { privateBuildPlan = { design = [ "slab" "sp-term" ]; family = "Iosevka Serif"; }; set = "serif"; }) # TODO: vollkorn # TODO: humor-sans ]; @@ -293,6 +294,14 @@ in enableSshSupport = true; }; + programs.ssh = + { + enable = true; + # ssh host config + matchBlocks = + import ./secrets/ssh_hosts.nix; + }; + programs.tmux = { enable = true; keyMode = "vi"; diff --git a/home/secrets b/home/secrets new file mode 160000 index 0000000..de07de8 --- /dev/null +++ b/home/secrets @@ -0,0 +1 @@ +Subproject commit de07de8b76dac718ceef1258738ba2dd8fc3d3c2