NyxErinys/Nix-Config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix import syntax

Browse source
This commit is contained in:
nyxerinys 2026-06-29 11:03:05 -05:00
parent 9291374d2e
commit 5bc9477bfc
3 changed files with 98 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/k3s/images/default.nix
View file

@ -4,6 +4,5 @@ let
./rsshfs-client.nix ./rsshfs-client.nix
./rsshfs-server.nix ./rsshfs-server.nix
]; ];
imported = map ( n: import n args ) images;
in in
lib.foldl' lib.recursiveUpdate {} imported map (image: import image args ) images

4
modules/k3s/images/rsshfs-client.nix
View file

@ -120,8 +120,7 @@ let
HostKey /tmp/ssh_host_ed25519_key HostKey /tmp/ssh_host_ed25519_key
''; '';
in in
{ pkgs.dockerTools.buildLayeredImage {
pkgs.dockerTools.buildLayeredImage {
name = "rsshfs-server"; name = "rsshfs-server";
tag = "latest"; tag = "latest";
copyToRoot = pkgs.buildEnv { copyToRoot = pkgs.buildEnv {
@ -168,5 +167,4 @@ in
Entrypoint = [ "/bin/entrypoint" ]; Entrypoint = [ "/bin/entrypoint" ];
Cmd = [ "/bin/rsshfs" "rsshfs" "/" "/containers/tmp" ]; Cmd = [ "/bin/rsshfs" "rsshfs" "/" "/containers/tmp" ];
}; };
}
} }

4
modules/k3s/images/rsshfs-server.nix
View file

@ -36,8 +36,7 @@ let
HostKey /tmp/ssh_host_ed25519_key HostKey /tmp/ssh_host_ed25519_key
''; '';
in in
{ pkgs.dockerTools.buildLayeredImage {
pkgs.dockerTools.buildLayeredImage {
name = "rsshfs-client"; name = "rsshfs-client";
tag = "latest"; tag = "latest";
copyToRoot = pkgs.buildEnv { copyToRoot = pkgs.buildEnv {
@ -88,5 +87,4 @@ in
Cmd = [ "tail" "-f" "/dev/null" ]; Cmd = [ "tail" "-f" "/dev/null" ];
ExposedPorts = { "2222/tcp" = {}; }; ExposedPorts = { "2222/tcp" = {}; };
}; };
}
} }