a lot of updates and misc fixes

This commit is contained in:
Rouven Seifert 2024-07-31 14:16:33 +02:00
parent e3a3ccfbfa
commit 28526d5db2
12 changed files with 133 additions and 87 deletions

View file

@ -19,27 +19,27 @@
"cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
];
};
buildMachines = [
# {
# hostName = "quitte.ifsr.de";
# sshUser = "rouven.seifert";
# system = "x86_64-linux";
# protocol = "ssh-ng";
# supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
# maxJobs = 4;
# speedFactor = 10;
# }
{
hostName = "fujitsu.vpn.rfive.de";
system = "x86_64-linux";
protocol = "ssh-ng";
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
maxJobs = 4;
speedFactor = 5;
}
];
extraOptions = ''
builders-use-substitutes = true
'';
# buildMachines = [
# # {
# # hostName = "quitte.ifsr.de";
# # sshUser = "rouven.seifert";
# # system = "x86_64-linux";
# # protocol = "ssh-ng";
# # supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
# # maxJobs = 4;
# # speedFactor = 10;
# # }
# {
# hostName = "fujitsu.vpn.rfive.de";
# system = "x86_64-linux";
# protocol = "ssh-ng";
# supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
# maxJobs = 4;
# speedFactor = 5;
# }
# ];
# extraOptions = ''
# builders-use-substitutes = true
# '';
};
}

View file

@ -92,7 +92,7 @@
''
# if [[ "$(hostname)" == "thinkpad" ]]
# then
# cat ${../images/cat.sixel}
# cat ${../images/cat.sixel}
# fi
eval "$(${pkgs.mcfly}/bin/mcfly init zsh)"
eval "$(${pkgs.zoxide}/bin/zoxide init zsh)"