nx2/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sops ace + docker fix

Browse Source
This commit is contained in:
Lennart J. Kurzweg (Nx2)
2024-06-03 23:52:44 +02:00
parent aff6992949
commit 4f01013081
7 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
system-modules/docker.nix
View File

@@ -3,8 +3,18 @@
{
environment.systemPackages = with pkgs; [
lazydocker
docker-compose-language-service
];
virtualisation.docker.enable = true;
virtualisation.docker = {
enable = true;
# daemon.settings = {
# vpnKitMaxPortIdleTime = 0;
# };
};
users.users."${user}".extraGroups = [ "docker" ];
networking.firewall.allowedTCPPorts = [
80
8384
];
}

2
system-modules/sshd.nix
View File

@@ -6,7 +6,7 @@
else if ( host == "NxXPS") then
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPf+08+t8a0lY2+nR1mhIU3vuksStiJOlojJjzCwFk7r root@NxXPS"
else
"";
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBFfZpWVPlujsz3FklSVAM+tuYn4pzDSijhp5CeYNOZk root@NxACE";
sops.secrets."ssh/${host}-ssh_host_ed25519_key" = {
mode = "0600";
path = "/etc/ssh/ssh_host_ed25519_key.shadow";

13
system-modules/syncthing.nix
View File

@@ -19,7 +19,6 @@ let
dirs = {
default = { name = "sync"; path = "/home/${user}/sync"; };
};
cd = "/home/${user}/.config/syncthing";
in
lib.mkIf (user != "tv")
{
@@ -33,11 +32,12 @@ lib.mkIf (user != "tv")
enable = true;
user = "${user}";
dataDir = "/home/${user}/.local/share/syncthing"; # useless ?
configDir = cd;
configDir = "/home/${user}/.config/syncthing";
key = config.sops.secrets."syncthing/${host}/key.pem".path;
cert = config.sops.secrets."syncthing/${host}/cert.pem".path;
overrideDevices = true;
overrideFolders = true;
# guiAddress = "127.0.0.1:8384";
guiAddress = if ( host == "NxACE" ) then "0.0.0.0:8384" else "127.0.0.1:8384";
settings = {
devices = with (builtins.mapAttrs conv devices); if (host == "NxXPS") then (
@@ -45,19 +45,18 @@ lib.mkIf (user != "tv")
) else if (host == "NxNORTH") then (
xps // ace // s21u
) else (
north // xps // s21u // diane // daniel // tessa // georg
# north // xps // s21u // diane // daniel // tessa // georg
north // xps // s21u
);
folders = with dirs; if (host == "NxXPS") then {
"${default.name}" = {
path = default.path;
devices = with devices; (justname [ north s21u ]);
# devices = with devices; (justname [ north ace s21u ]);
devices = with devices; (justname [ north ace s21u ]);
};
} else if (host == "NxNORTH") then {
"${default.name}" = {
path = default.path;
devices = with devices; (justname [ s21u xps ]);
# devices = with devices; (justname [ xps ace s21u ]);
devices = with devices; (justname [ xps ace s21u ]);
};
} else {
"${default.name}" = {

2
system-modules/users.nix
View File

@@ -8,7 +8,7 @@
extraGroups = [ "networkmanager" "wheel" "audio" "video" "docker" "libvirtd" "uinput" ];
useDefaultShell = true;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHzEtnN/GrgXK7yz+0z1x6rKHhYYQhTOFQ6c6Faz79g2 Nx2-ed25519-ssh-key"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID1RPCcS8DtIf75a2FEW4d8X6WTVeLlmretoLqppvZlJ" # From [A] GPG Sub Key
];
packages = with pkgs; []; # all in home.nix
};