Skip to content

Commit 6dfc596

Browse files
committed
Remformat using nixfmt
1 parent b3af349 commit 6dfc596

117 files changed

Lines changed: 1791 additions & 1240 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

common/base.nix

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
{ inputs, pkgs, ... }: {
1+
{ inputs, pkgs, ... }:
2+
{
23

34
# Export sys as a local registry
45
nix.registry.sys = {
5-
from = { type = "indirect"; id = "sys"; };
6+
from = {
7+
type = "indirect";
8+
id = "sys";
9+
};
610
flake = inputs.nixpkgs;
711
};
812

@@ -15,5 +19,8 @@
1519
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
1620

1721
# Enable flakes
18-
nix.settings.experimental-features = [ "nix-command" "flakes" ];
22+
nix.settings.experimental-features = [
23+
"nix-command"
24+
"flakes"
25+
];
1926
}

common/install-image-base.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ config, ... }: {
1+
{ config, ... }:
2+
{
23

34
imports = [
45
./base.nix

common/tma-base.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
{ config, ... }: {
1+
{ config, ... }:
2+
{
23

34
services.openssh.enable = true;
45
users.extraUsers.root.openssh.authorizedKeys.keys =
5-
config.swine.ssh.pubkeys.simonswine ++
6-
config.swine.ssh.pubkeys.benedikt;
6+
config.swine.ssh.pubkeys.simonswine ++ config.swine.ssh.pubkeys.benedikt;
77

88
}
9-

docker/gitlab-runner-nix/default.nix

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# This has been mostly adapted from: https://github.com/nix-community/docker-nixpkgs/blob/8fdb8770b3a574ce644f3f0e6a0cedb527944793/images/nix/default.nix
2-
{ cacert
3-
, bashInteractive
4-
, coreutils
5-
, dockerTools
6-
, gnugrep
7-
, gnumake
8-
, nix
9-
, iana-etc
10-
, gitMinimal
11-
, gnutar
12-
, gzip
13-
, openssh
14-
, xz
15-
, writeTextFile
16-
, attic-client
17-
}:
18-
dockerTools.buildImage
192
{
3+
cacert,
4+
bashInteractive,
5+
coreutils,
6+
dockerTools,
7+
gnugrep,
8+
gnumake,
9+
nix,
10+
iana-etc,
11+
gitMinimal,
12+
gnutar,
13+
gzip,
14+
openssh,
15+
xz,
16+
writeTextFile,
17+
attic-client,
18+
}:
19+
dockerTools.buildImage {
2020
name = "simonswine/gitlab-runner-nix";
2121
tag = "nixos-25.05";
2222
created = "now";
@@ -68,7 +68,11 @@ dockerTools.buildImage
6868
'';
6969

7070
config = {
71-
Entrypoint = [ "/bin/bash" "-l" "-c" ];
71+
Entrypoint = [
72+
"/bin/bash"
73+
"-l"
74+
"-c"
75+
];
7276
Cmd = "/bin/bash";
7377
Env = [
7478
"ENV=/etc/profile.d/nix.sh"
@@ -82,5 +86,3 @@ dockerTools.buildImage
8286
];
8387
};
8488
}
85-
86-

docker/gitlab-runner/default.nix

Lines changed: 44 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
{ dockerTools
2-
, pkgsStatic
3-
, cacert
4-
, gitlab-runner
5-
, docker-machine
6-
, docker-machine-driver-hetzner
7-
, openssh
8-
, runtimeShell
9-
, writeTextDir
10-
, buildEnv
11-
, gnumake
1+
{
2+
dockerTools,
3+
pkgsStatic,
4+
cacert,
5+
gitlab-runner,
6+
docker-machine,
7+
docker-machine-driver-hetzner,
8+
openssh,
9+
runtimeShell,
10+
writeTextDir,
11+
buildEnv,
12+
gnumake,
1213
}:
1314

1415
let
1516
uid = 65534;
16-
nonRootShadowSetup = { user, group ? user, uid, gid ? uid }: [
17-
(
18-
writeTextDir "etc/shadow" ''
17+
nonRootShadowSetup =
18+
{
19+
user,
20+
group ? user,
21+
uid,
22+
gid ? uid,
23+
}:
24+
[
25+
(writeTextDir "etc/shadow" ''
1926
root:!x:::::::
2027
${user}:!:::::::
21-
''
22-
)
23-
(
24-
writeTextDir "etc/passwd" ''
28+
'')
29+
(writeTextDir "etc/passwd" ''
2530
root:x:0:0::/root:${runtimeShell}
2631
${user}:x:${toString uid}:${toString gid}::/data:
27-
''
28-
)
29-
(
30-
writeTextDir "etc/group" ''
32+
'')
33+
(writeTextDir "etc/group" ''
3134
root:x:0:
3235
${group}:x:${toString gid}:
33-
''
34-
)
35-
(
36-
writeTextDir "etc/gshadow" ''
36+
'')
37+
(writeTextDir "etc/gshadow" ''
3738
root:x::
3839
${user}:x::
39-
''
40-
)
41-
];
40+
'')
41+
];
4242
in
4343
dockerTools.buildImage {
4444
name = "simonswine/gitlab-ci-runner";
@@ -55,8 +55,16 @@ dockerTools.buildImage {
5555
docker-machine-driver-hetzner
5656
openssh
5757
gnumake
58-
] ++ nonRootShadowSetup { uid = uid; user = "nobody"; group = "nogroup"; };
59-
pathsToLink = [ "/bin" "/etc" ];
58+
]
59+
++ nonRootShadowSetup {
60+
uid = uid;
61+
user = "nobody";
62+
group = "nogroup";
63+
};
64+
pathsToLink = [
65+
"/bin"
66+
"/etc"
67+
];
6068
};
6169

6270
runAsRoot = ''
@@ -67,7 +75,11 @@ dockerTools.buildImage {
6775

6876
config = {
6977
User = "nobody";
70-
Entrypoint = [ "dumb-init" "--" "gitlab-runner" ];
78+
Entrypoint = [
79+
"dumb-init"
80+
"--"
81+
"gitlab-runner"
82+
];
7183
WorkingDir = "/data";
7284
Volumes = {
7385
"/data" = { };

0 commit comments

Comments
 (0)