haak/dotfiles
1
0
Fork 0
Code Issues Pull requests Wiki Activity Actions

use keys file for syncthing as well

Browse source
This commit is contained in:
Haak Saxberg 2022-07-31 22:45:58 -07:00
parent 6a87e1a9e4
commit 35545242ac
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nix/deployments/nixops.nix
View file

@ -18,7 +18,7 @@
# for nixops to log in and perform operations as haak (instead of root) # for nixops to log in and perform operations as haak (instead of root)
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
users.users.root.openssh.authorizedKeys.keys = [ users.users.root.openssh.authorizedKeys.keys = [
(import ../system/framework/keys.nix).public (import ../system/framework/keys.nix).ssh.public
]; ];
home-manager.users.haak = (import ../home/commandline.nix); home-manager.users.haak = (import ../home/commandline.nix);
}; };

4
nix/system/framework/configuration.nix
View file

@ -151,8 +151,8 @@
user = "haak"; user = "haak";
dataDir = "/home/haak/synced"; dataDir = "/home/haak/synced";
configDir = "/home/haak/synced/.config/syncthing"; configDir = "/home/haak/synced/.config/syncthing";
cert = if builtins.pathExists "/home/haak/dotfiles/secrets/syncthing/cert.pem" then "/home/haak/dotfiles/secrets/syncthing/cert.pem" else null; cert = (import ./keys.nix).syncthing.cert;
key = if builtins.pathExists "/home/haak/dotfiles/secrets/syncthing/key.pem" then "/home/haak/dotfiles/secrets/syncthing/key.pem" else null; key = (import ./keys.nix).syncthing.key;
}; };
location.provider = "geoclue2"; location.provider = "geoclue2";

9
nix/system/framework/keys.nix
View file

@ -1,3 +1,10 @@
{ {
public = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd7+5+rLGrsGbg+mXjzQLqwAR2VNNFPCb7Va4FqVwd7 haak@framework"; ssh = {
public = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd7+5+rLGrsGbg+mXjzQLqwAR2VNNFPCb7Va4FqVwd7 haak@framework";
};
syncthing = {
cert = if builtins.pathExists "/home/haak/dotfiles/secrets/syncthing/cert.pem" then "/home/haak/dotfiles/secrets/syncthing/cert.pem" else null;
key = if builtins.pathExists "/home/haak/dotfiles/secrets/syncthing/key.pem" then "/home/haak/dotfiles/secrets/syncthing/key.pem" else null;
};
} }