valnyx/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix sops & change ssh key

Browse source
This commit is contained in:
valerie 2024-07-22 16:01:11 -04:00
parent 5ab530f9be
commit 1200a7093f
Signed by: valnyx
GPG key ID: CC10324DD962CB7E
6 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -419,10 +419,10 @@
"mysecrets": { "mysecrets": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720910245, "lastModified": 1721677492,
"narHash": "sha256-xACM/LGDLmgy8JQIPWojb5KOiIqbQpofX9WUbGQHiZE=", "narHash": "sha256-VQBIEuO01t4Tq4We5ER9/GV/mbHXVQSf3zD7s6vwSqY=",
"ref": "main", "ref": "main",
"rev": "2f617698545719fd26f7fc074a0da1e6673e62d9", "rev": "1e1c10a8bd978220aa4cea5c3a13f726971276f2",
"shallow": true, "shallow": true,
"type": "git", "type": "git",
"url": "ssh://git@192.168.1.203:2222/deva/secrets.git" "url": "ssh://git@192.168.1.203:2222/deva/secrets.git"

9
os/configuration.nix
View file

@ -21,18 +21,18 @@ in {
# sops.age.generateKey = true; # sops.age.generateKey = true;
# This file below is the only file that needs to be copied over (for sops support) # This file below is the only file that needs to be copied over (for sops support)
sops.age.keyFile = "/home/${config.users.users.me.name}/.config/sops/age/keys.txt"; sops.age.keyFile = "/etc/sops-keys.txt";
sops.secrets = { sops.secrets = {
id_dev = { id_deva = {
owner = config.users.users.me.name; owner = config.users.users.me.name;
inherit (config.users.users.me) group; inherit (config.users.users.me) group;
path = "/home/${config.users.users.me.name}/.ssh/id_dev"; path = "/home/${config.users.users.me.name}/.ssh/id_deva";
}; };
user_password = { user_password = {
neededForUsers = true; neededForUsers = true;
}; };
}; };
home-manager.users.me.home.file.".ssh/id_dev.pub".text = builtins.readFile ./id_dev.pub; home-manager.users.me.home.file.".ssh/id_deva.pub".text = builtins.readFile ./id_deva.pub;
users.mutableUsers = false; users.mutableUsers = false;
users.users.me.hashedPasswordFile = config.sops.secrets.user_password.path; users.users.me.hashedPasswordFile = config.sops.secrets.user_password.path;
@ -145,6 +145,7 @@ in {
]; ];
files = [ files = [
"/etc/machine-id" "/etc/machine-id"
"/etc/sops-keys.txt"
]; ];
}; };

2
os/dev/default.nix
View file

@ -136,7 +136,7 @@ in {
host = "gitlab.com github.com 192.168.1.203"; host = "gitlab.com github.com 192.168.1.203";
identitiesOnly = true; identitiesOnly = true;
identityFile = [ identityFile = [
"~/.ssh/id_dev" "~/.ssh/id_deva"
]; ];
}; };
}; };

1
os/id_dev.pub
View file

@ -1 +0,0 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJRVqaCvz582ioiqnNELKIrGy4RkJ4IVorYlJ98iuZz hi@dessa.dev

1
os/id_deva.pub Normal file
View file

@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPVwUob8DTgkccFqWNU2XJEf3xlFPOKef+43+56W5UGj hi@dessa.dev

4
os/users.nix
View file

@ -16,7 +16,7 @@
desktopEnvironment = "gnome"; desktopEnvironment = "gnome";
obs = true; obs = true;
authorizedKeys = [ authorizedKeys = [
(builtins.readFile ./id_dev.pub) (builtins.readFile ./id_deva.pub)
]; ];
packages = with pkgs; [ packages = with pkgs; [
nom nom
@ -34,7 +34,7 @@
shell = "zsh"; shell = "zsh";
extraGroups = []; extraGroups = [];
authorizedKeys = [ authorizedKeys = [
(builtins.readFile ./id_dev.pub) (builtins.readFile ./id_deva.pub)
]; ];
}; };
} }