emily/nixfiles
emily/nixfiles
1
0
Fork 1
Code Issues Pull requests Activity

Update from update-inputs-2024-12-12-04-20

Browse source
This commit is contained in:
Update Bot 2024-12-12 04:20:27 +01:00
commit d16b588f90
No known key found for this signature in database
4 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
config/services/hydra/nix-config.nix
View file

@ -17,18 +17,18 @@
hostName = "integra.kyouma.net";
sshUser = "nix-ssh";
maxJobs = 2;
speedFactor = 4;
speedFactor = 24;
systems = [ "aarch64-linux" ];
supportedFeatures = base ++ aarch64;
supportedFeatures = base ++ aarch64 ++ [ "aarch64-linux-native" ];
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
}
{
hostName = "schrodinger.kyouma.net";
sshUser = "root";
maxJobs = 0;
maxJobs = 2;
speedFactor = 20;
systems = [ "riscv64-linux" ];
supportedFeatures = base ++ riscv64;
supportedFeatures = base ++ riscv64 ++ [ "riscv64-linux-native" ];
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
}
] ++ lib.forEach (lib.range 0 11) (num: {
@ -39,7 +39,8 @@
systems = [ "i686-linux" "x86_64-linux" ]
++ lib.optionals (lib.mod num 5 == 0) [ "aarch64-linux" "riscv64-linux" ];
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" ] ++ x86-64
++ lib.optionals (lib.mod num 5 == 0) (aarch64 ++ riscv64);
++ lib.optionals (lib.mod num 5 == 0) (aarch64 ++ riscv64
++ [ "aarch64-linux-qemu" "riscv64-linux-qemu" "x86_64-linux-native" "i686-linux-native" ]);
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
});
nixpkgs.config.allowUnsupportedSystem = true;

1
config/users/lucy/default.nix
View file

@ -11,6 +11,7 @@
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZH8HwE1OxVAArRpc3+c7foYJ/WYjp4BqUyuab9yQyl emilia@emilia"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdONA7yQMPvEgdeCi3uYh4J6K0U5sk/DcwHNa9jv+Jb minorin@kotori"
];
};

30
flake.lock
View file

@ -179,11 +179,11 @@
]
},
"locked": {
"lastModified": 1726867691,
"narHash": "sha256-IK3r16N9pizf53AipOmrcrcyjVsPJwC4PI5hIqEyKwQ=",
"lastModified": 1733919067,
"narHash": "sha256-ZsL5pKwEDhcZhVJh+3IwgHus7kSW/N8qOlBscwB6BCI=",
"owner": "kirelagin",
"repo": "dns.nix",
"rev": "a3196708a56dee76186a9415c187473b94e6cbae",
"rev": "a23f43f9762aa96d3e35c8eeefa7610bd0cdf456",
"type": "github"
},
"original": {
@ -221,10 +221,10 @@
]
},
"locked": {
"lastModified": 1733870522,
"narHash": "sha256-2t3i2E0S512QnjB8LN3Sq0ZIDE2v229y2UhzTd/+X9I=",
"lastModified": 1733922313,
"narHash": "sha256-1+80hQhpCHwpCWhUHk8IPDmhDoBn8xkFEQa7cha3WIc=",
"ref": "refs/heads/main",
"rev": "7e81b41ecf529b820d2d53816c7c65c028b9d474",
"rev": "06ca44342aceb731f8a7362070172ce138b196ae",
"revCount": 1,
"type": "git",
"url": "https://woof.rip/mikael/firefox.git"
@ -602,11 +602,11 @@
]
},
"locked": {
"lastModified": 1733873195,
"narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=",
"lastModified": 1733951607,
"narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f26aa4b76fb7606127032d33ac73d7d507d82758",
"rev": "6e5b2d9e8014b5572e3367937a329e7053458d34",
"type": "github"
},
"original": {
@ -1001,11 +1001,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1733847310,
"narHash": "sha256-VHzWuZYK/m5OFXzAczrjnI7vH6knj0sfLnziRVDqgFE=",
"lastModified": 1733953545,
"narHash": "sha256-1UsUuIfq0ywIxmYBJdIi6tFFmpR/RtOBQVijARaaX68=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "b752606681ded3f69e99ed568c7075b3578dce48",
"rev": "c7b109f5af93f8e59148a1a4838f3472f8ae403d",
"type": "github"
},
"original": {
@ -1108,11 +1108,11 @@
]
},
"locked": {
"lastModified": 1733785344,
"narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=",
"lastModified": 1733965552,
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a",
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
"type": "github"
},
"original": {

6
pkgs/build-worker-oci/default.nix
View file

@ -32,6 +32,7 @@ dockerTools.buildLayeredImage {
"big-parallel"
"nixos-test"
"uid-range"
"gccarch-x86-64"
"gccarch-x86-64-v2"
"gccarch-x86-64-v3"
@ -42,6 +43,11 @@ dockerTools.buildLayeredImage {
"gccarch-rv64imac"
"gccarch-rv64imacfd"
"gccarch-rv64gc"
"riscv64-linux-qemu"
"aarch64-linux-qemu"
"x86_64-linux-native"
"i686-linux-native"
];
in ''
mkdir -p /root