Compare commits

..

No commits in common. "1f14d7be1b7a702fa4e0d8e18e3c0f3b53b12617" and "47f665b742fb65314991b7858b6d20142601e15f" have entirely different histories.

2 changed files with 11 additions and 13 deletions

20
flake.lock generated
View File

@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1702814678, "lastModified": 1702676849,
"narHash": "sha256-zDtO0jV2QLoddUJinLlTQrQqCUW3dPiIWOSYgg98T7E=", "narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1488651d02c1a7a15e284210f0d380a62d8d8cef", "rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1702645756, "lastModified": 1702346276,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=", "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "40c3c94c241286dd2243ea34d3aef8a488f9e4d0", "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +160,11 @@
"secrets": { "secrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1702825129, "lastModified": 1702750793,
"narHash": "sha256-mWF0LW+8goPC6fAyh+RaeF0AdI4uTGGYDFjwXjUOcFY=", "narHash": "sha256-w4ajlpX4k+9HBgmRhMaWMfHsNEs1M4ncKtJGXZcHqe8=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1374b9508620b9dcded687ff6f0110a1f916515a", "rev": "08e2b6b214e43e8bf3b3db9b7819fd27a1038c86",
"revCount": 2, "revCount": 1,
"type": "git", "type": "git",
"url": "ssh://git@git.vimium.com/jordan/nix-secrets.git" "url": "ssh://git@git.vimium.com/jordan/nix-secrets.git"
}, },

View File

@ -1,4 +1,4 @@
{ config, options, lib, home-manager, inputs, ... }: { config, options, lib, home-manager, ... }:
with lib; with lib;
{ {
@ -29,7 +29,6 @@ with lib;
}; };
config = { config = {
age.secrets."passwords/users/jordan".file = "${inputs.secrets}/passwords/users/jordan.age";
user = user =
let user = builtins.getEnv "USER"; let user = builtins.getEnv "USER";
name = if elem user [ "" "root" ] then "jordan" else user; name = if elem user [ "" "root" ] then "jordan" else user;
@ -42,7 +41,6 @@ with lib;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVHTjsyMIV4THNw6yz0OxAxGnC+41gX72UrPqTzR+OS jordan@vimium.com"
]; ];
hashedPasswordFile = config.age.secrets."passwords/users/jordan".path;
home = "/home/${name}"; home = "/home/${name}";
group = "users"; group = "users";
uid = 1000; uid = 1000;