Merge branch 'master' of git.polynom.me:PapaTutuWawa/nixos-config

This commit is contained in:
PapaTutuWawa 2021-07-30 11:25:10 +02:00
commit dc1431fc9f
2 changed files with 8 additions and 5 deletions

View File

@ -13,7 +13,8 @@ in {
./modules/hardware/generic.nix ./modules/hardware/bluetooth.nix ./modules/hardware/wifi.nix ./modules/hardware/video.nix ./modules/hardware/mobile.nix
./modules/fonts.nix
./modules/users/alexander.nix
./modules/programs/zsh ./modules/programs/mpv ./modules/programs/tmux ./modules/programs/firefox ./modules/programs/gnome-terminal ./modules/programs/gnome ./modules/programs/nonvm
./modules/programs/zsh ./modules/programs/mpv ./modules/programs/git ./modules/programs/tmux ./modules/programs/firefox ./modules/programs/gnome-terminal ./modules/programs/gnome ./modules/programs/nonvm
./modules/programs/distributed-build/offload.nix
];
nixpkgs.overlays = [

View File

@ -1,10 +1,12 @@
{ pkgs, ... }:
{
let
network = import ../../network.nix;
in {
nix = {
distributedBuilds = true;
buildMachines = [{
hostName = "mikulinux";
hostName = "miku";
systems = [ "x86_64-linux" "i686-linux" ];
maxJobs = 4;
speedFactor = 2;
@ -13,8 +15,8 @@
};
programs.ssh.extraConfig = ''
Host mikulinux
HostName 192.168.178.38
Host miku
HostName ${network.miku}
User builder
IdentitiesOnly yes
IdentityFile /root/.ssh/id_builder