Compare commits
21 commits
update-inp
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
db728f1fc0
|
|||
|
deb35998b7
|
|||
|
d4b4561588
|
|||
|
71f81dbb0f
|
|||
|
d0e97fa1ed
|
|||
|
8a93fb6c56
|
|||
|
52f13d5dbd
|
|||
|
9fea7edfec | ||
|
|
242e72e7cb | ||
|
|
ddb7bf0d93 | ||
247420a189
|
|||
|
|
c2c39502c8 | ||
|
|
8b86e66c9d | ||
|
af4e5a7127
|
|||
|
8910001198
|
|||
|
a03fc6bb9c
|
|||
|
59ef761474
|
|||
|
c0c8f825fc
|
|||
|
73eaf9c154
|
|||
|
6b0e944765
|
|||
|
3e03107d00
|
23 changed files with 663 additions and 185 deletions
|
|
@ -5,7 +5,7 @@ in {
|
|||
./kernel.nix
|
||||
./networking.nix
|
||||
./openssh.nix
|
||||
./users
|
||||
./users.nix
|
||||
../../modules
|
||||
inputs.lix-module.nixosModules.default
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
./emily
|
||||
../users/emily
|
||||
];
|
||||
}
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
{ ... }: {
|
||||
{ inputs, ... }: {
|
||||
imports = [
|
||||
../../common
|
||||
../../users/lucy
|
||||
../../profiles/headless.nix
|
||||
../../profiles/kartoffel.nix
|
||||
../../profiles/lxc.nix
|
||||
../../services/arrs
|
||||
../../services/jellyfin.nix
|
||||
../../services/nginx.nix
|
||||
inputs.oth.nixosModules.default
|
||||
];
|
||||
networking.hostName = "crime";
|
||||
systemd.network.networks."98-eth-default" = {
|
||||
|
|
@ -23,6 +25,7 @@
|
|||
"/var/lib/radarr"
|
||||
"/var/lib/sonarr"
|
||||
"/var/lib/private/prowlarr"
|
||||
"/home"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs, ... }: {
|
||||
imports = [
|
||||
../../common
|
||||
../../users/nil
|
||||
../../profiles/builder.nix
|
||||
../../profiles/headless.nix
|
||||
../../profiles/kartoffel.nix
|
||||
|
|
@ -9,7 +10,11 @@
|
|||
../../services/hydra
|
||||
../../services/update-nixfiles.nix
|
||||
];
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
boot.binfmt = {
|
||||
preferStaticEmulators = true;
|
||||
emulatedSystems = [ "aarch64-linux" "riscv64-linux" ];
|
||||
};
|
||||
|
||||
networking.hostName = "seras";
|
||||
systemd.network.networks."98-eth-default" = {
|
||||
|
|
@ -18,16 +23,6 @@
|
|||
];
|
||||
};
|
||||
|
||||
users.users.nil = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.fish;
|
||||
ignoreShellProgramCheck = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo="
|
||||
];
|
||||
};
|
||||
|
||||
services.postgresql.settings = {
|
||||
max_connections = 200;
|
||||
shared_buffers = "24GB";
|
||||
|
|
|
|||
|
|
@ -9,10 +9,6 @@
|
|||
options snd_bcm2835 enable_headphones=1
|
||||
'';
|
||||
kernelParams = [ "snd_bcm2835.enable_hdmi=1" ];
|
||||
loader.raspberryPi.firmwareConfig = ''
|
||||
dtparam=audio=on
|
||||
dtparam=krnbt=on
|
||||
'';
|
||||
};
|
||||
console.enable = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,34 +13,79 @@
|
|||
|
||||
services.akkoma = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [ exiftool ffmpeg-headless imagemagick ];
|
||||
extraStatic."emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
|
||||
extraPackages = let
|
||||
imagemagick = pkgs.imagemagick.override {
|
||||
libheif = pkgs.libheif.overrideAttrs (prevAttrs: {
|
||||
buildInputs = prevAttrs.buildInputs or [ ] ++ [ pkgs.svt-av1 ];
|
||||
cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [ "-DWITH_SvtEnc=ON" ];
|
||||
});
|
||||
};
|
||||
in with pkgs; [ exiftool ffmpeg-headless imagemagick ];
|
||||
|
||||
extraStatic."emoji/florp" = pkgs.runCommandNoCC "florp" {
|
||||
src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
|
||||
} ''
|
||||
mkdir $out
|
||||
cp $src $out/florp.png
|
||||
'';
|
||||
extraStatic = let
|
||||
actualFetchzip =
|
||||
{
|
||||
url,
|
||||
hash
|
||||
}: pkgs.runCommandNoCC "${lib.last (lib.splitString "/" url)}" {
|
||||
src = pkgs.fetchurl {
|
||||
inherit url hash;
|
||||
};
|
||||
} ''
|
||||
${lib.getExe pkgs.unzip} $src -d $out
|
||||
for f in $out/*_256.png; do
|
||||
mv -- "$f" "''${f/_256}"
|
||||
done
|
||||
'';
|
||||
in {
|
||||
"emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
|
||||
|
||||
extraStatic."static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
|
||||
builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
|
||||
elly-mod = "/static/themes/elly-mod.json";
|
||||
}
|
||||
));
|
||||
"emoji/custom" = pkgs.runCommandNoCC "florp" {
|
||||
src = inputs.florp-branding.packages.${config.nixpkgs.hostPlatform.system}.favicon;
|
||||
} ''
|
||||
mkdir $out
|
||||
cp $src $out/florp.png
|
||||
'';
|
||||
|
||||
extraStatic."static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
|
||||
"emoji/neodog" = actualFetchzip {
|
||||
url = "https://git.gay/moonrabbits/neodog/raw/commit/6f9eb283b6dcbe507fde1110abab267cb2d73b70/neodog.zip";
|
||||
hash = "sha256-ISyzpRyjHf+4jKrOtHHqH0Qn7CQu5RQSLH/HL/YSdT4=";
|
||||
};
|
||||
|
||||
extraStatic."static/custom.css" = pkgs.writeText "custom.css" ''
|
||||
.tos-content img, .terms-of-service img {
|
||||
max-width: 100%;
|
||||
}
|
||||
'';
|
||||
"emoji/neocat" = actualFetchzip {
|
||||
url = "https://volpeon.ink/emojis/neocat/neocat.zip";
|
||||
hash = "sha256-DZDuk0Djlax504flNWdpqAw+ROLOOVGj0ZvJLyouo7A=";
|
||||
};
|
||||
|
||||
extraStatic."static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
|
||||
extraStatic."images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
|
||||
extraStatic."images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
|
||||
extraStatic."favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
|
||||
"emoji/neofox" = actualFetchzip {
|
||||
url = "https://volpeon.ink/emojis/neofox/neofox.zip";
|
||||
hash = "sha256-rZUPA7ZvrO8q/lx8XK3IxJ1URLgq0PSh752eWzG+uos=";
|
||||
};
|
||||
|
||||
"emoji/blobhaj" = actualFetchzip {
|
||||
url = "https://web.archive.org/web/20240829143703/https://heatherhorns.com/wp-content/uploads/2022/12/Blobhaj-12-13-2022.zip";
|
||||
hash = "sha256-5l8ozTivCSOomPq+zDD4FWhK5mA/H2qkGs8beuDnp9s=";
|
||||
};
|
||||
|
||||
"static/styles.json" = pkgs.writeText "styles.json" (builtins.toJSON (
|
||||
builtins.fromJSON (builtins.readFile "${pkgs.akkoma-fe-domi}/static/styles.json") // {
|
||||
elly-mod = "/static/themes/elly-mod.json";
|
||||
}
|
||||
));
|
||||
|
||||
"static/themes/elly-mod.json" = pkgs.writeText "elly-mod.json" (builtins.readFile ./elly-mod.json);
|
||||
|
||||
"static/custom.css" = pkgs.writeText "custom.css" ''
|
||||
.tos-content img, .terms-of-service img {
|
||||
max-width: 100%;
|
||||
}
|
||||
'';
|
||||
|
||||
"static/terms-of-service.html" = inputs.florp-about.packages.${pkgs.system}.default;
|
||||
"images/sylvia-ritter-15012323.avif" = inputs.florp-branding.packages.${pkgs.system}.wallpaper;
|
||||
"images/florp_banner.avif" = inputs.florp-branding.packages.${pkgs.system}.banner;
|
||||
"favicon.png" = inputs.florp-branding.packages.${pkgs.system}.favicon;
|
||||
};
|
||||
|
||||
frontends = {
|
||||
primary = {
|
||||
|
|
@ -110,6 +155,21 @@
|
|||
];
|
||||
};
|
||||
|
||||
":emoji".groups = {
|
||||
blobs = "/emoji/blobs.gg/*.png";
|
||||
blobhaj = "/emoji/blobhaj/512w/*.png";
|
||||
neodog = "/emoji/neodog/*.png";
|
||||
neocat = [
|
||||
"/emoji/neocat/*.png"
|
||||
"/emoji/neodog/additional_neocat/*.png"
|
||||
];
|
||||
neofox = [
|
||||
"/emoji/neofox/*.png"
|
||||
"/emoji/neodog/additional_neofox/*.png"
|
||||
];
|
||||
Custom = "/emoji/custom/*.png";
|
||||
};
|
||||
|
||||
"Pleroma.Captcha".method = mkRaw "Pleroma.Captcha.Kocaptcha";
|
||||
|
||||
"Pleroma.Web.Endpoint".url.host = "florp.social";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
{ lib, pkgs, ... }: {
|
||||
|
||||
services = {
|
||||
prowlarr.enable = true;
|
||||
} // lib.genAttrs [ "sonarr" "radarr" ] (_: {
|
||||
services = lib.genAttrs [
|
||||
"sonarr"
|
||||
"radarr"
|
||||
"prowlarr"
|
||||
"lidarr"
|
||||
] (_: {
|
||||
enable = true;
|
||||
});
|
||||
systemd.services = lib.genAttrs [ "radarr" "sonarr" ] (_: {
|
||||
|
|
@ -36,6 +39,10 @@
|
|||
disableHttp3 = true;
|
||||
locations = {
|
||||
"/".root = pkgs.writeTextDir "index.html" (builtins.readFile ./landingPage.html);
|
||||
"/lidarr/" = {
|
||||
proxyPass = "http://127.0.0.1:8686";
|
||||
recommendedProxySettings = true;
|
||||
};
|
||||
"/sonarr/" = {
|
||||
proxyPass = "http://127.0.0.1:8989";
|
||||
recommendedProxySettings = true;
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ working. Further configuration is required.</p>
|
|||
<a href="https://crime.kyouma.net/sonarr">crime.kyouma.net/sonarr</a><br/>
|
||||
Radarr
|
||||
<a href="https://crime.kyouma.net/radarr">crime.kyouma.net/radarr</a><br/>
|
||||
Lidarr
|
||||
<a href="https://crime.kyouma.net/lidarr">crime.kyouma.net/lidarr</a><br/>
|
||||
Prowlarr
|
||||
<a href="https://crime.kyouma.net/prowlarr">crime.kyouma.net/prowlarr</a></p>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
extraConfig = ''
|
||||
server_store_uri = https://cache.kyouma.net
|
||||
binary_cache_public_uri = https://cache.kyouma.net
|
||||
evaluator_workers = 6
|
||||
evaluator_max_memory_size = 12288
|
||||
evaluator_workers = 1
|
||||
evaluator_max_memory_size = 4096
|
||||
max_output_size = ${builtins.toString (24 * 1024 * 1024 * 1024)}
|
||||
'';
|
||||
};
|
||||
|
|
@ -44,8 +44,8 @@
|
|||
};
|
||||
|
||||
systemd.services.hydra-evaluator.serviceConfig = {
|
||||
MemoryHigh = "250G";
|
||||
MemoryMax = "254G";
|
||||
MemoryHigh = "150G";
|
||||
MemoryMax = "155G";
|
||||
};
|
||||
|
||||
kyouma.nginx.defaultForbidden = "hydra.kyouma.net";
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
{ config, lib, ... }: {
|
||||
nix.buildMachines = let
|
||||
base = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
|
||||
x86-64 = [ "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ];
|
||||
aarch64 = [ "gccarch-armv8-a" "gccarch-armv8.1-a" "gccarch-armv8.2-a" "gccarch-armv8.2-a+fp16+rcpc+dotprod" ];
|
||||
riscv64 = [ "gccarch-rv64imac" "gccarch-rv64imacfd" "gccarch-rv64gc" ];
|
||||
in [
|
||||
{
|
||||
hostName = "localhost";
|
||||
|
|
@ -16,7 +19,7 @@
|
|||
maxJobs = 2;
|
||||
speedFactor = 4;
|
||||
systems = [ "aarch64-linux" ];
|
||||
supportedFeatures = base;
|
||||
supportedFeatures = base ++ aarch64;
|
||||
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
|
||||
}
|
||||
{
|
||||
|
|
@ -25,25 +28,18 @@
|
|||
maxJobs = 0;
|
||||
speedFactor = 20;
|
||||
systems = [ "riscv64-linux" ];
|
||||
supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
|
||||
supportedFeatures = base ++ riscv64;
|
||||
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
|
||||
}
|
||||
{
|
||||
hostName = "machine-0008.cloud-v.co";
|
||||
sshUser = "root";
|
||||
maxJobs = 2;
|
||||
speedFactor = 4;
|
||||
systems = [ "riscv64-linux" ];
|
||||
supportedFeatures = base ++ [ "gccarch-rv64imac" "gccarch-rv64imacfd" ];
|
||||
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
|
||||
}
|
||||
] ++ lib.forEach (lib.genList (i: i + 1) 8) (num: {
|
||||
hostName = "build-worker-0${toString num}";
|
||||
] ++ lib.forEach (lib.range 0 11) (num: {
|
||||
hostName = "build-worker-${lib.fixedWidthNumber 2 num}";
|
||||
sshUser = "root";
|
||||
maxJobs = 2;
|
||||
speedFactor = 20;
|
||||
systems = [ "i686-linux" "x86_64-linux" ];
|
||||
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "gccarch-x86-64" "gccarch-x86-64-v2" "gccarch-x86-64-v3" ];
|
||||
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);
|
||||
sshKey = config.sops.secrets."services/hydra/id_ed25519_hydra".path;
|
||||
});
|
||||
nixpkgs.config.allowUnsupportedSystem = true;
|
||||
|
|
@ -63,9 +59,9 @@
|
|||
"build-worker-04.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOq+5I+nlAN2lJoOtoXrYEDuZ/TMPMa43pIlablYigK";
|
||||
"integra.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBwEQiSfaDrUAwgul4mktusBPcIVxI4pLNDh9DPopVU";
|
||||
"schrodinger.kyouma.net".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKo7vZ6lS1wx76YsbAdhOsGcc20YMAW52ep8SZ/FCHDp";
|
||||
"[machine.cloud-v.co]:20008".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6Kri0cjPKEXXDEl2GwfwzPO9wuPZEgJS0M6lKRHCqH";
|
||||
"lab.nyantec.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIUePtVPtBK+CYosufbaGiMT4EVanti4V5t2Wg0g/Fy4";
|
||||
"localhost".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPNVavo3YHVsrYwXRVISu7kDoknn+5inFGySn4azlB8P";
|
||||
"[build-worker-kyoumanet.fly.dev]:2200".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUGzlilikAUfUGKXVCoTeDvPRoWUgDDkNU5WaRUBzls";
|
||||
"[build-worker-kyoumanet.fly.dev]:2201".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDL2M97UBHg9aUfjDUxzmzg1r0ga0m3/stummBVwuEAB";
|
||||
"[build-worker-kyoumanet.fly.dev]:2202".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOTwVKL0P0chPM2Gz23rbT94844+w1CGJdCaZdzfjThz";
|
||||
"[build-worker-kyoumanet.fly.dev]:2203".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAjy2eZGJQeAYy0+fLgW9jiS0jVY2LInY0NDMnzCvvKp";
|
||||
|
|
@ -74,15 +70,18 @@
|
|||
"[build-worker-kyoumanet.fly.dev]:2206".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGf0kxGgwOG9KhUhvxxTSiQC5YikrzZXKDgSpBw33qN4";
|
||||
"[build-worker-kyoumanet.fly.dev]:2207".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9z95a6Fn/dB+iNigEYpuJdBnBwCkIZYaKHcFbGP+RY";
|
||||
"[build-worker-kyoumanet.fly.dev]:2208".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAk+FNMhTfAVqk3MfLp4QiG/i5ti53DlpnC0q+sOvU9O";
|
||||
"[build-worker-kyoumanet-cdg.fly.dev]:2209".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJGlQD/3fLn/Kyb7v0RIycHRcArGi75jURj803EMpW0S";
|
||||
"[build-worker-kyoumanet-cdg.fly.dev]:2210".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMQm1FSGBGdCR5f8MvBvdKM0M4yIQVnH1po7hHO5T1qz";
|
||||
"[build-worker-kyoumanet-cdg.fly.dev]:2211".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlH+v2ZlcDQY3itw4b7aRbwRTqDsTE0R5Ua3vF0VaGr";
|
||||
};
|
||||
extraConfig = ''
|
||||
Host machine-0008.cloud-v.co
|
||||
Hostname machine.cloud-v.co
|
||||
Port 20008
|
||||
'' + lib.concatLines (lib.genList (i: ''
|
||||
Host build-worker-0${toString (i + 1)}
|
||||
Hostname build-worker-kyoumanet.fly.dev
|
||||
Port 220${toString (i + 1)}
|
||||
'') 8);
|
||||
'' + lib.concatLines (lib.forEach (lib.range 0 11) (num: ''
|
||||
Host build-worker-${lib.fixedWidthNumber 2 num}
|
||||
Hostname build-worker-kyoumanet${lib.optionalString (num > 8) "-cdg"}.fly.dev
|
||||
Port 22${lib.fixedWidthNumber 2 num}
|
||||
''));
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@
|
|||
pavucontrol
|
||||
signal-desktop
|
||||
element-desktop
|
||||
firefox
|
||||
# currently broken
|
||||
#inputs.firefox.packages.${pkgs.system}.firefox
|
||||
|
||||
nixfmt-classic
|
||||
wl-clipboard
|
||||
78
config/users/lucy/default.nix
Normal file
78
config/users/lucy/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ inputs, pkgs, ... }: {
|
||||
imports = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
users.users.lucy = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.fish;
|
||||
ignoreShellProgramCheck = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIId7XvwEHtC9KdGg4Bn+XE+yyBp7/dRToJX9T56mM7ln kosaki@kosaki"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAZH8HwE1OxVAArRpc3+c7foYJ/WYjp4BqUyuab9yQyl emilia@emilia"
|
||||
];
|
||||
};
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.lucy = {
|
||||
home.stateVersion = "24.11";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
whois
|
||||
htop
|
||||
restic
|
||||
fend
|
||||
];
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
programs.bat.enable = true;
|
||||
programs.gpg.enable = true;
|
||||
programs.ripgrep.enable = true;
|
||||
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
prefix = "M-w";
|
||||
clock24 = true;
|
||||
extraConfig = ''
|
||||
# unbind keys
|
||||
unbind-key C-b
|
||||
|
||||
# new prefix
|
||||
bind-key M-w send-prefix
|
||||
|
||||
# selection via vim keys
|
||||
bind-key -r h select-pane -L
|
||||
bind-key -r j select-pane -D
|
||||
bind-key -r k select-pane -U
|
||||
bind-key -r l select-pane -R
|
||||
|
||||
# resize aswell
|
||||
bind-key -r C-h resize-pane -L 5
|
||||
bind-key -r C-j resize-pane -D 5
|
||||
bind-key -r C-k resize-pane -U 5
|
||||
bind-key -r C-l resize-pane -R 5
|
||||
|
||||
bind-key g split-window
|
||||
bind-key v split-window -h
|
||||
'';
|
||||
};
|
||||
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
icons = "auto";
|
||||
git = true;
|
||||
extraOptions = [
|
||||
"--color-scale=all"
|
||||
"--color-scale-mode=gradient"
|
||||
"--group-directories-first"
|
||||
];
|
||||
};
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
interactiveShellInit = ''
|
||||
set -U fish_greeting
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
49
config/users/nil/default.nix
Normal file
49
config/users/nil/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ inputs, pkgs, ... }: {
|
||||
imports = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
users.users.nil = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.fish;
|
||||
ignoreShellProgramCheck = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo="
|
||||
];
|
||||
};
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.users.nil = {
|
||||
home.stateVersion = "24.11";
|
||||
|
||||
home.packages = with pkgs; [
|
||||
whois
|
||||
htop
|
||||
restic
|
||||
fend
|
||||
];
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
programs.bat.enable = true;
|
||||
programs.gpg.enable = true;
|
||||
programs.ripgrep.enable = true;
|
||||
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
icons = "auto";
|
||||
git = true;
|
||||
extraOptions = [
|
||||
"--color-scale=all"
|
||||
"--color-scale-mode=gradient"
|
||||
"--group-directories-first"
|
||||
];
|
||||
};
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
interactiveShellInit = ''
|
||||
set -U fish_greeting
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
353
flake.lock
353
flake.lock
|
|
@ -30,11 +30,11 @@
|
|||
"fromYaml": "fromYaml"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708890466,
|
||||
"narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=",
|
||||
"lastModified": 1732200724,
|
||||
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "665b3c6748534eb766c777298721cece9453fdae",
|
||||
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -78,11 +78,11 @@
|
|||
"base16-vim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1716150083,
|
||||
"narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
|
||||
"lastModified": 1731949548,
|
||||
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-vim",
|
||||
"rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
|
||||
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -156,11 +156,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731549112,
|
||||
"narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=",
|
||||
"lastModified": 1732742778,
|
||||
"narHash": "sha256-i+Uw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "5fd852c4155a689098095406500d0ae3d04654a8",
|
||||
"rev": "341482e2f4d888e3f60cae1c12c3df896e7230d8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -192,6 +192,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"eosyn": {
|
||||
"inputs": {
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732835047,
|
||||
"narHash": "sha256-O+JD5tKyCRtE+ZY5cpDQnepcyEP3xDxqSw4irJRxRgM=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "29adbc654463e677bc8bfbfa311c765584446bd8",
|
||||
"revCount": 1,
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/eosyn.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/eosyn.git"
|
||||
}
|
||||
},
|
||||
"fernglas": {
|
||||
"inputs": {
|
||||
"communities": "communities",
|
||||
|
|
@ -214,6 +234,24 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox": {
|
||||
"inputs": {
|
||||
"eosyn": "eosyn"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732835073,
|
||||
"narHash": "sha256-6pF35LT6oLTFTuwJ4ZxjePY+qHpC4BGcOExJeiUAlxY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "cf453c076add9ee34542a318fa7a7a865087921b",
|
||||
"revCount": 4,
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/firefox.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/mikael/firefox.git"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -263,11 +301,11 @@
|
|||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -363,11 +401,11 @@
|
|||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -395,6 +433,24 @@
|
|||
}
|
||||
},
|
||||
"flake-utils_4": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_5": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"stylix",
|
||||
|
|
@ -402,11 +458,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710146030,
|
||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -430,6 +486,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flakey-profile_2": {
|
||||
"locked": {
|
||||
"lastModified": 1712898590,
|
||||
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lf-",
|
||||
"repo": "flakey-profile",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"florp-about": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -477,11 +548,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731611636,
|
||||
"narHash": "sha256-Do8vpR8JTpkPr9vxf1aRzhb4/cUBjg5twPyGDyezxJw=",
|
||||
"lastModified": 1732211216,
|
||||
"narHash": "sha256-eXsk0hZ2sFAvQht9W6Xxej/8AHYCGzvATFLoY1xwG/o=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "32e1061cb2ef3cd0eab0bd99f062a2776a73d459",
|
||||
"revCount": 7,
|
||||
"rev": "81f0a4377c1218d328e7996636a02faf0597efa0",
|
||||
"revCount": 9,
|
||||
"type": "git",
|
||||
"url": "https://woof.rip/florp/moderation.git"
|
||||
},
|
||||
|
|
@ -493,11 +564,11 @@
|
|||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1689549921,
|
||||
"narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=",
|
||||
"lastModified": 1731966426,
|
||||
"narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "fromYaml",
|
||||
"rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84",
|
||||
"rev": "106af9e2f715e2d828df706c386a685698f3223b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -523,11 +594,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731363552,
|
||||
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
|
||||
"lastModified": 1732021966,
|
||||
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
|
||||
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -582,11 +653,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731604581,
|
||||
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
|
||||
"lastModified": 1732793095,
|
||||
"narHash": "sha256-6TrknJ8CpvSSF4gviQSeD+wyj3siRcMvdBKhOXkEMKU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
|
||||
"rev": "2f7739d01080feb4549524e8f6927669b61c6ee3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -601,7 +672,7 @@
|
|||
"lix"
|
||||
],
|
||||
"nix-eval-jobs": "nix-eval-jobs",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728215710,
|
||||
|
|
@ -671,58 +742,99 @@
|
|||
}
|
||||
},
|
||||
"lix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nix2container": "nix2container",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-regression": "nixpkgs-regression",
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723503926,
|
||||
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
|
||||
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
|
||||
"lastModified": 1732806742,
|
||||
"narHash": "sha256-2RNOVB3UIIxxjiFKrEqSgnSoHK+olbw2o5g/63dDjJ8=",
|
||||
"rev": "f5754dc90ae9b1207656d0e29ad2704d3ef1e554",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f5754dc90ae9b1207656d0e29ad2704d3ef1e554.tar.gz?rev=f5754dc90ae9b1207656d0e29ad2704d3ef1e554"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": "lix_2",
|
||||
"lix": [
|
||||
"firefox",
|
||||
"eosyn",
|
||||
"lix"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"firefox",
|
||||
"eosyn",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732603698,
|
||||
"narHash": "sha256-Jw2MhzgCCrKV2MJytehG0cCLIAosBX71p8qmQ6XQlR4=",
|
||||
"rev": "15b999f9c958c475f71fb8c543b9fc2f36ae8730",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/15b999f9c958c475f71fb8c543b9fc2f36ae8730.tar.gz?rev=15b999f9c958c475f71fb8c543b9fc2f36ae8730"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-module_2": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flakey-profile": "flakey-profile_2",
|
||||
"lix": "lix_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723510904,
|
||||
"narHash": "sha256-zNW/rqNJwhq2lYmQf19wJerRuNimjhxHKmzrWWFJYts=",
|
||||
"rev": "622a2253a071a1fb97a4d3c8103a91114acc1140",
|
||||
"lastModified": 1729360442,
|
||||
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
|
||||
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/622a2253a071a1fb97a4d3c8103a91114acc1140.tar.gz?rev=622a2253a071a1fb97a4d3c8103a91114acc1140"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix_2": {
|
||||
"flake": false,
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nix2container": "nix2container",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-regression": "nixpkgs-regression",
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723503926,
|
||||
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
|
||||
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
|
||||
"lastModified": 1729298361,
|
||||
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
|
||||
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz"
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729298361,
|
||||
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
|
||||
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
|
||||
}
|
||||
},
|
||||
"nix-darwin": {
|
||||
|
|
@ -733,11 +845,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731454423,
|
||||
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
|
||||
"lastModified": 1732603785,
|
||||
"narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
|
||||
"rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -835,11 +947,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1731403644,
|
||||
"narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
|
||||
"lastModified": 1732483221,
|
||||
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f6581f1c3b137086e42a08a906bdada63045f991",
|
||||
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -916,23 +1028,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1730602179,
|
||||
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
|
||||
"lastModified": 1732617236,
|
||||
"narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
|
||||
"rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "release-24.05",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1725001927,
|
||||
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
|
||||
|
|
@ -948,7 +1060,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1721931987,
|
||||
"narHash": "sha256-1Zg8LY0T5EfXtv0Kf4M6SFnjH7Eto4VV+EKJ/YSnhiI=",
|
||||
|
|
@ -964,13 +1076,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1731319897,
|
||||
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
|
||||
"lastModified": 1732521221,
|
||||
"narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
|
||||
"rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -997,11 +1109,11 @@
|
|||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731707185,
|
||||
"narHash": "sha256-IfA3x0eL4Be/7hvdvGSnT8fgiXz7GL3PtjGw3BH68gM=",
|
||||
"lastModified": 1732838896,
|
||||
"narHash": "sha256-9YfEyCU2wB/aSbtpZ+OHb++xS2Km970Ja33H13oEaWM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "be455f7f2714ce3479ae5bb662a03bd450f45793",
|
||||
"rev": "05331006a42846d6e55129b642485f45f90c9efc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1012,7 +1124,7 @@
|
|||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
|
|
@ -1020,11 +1132,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731347683,
|
||||
"narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=",
|
||||
"lastModified": 1731936508,
|
||||
"narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "135d202e032be70c93b6d7d53592ef4799d6efde",
|
||||
"rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1033,6 +1145,29 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"oth": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732215904,
|
||||
"narHash": "sha256-bXXoyQcVMULYOj1KlzbquUyMTyByzmLatIgm0ra/7sk=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "847cc8493f7f44bd5ada0283d6b96457f4ee5a9b",
|
||||
"revCount": 1,
|
||||
"type": "git",
|
||||
"url": "ssh://forgejo@woof.rip/emily/oth.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://forgejo@woof.rip/emily/oth.git"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1055,19 +1190,21 @@
|
|||
"disko": "disko",
|
||||
"dns": "dns",
|
||||
"fernglas": "fernglas",
|
||||
"flake-utils": "flake-utils",
|
||||
"firefox": "firefox",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"florp-about": "florp-about",
|
||||
"florp-branding": "florp-branding",
|
||||
"florp-moderation": "florp-moderation",
|
||||
"home-manager": "home-manager",
|
||||
"hydra": "hydra",
|
||||
"kyouma-www": "kyouma-www",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"lix": "lix_2",
|
||||
"lix-module": "lix-module_2",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-needsreboot": "nixos-needsreboot",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixvim": "nixvim",
|
||||
"oth": "oth",
|
||||
"sops-nix": "sops-nix",
|
||||
"stylix": "stylix"
|
||||
}
|
||||
|
|
@ -1076,15 +1213,14 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731364708,
|
||||
"narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=",
|
||||
"lastModified": 1732575825,
|
||||
"narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "4c91d52db103e757fc25b58998b0576ae702d659",
|
||||
"rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1100,7 +1236,7 @@
|
|||
"base16-helix": "base16-helix",
|
||||
"base16-vim": "base16-vim",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": [
|
||||
"home-manager"
|
||||
|
|
@ -1108,17 +1244,17 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": "systems_4",
|
||||
"systems": "systems_5",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-tmux": "tinted-tmux"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731657386,
|
||||
"narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=",
|
||||
"lastModified": 1732608183,
|
||||
"narHash": "sha256-T5k5ill+PNIEW6KuS4CpUacMtZNJe2J2q5eBOF4xWuU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f",
|
||||
"rev": "7689e621f87bce7b6ab1925dfd70ad1f4c80f334",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1187,6 +1323,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_5": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1224,11 +1375,11 @@
|
|||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696725902,
|
||||
"narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
|
||||
"lastModified": 1729501581,
|
||||
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
|
||||
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1267,11 +1418,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730321837,
|
||||
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
||||
"lastModified": 1732643199,
|
||||
"narHash": "sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
||||
"rev": "84637a7ab04179bdc42aa8fd0af1909fba76ad0c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
13
flake.nix
13
flake.nix
|
|
@ -21,6 +21,10 @@
|
|||
url = "github:wobcom/fernglas";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
};
|
||||
firefox = {
|
||||
url = "git+https://woof.rip/mikael/firefox.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
florp-about = {
|
||||
url = "git+https://woof.rip/florp/about.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -46,9 +50,9 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
};
|
||||
lix.url = "https://git.lix.systems/lix-project/lix/archive/2.91.0.tar.gz";
|
||||
lix.url = "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz";
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-needsreboot = {
|
||||
|
|
@ -60,6 +64,11 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
oth = {
|
||||
url = "git+ssh://forgejo@woof.rip/emily/oth.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
};
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }: {
|
||||
{ config, inputs, lib, pkgs, ... }: {
|
||||
config.home-manager.users.emily = lib.mkIf (config.kyouma.graphical.compositor == "hyprland") {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
|
|
@ -9,6 +9,8 @@
|
|||
notifysend = "${pkgs.libnotify}/bin/notify-send";
|
||||
dolphin = "${pkgs.libsForQt5.dolphin}/bin/dolphin";
|
||||
firefox = "${pkgs.firefox}/bin/firefox";
|
||||
# currently broken
|
||||
#firefox = "${inputs.firefox.packages.${pkgs.system}.firefox}/bin/firefox";
|
||||
brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";
|
||||
screenshot = "~/.local/bin/hypr/screenshot.sh";
|
||||
rofi = "${pkgs.rofi-wayland}/bin/rofi";
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ primary_region = 'ams'
|
|||
image = 'registry.fly.io/build-worker-kyoumanet:latest'
|
||||
|
||||
[processes]
|
||||
bw-00 = '/entrypoint.sh'
|
||||
bw-01 = '/entrypoint.sh'
|
||||
bw-02 = '/entrypoint.sh'
|
||||
bw-03 = '/entrypoint.sh'
|
||||
|
|
@ -14,28 +15,34 @@ primary_region = 'ams'
|
|||
bw-07 = '/entrypoint.sh'
|
||||
bw-08 = '/entrypoint.sh'
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw00'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-00']
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw01'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '128GB'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-01']
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw02'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '128GB'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-02']
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw03'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '128GB'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-03']
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw04'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '128GB'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-04']
|
||||
|
||||
[[mounts]]
|
||||
|
|
@ -62,6 +69,15 @@ primary_region = 'ams'
|
|||
initial_size = '256GB'
|
||||
processes = ['bw-08']
|
||||
|
||||
[[services]]
|
||||
protocol = 'tcp'
|
||||
internal_port = 2222
|
||||
auto_stop_machines = 'off'
|
||||
processes = ['bw-00']
|
||||
|
||||
[[services.ports]]
|
||||
port = 2200
|
||||
|
||||
[[services]]
|
||||
protocol = 'tcp'
|
||||
internal_port = 2222
|
||||
67
pkgs/build-worker-oci/cdg/fly.toml
Normal file
67
pkgs/build-worker-oci/cdg/fly.toml
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
# fly.toml app configuration file generated for build-worker-kyoumanet-cdg on 2024-11-21T00:31:54+01:00
|
||||
#
|
||||
# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
|
||||
#
|
||||
|
||||
app = 'build-worker-kyoumanet-cdg'
|
||||
primary_region = 'cdg'
|
||||
|
||||
[build]
|
||||
image = 'registry.fly.io/build-worker-kyoumanet:latest'
|
||||
|
||||
[processes]
|
||||
bw-09 = '/entrypoint.sh'
|
||||
bw-10 = '/entrypoint.sh'
|
||||
bw-11 = '/entrypoint.sh'
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw09'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-09']
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw10'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-10']
|
||||
|
||||
[[mounts]]
|
||||
source = 'bw11'
|
||||
destination = '/mnt/data'
|
||||
initial_size = '256GB'
|
||||
processes = ['bw-11']
|
||||
|
||||
[[services]]
|
||||
protocol = 'tcp'
|
||||
internal_port = 2222
|
||||
auto_stop_machines = 'off'
|
||||
processes = ['bw-09']
|
||||
|
||||
[[services.ports]]
|
||||
port = 2209
|
||||
|
||||
[[services]]
|
||||
protocol = 'tcp'
|
||||
internal_port = 2222
|
||||
auto_stop_machines = 'off'
|
||||
processes = ['bw-10']
|
||||
|
||||
[[services.ports]]
|
||||
port = 2210
|
||||
|
||||
[[services]]
|
||||
protocol = 'tcp'
|
||||
internal_port = 2222
|
||||
auto_stop_machines = 'off'
|
||||
processes = ['bw-11']
|
||||
|
||||
[[services.ports]]
|
||||
port = 2211
|
||||
|
||||
[[restart]]
|
||||
policy = 'never'
|
||||
|
||||
[[vm]]
|
||||
size = 'performance-16x'
|
||||
memory = '96GB'
|
||||
|
|
@ -1,11 +1,13 @@
|
|||
# I hate this so much aaa
|
||||
{
|
||||
lib,
|
||||
callPackage,
|
||||
dockerTools,
|
||||
openssh,
|
||||
bash,
|
||||
gnused,
|
||||
util-linux,
|
||||
qemu-user
|
||||
}:
|
||||
|
||||
dockerTools.buildLayeredImage {
|
||||
|
|
@ -20,11 +22,28 @@ dockerTools.buildLayeredImage {
|
|||
|
||||
enableFakechroot = true;
|
||||
|
||||
contents = [ openssh util-linux bash gnused ];
|
||||
contents = [ openssh util-linux bash gnused qemu-user ];
|
||||
|
||||
config.Cmd = [ "/entrypoint.sh" ];
|
||||
|
||||
fakeRootCommands = ''
|
||||
fakeRootCommands = let
|
||||
system-features = [
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
"nixos-test"
|
||||
"uid-range"
|
||||
"gccarch-x86-64"
|
||||
"gccarch-x86-64-v2"
|
||||
"gccarch-x86-64-v3"
|
||||
"gccarch-armv8-a"
|
||||
"gccarch-armv8.1-a"
|
||||
"gccarch-armv8.2-a"
|
||||
"gccarch-armv8.2-a+fp16+rcpc+dotprod"
|
||||
"gccarch-rv64imac"
|
||||
"gccarch-rv64imacfd"
|
||||
"gccarch-rv64gc"
|
||||
];
|
||||
in ''
|
||||
mkdir -p /root
|
||||
cat <<EOF > /root/nix.conf
|
||||
build-users-group = nixbld
|
||||
|
|
@ -36,7 +55,8 @@ dockerTools.buildLayeredImage {
|
|||
max-silent-time = 14400
|
||||
min-free = ${builtins.toString (49152 * 1024 * 1024)}
|
||||
max-free = ${builtins.toString (65536 * 1024 * 1024)}
|
||||
system-features = benchmark big-parallel kvm nixos-test uid-range gccarch-x86-64 gccarch-x86-64-v2 gccarch-x86-64-v3
|
||||
extra-platforms = aarch64-linux i686-linux riscv64-linux
|
||||
system-features = ${toString system-features}
|
||||
EOF
|
||||
|
||||
mkdir -p /root/.ssh
|
||||
|
|
@ -51,6 +71,9 @@ dockerTools.buildLayeredImage {
|
|||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOpyVefbZLkNVNzdSIlO6x6JohHE1snoHiUB3Qdvl5I2 aprl@idk
|
||||
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDVNo871p97NTefP52KYiwuch+FaVScxvcFd9fg0yykySTq7Y5JsxrJQgTnox/oDa0O87OyHD/GHQljAXkqiHpDkExbiGjDmGXJSKReKH061F4FqBnDIwYRzUu9Cxjl4MNqsU0RqLaz4+F42c/L7GROQwjEPUb8JHThRiI5FJnDvvB+oBLBxeyQA4v3O4i8DaDQayTr/XB+aSlhNwKrb6cjjL93AHT1uE53yY5jn4kZX+RiPQhH7rvt9N6E4Yr3CG6nUgRCUS0L66d9yfrq0XAbAVk9F+viV7Nk9qy4MWHtXZ4h0qUlzrGALPgGsCGiLGd4NvEgeCcV4nvxdmevxTSdKlJP75xlmlLVXGyhqCZkTsxm/png2UvDl+p0pLyrgNaNoXPdE0Jbv7C28WX36Nast1QFSMUhexzuOx8OgaOioeXVfK98AouqWb58iPBCvgreUIH/gJhZcnlB/Foo1KSO+fJNH8hAsLH7w0mnKyHhJjkrjjwUqsnpepB3SOLfZTE= aprl@meow
|
||||
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0v3tUBNEUxfoOQBFb+N2DUBQDay0iFggUWa9Nd+BtFLOKkz+RRto3eBF0ZiJZVUxv/hLb8m2s45hcMw8agwuPrXMe5085T1fzkvPdKAPZdsT/cCmBi1OsoLjAKBFIdM4lcV0A2cca8hip+/ZPpjFPUWx73/672gAPHU7co7fP8+8CSf9dx+WIeLx3yaYHYZ/th3dB5auX3VjOazS8MojsAorwTUeBoPamHQ5dFeNafhFUL/hhtGkUI1cNHUn3bJd2V7AKTW3UglK7hVgMJPrzVS31OlpcJEf6S5XgKTWdOSwubn1bs5Lt6YYRDU24NV6CGrwKgCJSRxzNMLwpnFKiSXpO8FzkqWHYWyju141hQcFF31aZIV+7YcwEt5ZukLjFOpVtpbSXvJYigOUzGi34P3/OAGshDXjTQjvM8GIir49gx3b2Nwhg0z4UHBkAKZvDDFPHDMJoclvnhITojaAojfC9zmMCO5ZaEsk8yv7c/lWQumzRpfldWF4mwHvhD5kTADbhRdO7WTdX7AaiAYINooToeWKjFe2wn3rFubPUppptqtP03mmvs7vhhgnEVBbGZRJK3GTVk1XcsfF9rDKzewSa+wb4LsBoZtFRhc8cJqHGlKWSNk7dQ04B1atPyNLKGpGoo/UIPxyZ6bSqFVxY3nhz46VZ6z8XWI48z0/fRQ== aprl@uwu
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAAl3/krXJeCcDEJXRuzOdCOrJLG7b6MRqC+a9Xux3mW vika@hydrangea
|
||||
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHQjTy9qqHcs5vgTz+iMAiNNMqdyGtOhEpnpJCReEFfZ vika@rafflesia
|
||||
sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINAgFdk78I4zssUGsAIV01zefLBpwc1W7hfTobbG80XLAAAABHNzaDo= vika@nitrokey
|
||||
EOF
|
||||
|
||||
cat <<EOF > /root/.ssh/environment
|
||||
|
|
@ -91,7 +114,9 @@ dockerTools.buildLayeredImage {
|
|||
mkdir -p /var/empty
|
||||
mkdir -p /var/log
|
||||
|
||||
cp ${./entrypoint.sh} /entrypoint.sh
|
||||
substitute ${./entrypoint.sh} /entrypoint.sh \
|
||||
--subst-var-by qemu-aarch64 ${lib.getExe' qemu-user "qemu-aarch64"} \
|
||||
--subst-var-by qemu-riscv64 ${lib.getExe' qemu-user "qemu-riscv64"}
|
||||
chmod +x /entrypoint.sh
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,4 +26,14 @@ cp /root/nix.conf /etc/nix/nix.conf
|
|||
/bin/mount -t overlay overlay -o lowerdir=/nix,upperdir=/mnt/data/nix-store,workdir=/mnt/data/workdir /nix
|
||||
/bin/mount --bind /mnt/data/tmp /tmp
|
||||
|
||||
# Register QEMU binaries for user mode emulation
|
||||
aarch64_magic='\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00'
|
||||
aarch64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
|
||||
|
||||
riscv64_magic='\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00'
|
||||
riscv64_mask='\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff'
|
||||
|
||||
echo ":qemu-aarch64:M::$aarch64_magic:$aarch64_mask:@qemu-aarch64@:POCF" >/proc/sys/fs/binfmt_misc/register
|
||||
echo ":qemu-riscv64:M::$riscv64_magic:$riscv64_mask:@qemu-riscv64@:POCF" >/proc/sys/fs/binfmt_misc/register
|
||||
|
||||
/root/.nix-profile/bin/sshd -D -f /root/sshd_config
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
dockerTools.pullImage {
|
||||
imageName = "nixos/nix";
|
||||
imageDigest = "sha256:fd7a5c67d396fe6bddeb9c10779d97541ab3a1b2a9d744df3754a99add4046f1";
|
||||
sha256 = "1ggkwd9zw8lj97ig7zah7dqy463hfhsgq3iwxxf8117gf8xi422s";
|
||||
imageDigest = "sha256:133a1607deea14a02c2bc0850e275ed135814235a1147f68967afee261caea2b";
|
||||
sha256 = "0602a59g14l1jiqfffz14hcp982qaqczi5f0ylvv0h9pp2pqrqs5";
|
||||
finalImageName = "nixos/nix";
|
||||
finalImageTag = "latest";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,11 @@ final: prev: {
|
|||
nyastodon = final.callPackage ./nyastodon/default.nix {};
|
||||
upgrade-system = final.callPackage ./upgrade-system/default.nix {};
|
||||
update-nixfiles = final.callPackage ./update-nixfiles/default.nix {};
|
||||
build-worker-oci = final.callPackage ./build-worker-oci/default.nix {};
|
||||
build-worker-oci = final.callPackage ./build-worker-oci/default.nix {
|
||||
qemu-user = final.pkgsStatic.qemu-user.override {
|
||||
hostCpuTargets = [ "aarch64-linux-user" "riscv64-linux-user" ];
|
||||
};
|
||||
};
|
||||
librespeed-rust = final.callPackage ./librespeed-rust/default.nix {};
|
||||
librespeed-go = final.callPackage ./librespeed-go/default.nix {};
|
||||
akkoma-fe-domi = final.callPackage ./akkoma-fe-domi/default.nix {};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,9 @@ merge_theirs () {
|
|||
test_build () {
|
||||
local build_jobs
|
||||
|
||||
build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
|
||||
sleep 30
|
||||
|
||||
build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/evals" | jq -r ".evals | max_by(.id) | .builds | .[]")"
|
||||
for build in ${build_jobs}; do
|
||||
local build_status
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue