diff --git a/configs/ssh.nix b/configs/ssh.nix index 715c071..a7890d0 100644 --- a/configs/ssh.nix +++ b/configs/ssh.nix @@ -2,7 +2,7 @@ inherit (import ../lib) sshPort kieran; externalNetwork = import ../lib/external-network.nix; in { - users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys pkgs; + users.users.me.openssh.authorizedKeys.keys = kieran.sshKeys; programs.ssh.startAgent = true; @@ -28,15 +28,15 @@ in { }; # environment.extraInit = '' - # if [[ -z "$SSH_AUTH_SOCK" ]]; then - # export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)" - # fi + # if [[ -z "$SSH_AUTH_SOCK" ]]; then + # export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)" + # fi # ''; # environment.interactiveShellInit = '' - # GPG_TTY="$(tty)" - # export GPG_TTY - # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null + # GPG_TTY="$(tty)" + # export GPG_TTY + # ${pkgs.gnupg}/bin/gpg-connect-agent updatestartuptty /bye > /dev/null # ''; home-manager.users.me.programs.ssh = { diff --git a/configs/sshd.nix b/configs/sshd.nix index e0ce554..9021643 100644 --- a/configs/sshd.nix +++ b/configs/sshd.nix @@ -17,5 +17,5 @@ in { }; }; - users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys pkgs; + users.users.root.openssh.authorizedKeys.keys = kieran.sshKeys; } diff --git a/lib/default.nix b/lib/default.nix index f5444b9..fa217bb 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -67,11 +67,11 @@ github = "kmein"; email = "kmein@posteo.de"; name = "KierĂ¡n Meinhardt"; - sshKeys = pkgs: - pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl { - url = "https://github.com/kmein.keys"; - hash = "sha256-kabB1yNEToMw1Lcf4WYx4IfuuLzHOPvABTQku5CE60A="; - })); + sshKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDyTnGhFq0Q+vghNhrqNrAyY+CsN7nNz8bPfiwIwNpjk" # kabsa + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiQEc8rTr7C7xVLYV7tQ99BDDBLrJsy5hslxtCEatkB" # manakish + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByreBjBEMJKjgpKLd5XZHIUUwIhNafVqN6OUOQpJa3y" # fatteh + ]; }; syncthing.devices = { diff --git a/systems/makanek/weechat.nix b/systems/makanek/weechat.nix index d13302c..b7ff082 100644 --- a/systems/makanek/weechat.nix +++ b/systems/makanek/weechat.nix @@ -193,7 +193,7 @@ in { users.extraUsers.weechat = { useDefaultShell = true; openssh.authorizedKeys.keys = - kieran.sshKeys pkgs + kieran.sshKeys ++ [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@heym" ];