vinzenz/nixos-configuration
vinzenz/nixos-configuration
Watch
0
1
Fork
You've already forked nixos-configuration
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

remove containers now managed by hyperhive

Browse source
This commit is contained in:
müde 2026-06-22 12:41:34 +02:00
commit 38f7f200a5
6 changed files with 25 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

8
devices.nix
View file

@ -13,14 +13,6 @@ in
system = "aarch64-linux"; system = "aarch64-linux";
nixosSystem = nixos-raspberrypi.lib.nixosInstaller; nixosSystem = nixos-raspberrypi.lib.nixosInstaller;
}; };
damocles = {
system = "x86_64-linux";
distributedBuilds.maxJobs = 0;
};
damocles-lab = {
system = "x86_64-linux";
distributedBuilds.maxJobs = 0;
};
epimetheus = { epimetheus = {
system = "aarch64-linux"; system = "aarch64-linux";
}; };

16
nixosConfigurations/damocles-lab/default.nix
View file

@ -1,16 +0,0 @@
{ pkgs, ... }:
{
imports = [ ../damocles/claude-container.nix ];
services.openssh = {
enable = true;
ports = [ 2222 ];
# Path written into sshd_config as a string — not read at eval time.
# Key can be rotated without a rebuild.
authorizedKeysFiles = [ "/persist/damocles-ssh/id_ed25519.pub" ];
};
environment.systemPackages = with pkgs; [
];
}

43
nixosConfigurations/damocles/android-dev.nix
View file

@ -1,43 +0,0 @@
{ pkgs, ... }:
let
androidComposition = pkgs.androidenv.composeAndroidPackages {
buildToolsVersions = [ "36.1.0" ];
platformVersions = [ "35" ];
includeNDK = false;
includeEmulator = false;
includeSystemImages = false;
};
androidSdk = androidComposition.androidsdk;
in
{
nixpkgs.config.android_sdk.accept_license = true;
my.allowedUnfreePackages = [
"android-sdk-cmdline-tools"
"android-sdk-platform-tools"
"android-sdk-tools"
"android-sdk-build-tools"
"android-sdk-platforms"
# wtf
"platform-tools"
"tools"
"build-tools"
"cmdline-tools"
"platforms"
"cmake" # android sdk repackage
];
environment.systemPackages = with pkgs; [
androidSdk
gradle
kotlin
jdk21
];
environment.variables = {
ANDROID_HOME = "${androidSdk}/libexec/android-sdk";
ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk";
JAVA_HOME = "${pkgs.jdk21}";
};
}

47
nixosConfigurations/damocles/claude-container.nix
View file

@ -1,47 +0,0 @@
{
pkgs,
lib,
...
}:
{
my = {
allowedUnfreePackages = [ "claude-code" ];
overlays.unstable.enable = true;
};
environment.systemPackages = with pkgs; [
unstable.claude-code
git
python3
coreutils-full
gawk
gnugrep
curl
bintools
file
];
boot.isContainer = true;
programs.nix-ld = {
enable = true;
libraries = with pkgs; [
stdenv.cc.cc.lib
zlib
];
};
# Container shares host network namespace (privateNetwork = false), so the
# host's tailscale already covers this. Running a second tailscaled in the
# same netns fights over routing and breaks connectivity after sleep/wake.
services.tailscale.enable = lib.mkForce false;
networking.firewall.checkReversePath = lib.mkForce "strict";
users.users.muede = {
isNormalUser = true;
extraGroups = [ "wheel" ];
};
security.sudo.wheelNeedsPassword = false;
}

15
nixosConfigurations/damocles/default.nix
View file

@ -1,15 +0,0 @@
{ pkgs, ... }:
{
imports = [
./android-dev.nix
./claude-container.nix
];
environment.systemPackages = with pkgs; [
cargo
rustc
clippy
gh
buildPackages.stdenv.cc
];
}

73
nixosConfigurations/muede-lpt2/containers.nix
View file

@ -4,54 +4,31 @@
boot.enableContainers = true; boot.enableContainers = true;
virtualisation.containers.enable = true; virtualisation.containers.enable = true;
containers.damocles = { # containers.damocles = {
autoStart = false; # autoStart = false;
privateNetwork = false; # privateNetwork = false;
path = self.nixosConfigurations.damocles.config.system.build.toplevel; # path = self.nixosConfigurations.damocles.config.system.build.toplevel;
bindMounts."/etc/nix/distributed-build-key" = { # bindMounts."/etc/nix/distributed-build-key" = {
hostPath = "/etc/nix/distributed-build-key"; # hostPath = "/etc/nix/distributed-build-key";
isReadOnly = true; # isReadOnly = true;
}; # };
bindMounts."/persist/damocles-ssh" = { # bindMounts."/persist/damocles-ssh" = {
hostPath = "/persist/damocles-ssh"; # hostPath = "/persist/damocles-ssh";
isReadOnly = true; # isReadOnly = true;
}; # };
bindMounts."/persist/damocles-lab" = { # bindMounts."/persist/damocles-lab" = {
hostPath = "/persist/damocles-lab"; # hostPath = "/persist/damocles-lab";
isReadOnly = false; # isReadOnly = false;
}; # };
}; # };
containers.damocles-lab = { # # Global DefaultTimeoutStopSec is 10s (modern-desktop.nix), which kills systemd-nspawn
autoStart = false; # # before it finishes halting, leaving cgroups busy and breaking restarts.
privateNetwork = false; # systemd.services."container@damocles".serviceConfig = {
path = self.nixosConfigurations.damocles-lab.config.system.build.toplevel; # TimeoutStopSec = "60s";
bindMounts."/etc/nix/distributed-build-key" = { # # After a SIGKILL of nspawn, the kernel needs a moment to reap its cgroups.
hostPath = "/etc/nix/distributed-build-key"; # # Without this, the immediate restart attempt fails with "Device or resource busy".
isReadOnly = true; # RestartSec = "5s";
}; # };
bindMounts."/workspace" = {
hostPath = "/persist/damocles-lab";
isReadOnly = false;
};
bindMounts."/persist/damocles-ssh" = {
hostPath = "/persist/damocles-ssh";
isReadOnly = true;
};
};
# Global DefaultTimeoutStopSec is 10s (modern-desktop.nix), which kills systemd-nspawn
# before it finishes halting, leaving cgroups busy and breaking restarts.
systemd.services."container@damocles".serviceConfig = {
TimeoutStopSec = "60s";
# After a SIGKILL of nspawn, the kernel needs a moment to reap its cgroups.
# Without this, the immediate restart attempt fails with "Device or resource busy".
RestartSec = "5s";
};
systemd.services."container@damocles-lab".serviceConfig = {
TimeoutStopSec = "60s";
RestartSec = "5s";
};
}; };
} }