darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

try building an aarch64 variant of the nixos-8gb-fsn1-1

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-07-20 09:58:13 +01:00
parent a4d6d3a408
commit 4bd901cbda
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
8 changed files with 121 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config/installer.nix
View file

@ -13,10 +13,10 @@
boot.supportedFilesystems = ["zfs"];
# Oldest system I have is skylake-based
/*
nixpkgs.localSystem = {
gcc.arch = "skylake";
gcc.tune = "skylake";
system = "x86_64-linux";
};
*/
nixpkgs.localSystem = {
gcc.arch = "skylake";
gcc.tune = "skylake";
system = "x86_64-linux";
};
*/
}

5
config/nixos-8gb-fsn1-1-arm64.nix Normal file
View file

@ -0,0 +1,5 @@
_: {
imports = [
./nixos-8gb-fsn1-1.nix
];
}

4
flake.nix
View file

@ -39,6 +39,10 @@ rec {
name = "nixos-8gb-fsn1-1"; # Hetzner Server
system = "x86_64-linux";
}
{
name = "nixos-8gb-fsn1-1-arm64"; # Hetzner Server
system = "aarch64-linux";
}
{
name = "nutty-noon"; # PC
system = "x86_64-linux";

12
modules/matrix/mautrix-whatsapp.nix
View file

@ -104,9 +104,9 @@ in {
ProtectHostname = true;
ProtectKernelModules = true;
ProtectClock = true;
SystemCallArchitectures="native";
SystemCallErrorNumber="EPERM";
SystemCallFilter="@system-service";
SystemCallArchitectures = "native";
SystemCallErrorNumber = "EPERM";
SystemCallFilter = "@system-service";
WorkingDirectory = dataDir;
StateDirectory = baseNameOf dataDir;
UMask = 0117;
@ -141,9 +141,9 @@ in {
ProtectHostname = true;
ProtectKernelModules = true;
ProtectClock = true;
SystemCallArchitectures="native";
SystemCallErrorNumber="EPERM";
SystemCallFilter="@system-service";
SystemCallArchitectures = "native";
SystemCallErrorNumber = "EPERM";
SystemCallFilter = "@system-service";
WorkingDirectory = dataDir;
StateDirectory = baseNameOf dataDir;
UMask = 0117;

74
packages/minecraft/luckperms.nix
View file

@ -72,43 +72,43 @@
};
in
/*
stdenv.mkDerivation {
inherit pname version src;
name = "${pname}-${version}.jar";
nativeBuildInputs = [ git ];
postPatch = addResolveStep;
buildPhase = ''
${gnused}/bin/sed -i "s#'bukkit-legacy',##" settings.gradle
${gnused}/bin/sed -i "s#'bukkit-legacy:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'bungee',##" settings.gradle
${gnused}/bin/sed -i "s#'bungee:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'nukkit',##" settings.gradle
${gnused}/bin/sed -i "s#'nukkit:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge:sponge-service',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge:sponge-service-api8',##" settings.gradle
${gnused}/bin/sed -i "s#'velocity'##" settings.gradle
export GRADLE_USER_HOME=$(${coreutils}/bin/mktemp -d)
# add local maven repo
${gnused}/bin/sed -i "s#mavenCentral()#mavenCentral(); maven { url '${deps}/maven' }#" build.gradle
${gnused}/bin/sed -i "s#jcenter()#jcenter(); maven { url '${deps}/maven' }#" settings.gradle
${gnused}/bin/sed -i "s#'fabric',##" settings.gradle
${gradle}/bin/gradle --offline --no-daemon --info -Dorg.gradle.java.home=${openjdk17_headless} build
'';
installPhase = ''
cp bukkit/loader/build/libs/LuckPerms-Bukkit-5.4.0.jar $out
'';
}
*/
stdenv.mkDerivation {
inherit pname version src;
name = "${pname}-${version}.jar";
nativeBuildInputs = [ git ];
postPatch = addResolveStep;
buildPhase = ''
${gnused}/bin/sed -i "s#'bukkit-legacy',##" settings.gradle
${gnused}/bin/sed -i "s#'bukkit-legacy:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'bungee',##" settings.gradle
${gnused}/bin/sed -i "s#'bungee:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'nukkit',##" settings.gradle
${gnused}/bin/sed -i "s#'nukkit:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge:loader',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge:sponge-service',##" settings.gradle
${gnused}/bin/sed -i "s#'sponge:sponge-service-api8',##" settings.gradle
${gnused}/bin/sed -i "s#'velocity'##" settings.gradle
export GRADLE_USER_HOME=$(${coreutils}/bin/mktemp -d)
# add local maven repo
${gnused}/bin/sed -i "s#mavenCentral()#mavenCentral(); maven { url '${deps}/maven' }#" build.gradle
${gnused}/bin/sed -i "s#jcenter()#jcenter(); maven { url '${deps}/maven' }#" settings.gradle
${gnused}/bin/sed -i "s#'fabric',##" settings.gradle
${gradle}/bin/gradle --offline --no-daemon --info -Dorg.gradle.java.home=${openjdk17_headless} build
'';
installPhase = ''
cp bukkit/loader/build/libs/LuckPerms-Bukkit-5.4.0.jar $out
'';
}
*/
fetchurl {
url = "https://ci.lucko.me/job/LuckPerms/1429/artifact/bukkit/loader/build/libs/LuckPerms-Bukkit-5.4.21.jar";
sha256 = "bd9090b3cf1412d77ff58ee0c2c7229184306cc83ff18ff4681ea1b7116b3747";

42
zones/chir.rs.nix
View file

@ -45,27 +45,27 @@ with dns.lib.combinators; let
}
];
/*
subdomains = {
_tcp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
_udp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
};
*/
subdomains = {
_tcp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
_udp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
};
*/
HTTPS = [
{
svcPriority = 1;

42
zones/darkkirb.de.nix
View file

@ -45,27 +45,27 @@ with dns.lib.combinators; let
}
];
/*
subdomains = {
_tcp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
_udp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
};
*/
subdomains = {
_tcp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
_udp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
};
*/
HTTPS = [
{
svcPriority = 1;

42
zones/int.chir.rs.nix
View file

@ -76,27 +76,27 @@ in {
}
];
/*
subdomains = {
_tcp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
_udp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
};
*/
subdomains = {
_tcp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
_udp.subdomains."*".TLSA = [
{
certUsage = "dane-ee";
selector = "spki";
match = "sha256";
certificate = "0b85bd8fd152ed8b29a25e7fd69c083138a7bd35d79aea62c111efcf17ede23f";
ttl = zoneTTL;
}
];
};
*/
HTTPS = [
{
svcPriority = 1;