feat: cleaned up some stuff

This commit is contained in:
Nick 2024-10-11 17:38:05 -05:00
parent de63708b61
commit 85c14a33d1
18 changed files with 47 additions and 102 deletions

View file

@ -6,7 +6,6 @@
./hardware.nix
./networking.nix
./sops.nix
./ssh.nix
];
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
system.stateVersion = lib.mkForce "24.05";

View file

@ -3,25 +3,7 @@
inherit (flake.config.people.user.${user0}) git;
in {
sops = {
defaultSopsFile = ../../secrets/secrets.yaml;
validateSopsFiles = false;
age = {
keyFile = "/var/lib/sops-nix/key.txt";
generateKey = false;
};
secrets = {
"ssh/private" = {
path = "/home/${user0}/.ssh/id_ed25519";
owner = user0;
};
"ssh/public" = {
path = "/home/${user0}/.ssh/id_ed25519.pub";
owner = user0;
};
"ssh/hosts" = {
path = "/home/${user0}/.ssh/known_hosts";
owner = user0;
};
"network/synology" = {
path = "/var/lib/secrets/synology";
owner = "root";

View file

@ -1,8 +0,0 @@
{flake, ...}: let
inherit (flake.config.people) user0;
inherit (flake.config.people.user.${user0}) sshKeys;
in {
users.users.${user0} = {
openssh.authorizedKeys.keys = sshKeys;
};
}

View file

@ -6,7 +6,6 @@
./hardware.nix
./networking.nix
./sops.nix
./ssh.nix
];
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
system.stateVersion = lib.mkForce "24.05";

View file

@ -1,25 +1,6 @@
{flake, ...}: let
inherit
(flake.config.people)
user2
;
in {
{
sops = {
defaultSopsFile = ../../secrets/secrets.yaml;
validateSopsFiles = false;
age = {
keyFile = "/var/lib/sops-nix/key.txt";
generateKey = false;
};
secrets = {
"ssh/private" = {
path = "/home/${user2}/.ssh/id_ed25519";
owner = user2;
};
"ssh/public" = {
path = "/home/${user2}/.ssh/id_ed25519.pub";
owner = user2;
};
"network/fallaryn" = {
path = "/etc/fallaryn-synology";
owner = "root";

View file

@ -1,8 +0,0 @@
{flake, ...}: let
inherit (flake.config.people) user0;
inherit (flake.config.people.user.${user0}) sshKeys;
in {
users.users.${user0} = {
openssh.authorizedKeys.keys = sshKeys;
};
}

View file

@ -6,7 +6,6 @@
./hardware.nix
./networking.nix
./sops.nix
./ssh.nix
];
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
system.stateVersion = lib.mkForce "24.05";

View file

@ -1,26 +1,11 @@
{flake, ...}: let
inherit
(flake.config.people)
user0
user1
;
in {
sops = {
defaultSopsFile = ../../secrets/secrets.yaml;
validateSopsFiles = false;
age = {
keyFile = "/var/lib/sops-nix/key.txt";
generateKey = false;
};
secrets = {
"ssh/private" = {
path = "/home/${user0}/.ssh/id_ed25519";
owner = user0;
};
"ssh/public" = {
path = "/home/${user0}/.ssh/id_ed25519.pub";
owner = user0;
};
"network/synology" = {
path = "/var/lib/secrets/synology";
owner = "root";

View file

@ -1,8 +0,0 @@
{flake, ...}: let
inherit (flake.config.people) user0;
inherit (flake.config.people.user.${user0}) sshKeys;
in {
users.users.${user0} = {
openssh.authorizedKeys.keys = sshKeys;
};
}

View file

@ -6,7 +6,6 @@
./hardware.nix
./networking.nix
./sops.nix
./ssh.nix
];
nixpkgs.hostPlatform = lib.mkForce "x86_64-linux";
system.stateVersion = lib.mkForce "24.05";

View file

@ -2,21 +2,7 @@
inherit (flake.config.people) user0;
in {
sops = {
defaultSopsFile = ../../secrets/secrets.yaml;
validateSopsFiles = false;
age = {
keyFile = "/var/lib/sops-nix/key.txt";
generateKey = false;
};
secrets = {
"ssh/private" = {
path = "/home/${user0}/.ssh/id_ed25519";
owner = user0;
};
"ssh/public" = {
path = "/home/${user0}/.ssh/id_ed25519.pub";
owner = user0;
};
"discord-token" = {
path = "/home/${user0}/projects/zookeeper/.env";
owner = user0;

View file

@ -1,8 +0,0 @@
{flake, ...}: let
inherit (flake.config.people) user0;
inherit (flake.config.people.user.${user0}) sshKeys;
in {
users.users.${user0} = {
openssh.authorizedKeys.keys = sshKeys;
};
}