diff --git a/configuration.nix b/configuration.nix index 6f27176..b818a86 100644 --- a/configuration.nix +++ b/configuration.nix @@ -42,7 +42,7 @@ in btop ripgrep vim - dnsdog + dogdns tree ]; gnome.excludePackages = with pkgs; [ gnome.totem gnome-tour gnome.epiphany gnome.geary gnome-console ]; @@ -77,8 +77,7 @@ in age.secrets.wg-quick-home-privkey.file = ./secrets/wg-quick-home-privkey.age; age.secrets.wg-quick-home-preshared-key.file = ./secrets/wg-quick-home-preshared-key.age; - age.identityPaths = [ "/home/pim/.ssh/id_ed25519" ]; - + age.identityPaths = [ "/home/pim/.ssh/age_ed25519" ]; networking.wg-quick = { interfaces.home = { diff --git a/home/home.nix b/home/home.nix index bfba3fd..dae49c6 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, config, ... }: { imports = [ @@ -45,12 +45,18 @@ xdg.userDirs.enable = true; - # homeage = { - # identityPaths = [ "/home/pim/Downloads/rage/homeage-test/identity.txt" ]; - # installationType = "systemd"; - # file."helloworld" = { - # source = ./homeage-test/source.txt.age; - # symlinks = [ "/home/pim/Downloads/rage/homeage-test/result2.txt" ]; - # }; - # }; + 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" ]; + }; + }; } diff --git a/home/ssh/default.nix b/home/ssh/default.nix index bff9550..b5c52e1 100644 --- a/home/ssh/default.nix +++ b/home/ssh/default.nix @@ -9,7 +9,7 @@ matchBlocks = { gitlab-sue = lib.hm.dag.entryBefore [ "*" ] { hostname = "gitlab.com"; - identityFile = "~/.ssh/sue/id_ed25519"; + identityFile = "~/.ssh/sue_ed25519"; identitiesOnly = true; }; github = lib.hm.dag.entryBefore [ "*" ] { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index fb70817..8a09ab6 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,7 +1,11 @@ let - pim = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILTxn6fDUyEOWhuapt5GptYPZay+3tNH+UeY7aq8KSbh pim@x260"; + publicKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILTxn6fDUyEOWhuapt5GptYPZay+3tNH+UeY7aq8KSbh pim@x260" + ]; in { - "wg-quick-home-privkey.age".publicKeys = [ pim ]; - "wg-quick-home-preshared-key.age".publicKeys = [ pim ]; + "wg-quick-home-privkey.age".publicKeys = publicKeys; + "wg-quick-home-preshared-key.age".publicKeys = publicKeys; + "sue_ed25519.age".publicKeys = publicKeys; + "sue_azure_rsa.age".publicKeys = publicKeys; } diff --git a/secrets/sue_azure_rsa.age b/secrets/sue_azure_rsa.age new file mode 100644 index 0000000..4d2567d Binary files /dev/null and b/secrets/sue_azure_rsa.age differ diff --git a/secrets/sue_ed25519.age b/secrets/sue_ed25519.age new file mode 100644 index 0000000..052948d Binary files /dev/null and b/secrets/sue_ed25519.age differ