From 7053ed60e1a8e2b1c56c0e1ac0cff997eb63718d Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Mon, 16 Oct 2023 11:21:40 +0200 Subject: [PATCH] tidy up homeage config --- home/default.nix | 20 -------------------- home/ssh/default.nix | 12 +++++++++++- home/syncthing/default.nix | 10 ++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/home/default.nix b/home/default.nix index 4945fd2..45a4f0d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -48,25 +48,5 @@ homeage = { identityPaths = [ "/home/pim/.ssh/age_ed25519" ]; installationType = "systemd"; - - file."sue_ed25519" = { - source = ../secrets/sue_ed25519.age; - symlinks = [ "${config.home.homeDirectory}/.ssh/sue_ed25519" ]; - }; - - file."sue_azure_rsa" = { - source = ../secrets/sue_azure_rsa.age; - symlinks = [ "${config.home.homeDirectory}/.ssh/sue_azure_rsa" ]; - }; - - file."syncthing-key.pem" = { - source = ../secrets/syncthing-key.pem.age; - symlinks = [ "${config.xdg.configHome}/syncthing/key.pem" ]; - }; - - file."syncthing-cert.pem" = { - source = ../secrets/syncthing-cert.pem.age; - symlinks = [ "${config.xdg.configHome}/syncthing/cert.pem" ]; - }; }; } diff --git a/home/ssh/default.nix b/home/ssh/default.nix index b5c52e1..04138cc 100644 --- a/home/ssh/default.nix +++ b/home/ssh/default.nix @@ -1,4 +1,4 @@ -{ lib, ...}: +{ config, lib, ...}: { config = { @@ -40,5 +40,15 @@ }; }; }; + + homeage.file."sue_ed25519" = { + source = ../../secrets/sue_ed25519.age; + symlinks = [ "${config.home.homeDirectory}/.ssh/sue_ed25519" ]; + }; + + homeage.file."sue_azure_rsa" = { + source = ../../secrets/sue_azure_rsa.age; + symlinks = [ "${config.home.homeDirectory}/.ssh/sue_azure_rsa" ]; + }; }; } diff --git a/home/syncthing/default.nix b/home/syncthing/default.nix index f68e931..6612746 100644 --- a/home/syncthing/default.nix +++ b/home/syncthing/default.nix @@ -5,5 +5,15 @@ services.syncthing.enable = true; xdg.configFile."syncthing/config.xml".source = ./syncthing.xml; xdg.userDirs.music = "${config.home.homeDirectory}/sync/Music"; + + homeage.file."syncthing-key.pem" = { + source = ../../secrets/syncthing-key.pem.age; + symlinks = [ "${config.xdg.configHome}/syncthing/key.pem" ]; + }; + + homeage.file."syncthing-cert.pem" = { + source = ../../secrets/syncthing-cert.pem.age; + symlinks = [ "${config.xdg.configHome}/syncthing/cert.pem" ]; + }; }; }