Compare commits
12 Commits
38fabc348c
...
feat/remot
| Author | SHA1 | Date | |
|---|---|---|---|
| db2d540b3c | |||
| 5aca97e057 | |||
| a51e095717 | |||
| 9ebbb1c0c6 | |||
| 7f11da1878 | |||
| 29cc20bb04 | |||
| 1617ac9149 | |||
| 24f15c98cd | |||
| bdd6d03739 | |||
| a0a6663793 | |||
| b66ffadb79 | |||
| db2bd1d157 |
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,6 +1,3 @@
|
|||||||
[submodule "assets/compose"]
|
[submodule "assets/compose"]
|
||||||
path = assets/compose
|
path = assets/compose
|
||||||
url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
|
url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
|
||||||
[submodule "assets/dotfiles"]
|
|
||||||
path = assets/dotfiles
|
|
||||||
url = ssh://git@code.lazyworkhorse.net:2222/gortium/dotfiles.git
|
|
||||||
|
|||||||
Submodule assets/compose updated: 3c92d93366...d3f2e3b7b9
1
assets/dotfiles
Submodule
1
assets/dotfiles
Submodule
Submodule assets/dotfiles added at 504daea61e
106
assets/ollama/Dockerfile
Normal file
106
assets/ollama/Dockerfile
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
# ollama-gfx906/Dockerfile
|
||||||
|
#
|
||||||
|
# Custom ollama image with ROCm 6.1 + gfx906 (MI50) support.
|
||||||
|
# The official ollama/rocm image ships ROCm 7.2 which dropped gfx906.
|
||||||
|
# This uses v0.23.2's native CMake build system with AMDGPU_TARGETS including gfx906.
|
||||||
|
#
|
||||||
|
# Build: docker build -t ollama/ollama:rocm-gfx906 ai/ollama
|
||||||
|
|
||||||
|
FROM rocm/dev-ubuntu-22.04:6.1.2-complete AS builder
|
||||||
|
|
||||||
|
# Build dependencies (CMake, Ninja, Go)
|
||||||
|
ARG CMAKEVERSION=3.31.2
|
||||||
|
ARG NINJAVERSION=1.12.1
|
||||||
|
ARG GOLANG_VERSION=1.22.0
|
||||||
|
|
||||||
|
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||||
|
curl git ccache build-essential pkg-config unzip \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Install CMake from official binaries
|
||||||
|
RUN curl -fsSL https://github.com/Kitware/CMake/releases/download/v${CMAKEVERSION}/cmake-${CMAKEVERSION}-linux-x86_64.tar.gz \
|
||||||
|
| tar xz -C /usr/local --strip-components 1
|
||||||
|
|
||||||
|
# Install Ninja
|
||||||
|
RUN curl -fsSL -o /tmp/ninja.zip \
|
||||||
|
https://github.com/ninja-build/ninja/releases/download/v${NINJAVERSION}/ninja-linux.zip \
|
||||||
|
&& unzip /tmp/ninja.zip -d /usr/local/bin && rm /tmp/ninja.zip
|
||||||
|
|
||||||
|
# Install Go
|
||||||
|
RUN curl -fsSL https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz \
|
||||||
|
| tar xz -C /usr/local
|
||||||
|
ENV PATH=/usr/local/go/bin:$PATH
|
||||||
|
|
||||||
|
ARG OLLAMA_VERSION=v0.23.2
|
||||||
|
RUN git clone --depth 1 --branch ${OLLAMA_VERSION} https://github.com/ollama/ollama.git /build
|
||||||
|
WORKDIR /build
|
||||||
|
|
||||||
|
# ROCm paths
|
||||||
|
ENV HIP_PATH=/opt/rocm
|
||||||
|
ENV ROCM_PATH=/opt/rocm
|
||||||
|
ENV CMAKE_GENERATOR=Ninja
|
||||||
|
ENV LDFLAGS=-s
|
||||||
|
|
||||||
|
# Step 1: Build CPU backends with GCC (no ROCm preset)
|
||||||
|
# Pre-set CMAKE_HIP_COMPILER="" to prevent check_language(HIP) from
|
||||||
|
# finding a HIP compiler (it searches /opt/rocm even without PATH).
|
||||||
|
# Remove /opt/rocm from PATH to prevent find_program from finding hipcc.
|
||||||
|
RUN mkdir -p build-cpu && \
|
||||||
|
PATH=/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
|
||||||
|
cmake -B build-cpu -DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_HIP_COMPILER="" \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=/build/dist && \
|
||||||
|
cmake --build build-cpu --target ggml-cpu -- -l $(nproc) && \
|
||||||
|
cmake --install build-cpu --component CPU --strip && \
|
||||||
|
echo "=== CPU install ===" && \
|
||||||
|
(find /build/dist/lib/ollama -type f -o -type l 2>&1 | head -20 || echo "empty")
|
||||||
|
|
||||||
|
# Step 2: Build HIP backend with ROCm preset + gfx906 target only
|
||||||
|
# The ROCm 6 preset enables HIP language detection (enable_language(HIP))
|
||||||
|
# which ensures GPU kernels are properly compiled for gfx906.
|
||||||
|
# OLLAMA_RUNNER_DIR=rocm from the preset, so HIP goes to lib/ollama/rocm/
|
||||||
|
# Need CMAKE_PREFIX_PATH so find_package(hip) finds hip-config.cmake
|
||||||
|
# at /opt/rocm/lib/cmake/hip/hip-config.cmake.
|
||||||
|
RUN mkdir -p build-hip && \
|
||||||
|
cmake -B build-hip \
|
||||||
|
--preset 'ROCm 6' \
|
||||||
|
-DAMDGPU_TARGETS="gfx906:xnack-" \
|
||||||
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_PREFIX_PATH="/opt/rocm" && \
|
||||||
|
cmake --build build-hip --target ggml-hip -- -l $(nproc) && \
|
||||||
|
cmake --install build-hip --component HIP --strip && \
|
||||||
|
echo "=== HIP install ===" && \
|
||||||
|
find /build/dist/lib/ollama -type f -o -type l | head -20
|
||||||
|
|
||||||
|
# Step 3: Build Go binary (GCC for CGo linking)
|
||||||
|
ENV CGO_ENABLED=1
|
||||||
|
RUN go build -trimpath -ldflags="-X=github.com/ollama/ollama/version.Version=${OLLAMA_VERSION}" -o /build/dist/ollama .
|
||||||
|
|
||||||
|
# ---------- Runtime image ----------
|
||||||
|
FROM ubuntu:24.04
|
||||||
|
|
||||||
|
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||||
|
ca-certificates curl libstdc++6 libgomp1 libvulkan1 libopenblas0 \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Copy ROCm 6.1 runtime libraries
|
||||||
|
# These are needed at runtime by ggml-hip via LD_LIBRARY_PATH
|
||||||
|
COPY --from=builder /opt/rocm/lib/ /opt/rocm/lib/
|
||||||
|
COPY --from=builder /opt/rocm/share/ /opt/rocm/share/
|
||||||
|
|
||||||
|
# Copy ollama binary + all backends (CPU + HIP)
|
||||||
|
# CPU install: /build/dist/lib/ollama/libggml-*.so
|
||||||
|
# HIP install: /build/dist/lib/ollama/rocm/libggml-hip.so
|
||||||
|
COPY --from=builder /build/dist/ollama /usr/bin/ollama
|
||||||
|
COPY --from=builder /build/dist/lib/ollama/ /usr/lib/ollama/
|
||||||
|
|
||||||
|
RUN ldconfig
|
||||||
|
|
||||||
|
ENV LD_LIBRARY_PATH=/opt/rocm/lib:/usr/lib/ollama/rocm:/usr/lib/ollama
|
||||||
|
ENV HSA_OVERRIDE_GFX_VERSION=9.0.6
|
||||||
|
ENV HCC_AMDGPU_TARGET=gfx906
|
||||||
|
ENV HSA_ENABLE_SDMA=0
|
||||||
|
|
||||||
|
EXPOSE 11434
|
||||||
|
ENTRYPOINT ["/bin/ollama"]
|
||||||
|
CMD ["serve"]
|
||||||
126
flake.lock
generated
126
flake.lock
generated
@@ -23,22 +23,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"argononed": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1729566243,
|
|
||||||
"narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
|
|
||||||
"owner": "nvmd",
|
|
||||||
"repo": "argononed",
|
|
||||||
"rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nvmd",
|
|
||||||
"repo": "argononed",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -53,21 +37,6 @@
|
|||||||
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1767039857,
|
|
||||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -175,80 +144,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-images": {
|
|
||||||
"inputs": {
|
|
||||||
"nixos-stable": [
|
|
||||||
"nixos-raspberrypi",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixos-unstable": [
|
|
||||||
"nixos-raspberrypi",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1747747741,
|
|
||||||
"narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
|
|
||||||
"owner": "nvmd",
|
|
||||||
"repo": "nixos-images",
|
|
||||||
"rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nvmd",
|
|
||||||
"ref": "sdimage-installer",
|
|
||||||
"repo": "nixos-images",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos-raspberrypi": {
|
|
||||||
"inputs": {
|
|
||||||
"argononed": "argononed",
|
|
||||||
"flake-compat": "flake-compat_2",
|
|
||||||
"nixos-images": "nixos-images",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs-uconsole"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1781324200,
|
|
||||||
"narHash": "sha256-JWqxN2Yle86+4Q+GFh12SvB92ZyLeqalVsN9lfMh6eQ=",
|
|
||||||
"owner": "gortium",
|
|
||||||
"repo": "nixos-raspberrypi",
|
|
||||||
"rev": "721a6e9e67dca3a23133db650b87018646bca3e6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "gortium",
|
|
||||||
"ref": "cm5-cross-v1",
|
|
||||||
"repo": "nixos-raspberrypi",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixos-uconsole": {
|
|
||||||
"inputs": {
|
|
||||||
"nixos-raspberrypi": [
|
|
||||||
"nixos-raspberrypi"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs-uconsole"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1781476310,
|
|
||||||
"narHash": "sha256-jY6ujqLXNAWJGvt+pAuw1Wg/OiHRGd1B1Z7Czhiq7Q4=",
|
|
||||||
"owner": "gortium",
|
|
||||||
"repo": "nixos-uconsole",
|
|
||||||
"rev": "38a7fcbffbf2d2e122bc1e1c634fe25f66ecda13",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "gortium",
|
|
||||||
"ref": "pr/dcs-panel-detection",
|
|
||||||
"repo": "nixos-uconsole",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705033721,
|
"lastModified": 1705033721,
|
||||||
@@ -281,22 +176,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-uconsole": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1780952837,
|
|
||||||
"narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-25.11",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774386573,
|
"lastModified": 1774386573,
|
||||||
@@ -333,10 +212,7 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixos-raspberrypi": "nixos-raspberrypi",
|
"nixpkgs": "nixpkgs_2"
|
||||||
"nixos-uconsole": "nixos-uconsole",
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"nixpkgs-uconsole": "nixpkgs-uconsole"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
|||||||
139
flake.nix
139
flake.nix
@@ -12,21 +12,18 @@
|
|||||||
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
|
|
||||||
nixos-uconsole = {
|
nixos-uconsole = {
|
||||||
url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
|
url = "github:nixos-uconsole/nixos-uconsole";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
|
|
||||||
};
|
};
|
||||||
nixos-raspberrypi = {
|
nixos-raspberrypi = {
|
||||||
url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
|
url = "github:nvmd/nixos-raspberrypi/v1.20260517.0";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
self.submodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, agenix, lix
|
outputs = { self, nixpkgs, agenix, lix, nixos-uconsole, nixos-raspberrypi, ... }@inputs:
|
||||||
, nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
|
|
||||||
, ... }@inputs:
|
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
keys = import ./lib/keys.nix;
|
keys = import ./lib/keys.nix;
|
||||||
@@ -37,16 +34,20 @@
|
|||||||
"/etc/ssh/ssh_host_ed25519_key"
|
"/etc/ssh/ssh_host_ed25519_key"
|
||||||
"/root/.age/bootstrap.key" ];
|
"/root/.age/bootstrap.key" ];
|
||||||
};
|
};
|
||||||
overlays = [ agenix.overlays.default ];
|
overlays = [ agenix.overlays.default (import ./overlays/reticulum.nix) ];
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system overlays;
|
inherit system overlays;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
config.permittedInsecurePackages = [
|
||||||
|
"openclaw-2026.3.12"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
devShell = import ./shells/nix_dev.nix {
|
devShell = import ./shells/nix_dev.nix {
|
||||||
inherit pkgs system agenix;
|
inherit pkgs system agenix;
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit system self keys paths inputs; };
|
specialArgs = { inherit system self keys paths inputs; };
|
||||||
@@ -55,7 +56,9 @@
|
|||||||
nixpkgs.overlays = overlays;
|
nixpkgs.overlays = overlays;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.rocmSupport = true;
|
nixpkgs.config.rocmSupport = true;
|
||||||
nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
|
"openclaw-2026.3.12"
|
||||||
|
];
|
||||||
nix.package = lix.packages.${system}.default;
|
nix.package = lix.packages.${system}.default;
|
||||||
}
|
}
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
@@ -66,9 +69,11 @@
|
|||||||
./modules/nixos/services/open_code_server.nix
|
./modules/nixos/services/open_code_server.nix
|
||||||
./modules/nixos/services/ollama_init_custom_models.nix
|
./modules/nixos/services/ollama_init_custom_models.nix
|
||||||
./modules/nixos/services/openclaw_node.nix
|
./modules/nixos/services/openclaw_node.nix
|
||||||
|
./modules/nixos/services/remote-builder.nix
|
||||||
./modules/nixos/security/ai-worker-restricted.nix
|
./modules/nixos/security/ai-worker-restricted.nix
|
||||||
./users/gortium.nix
|
./users/gortium.nix
|
||||||
./users/ai-worker.nix
|
./users/ai-worker.nix
|
||||||
|
./users/builder.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -86,114 +91,22 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
|
uConsole = nixos-raspberrypi.lib.nixosSystem {
|
||||||
system = "aarch64-linux";
|
specialArgs = { inherit self keys paths inputs nixos-raspberrypi; };
|
||||||
specialArgs = {
|
|
||||||
inherit self keys paths inputs;
|
|
||||||
nixos-raspberrypi = nixos-raspberrypi;
|
|
||||||
isCM4 = false;
|
|
||||||
};
|
|
||||||
modules = [
|
modules = [
|
||||||
{
|
{
|
||||||
nixpkgs.buildPlatform = "x86_64-linux";
|
nixpkgs.overlays = overlays;
|
||||||
nixpkgs.hostPlatform = "aarch64-linux";
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
boot.loader.raspberry-pi.bootloader = "kernel";
|
|
||||||
# Kill camera packages — not needed on uConsole, break cross-compile
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
# Make camera packages "unavailable" so no pkgs depend on them
|
|
||||||
(final: prev: {
|
|
||||||
libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
|
|
||||||
libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
|
|
||||||
libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
|
|
||||||
# Pipewire in nixos-25.11 has libcamera unconditionally in buildInputs;
|
|
||||||
# meta.platforms trick doesn't help — must actually remove it
|
|
||||||
pipewire = prev.pipewire.overrideAttrs (old: {
|
|
||||||
buildInputs = builtins.filter
|
|
||||||
(x: !(x?pname && x.pname == "libcamera"))
|
|
||||||
(old.buildInputs or []);
|
|
||||||
mesonFlags = builtins.filter
|
|
||||||
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
|
|
||||||
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
|
|
||||||
});
|
|
||||||
# gjs cross-compile fails without GTK; skip intro tests
|
|
||||||
gjs = prev.gjs.overrideAttrs (old: {
|
|
||||||
mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ];
|
|
||||||
});
|
|
||||||
# Qt6Quick missing from aarch64 qtdeclarative cross-compile;
|
|
||||||
# skip qtutils runtime deps — Hyprland only needs it for QML UI
|
|
||||||
hyprland = prev.hyprland.override { wrapRuntimeDeps = false; };
|
|
||||||
# hyprwayland-scanner not found by cross pkg-config wrapper
|
|
||||||
xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (old: {
|
|
||||||
preConfigure = (old.preConfigure or "") + ''
|
|
||||||
# Point cmake to the correct hyprwayland-scanner pkgconfig
|
|
||||||
cmakeFlags="$cmakeFlags -Dhyprwayland-scanner_DIR=${prev.buildPackages.hyprwayland-scanner}/lib/cmake/hyprwayland-scanner" 2>/dev/null || true
|
|
||||||
export PKG_CONFIG_PATH="${prev.buildPackages.hyprwayland-scanner}/lib/pkgconfig:$PKG_CONFIG_PATH"
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
|
||||||
# Disable libcamera in rpi pipewire too (separate nixpkgs instance)
|
|
||||||
({ config, lib, pkgs, ... }: {
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(final: prev: {
|
|
||||||
pipewire = prev.pipewire.overrideAttrs (old: {
|
|
||||||
buildInputs = builtins.filter
|
|
||||||
(x: !(x?pname && x.pname == "libcamera"))
|
|
||||||
(old.buildInputs or []);
|
|
||||||
mesonFlags = builtins.filter
|
|
||||||
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
|
|
||||||
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
|
|
||||||
});
|
|
||||||
})
|
|
||||||
];
|
|
||||||
})
|
|
||||||
|
|
||||||
# Patches are now in gortium/nixos-uconsole fork (pr/dcs-panel-detection branch)
|
|
||||||
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
|
||||||
nixos-raspberrypi.lib.inject-overlays
|
|
||||||
nixos-raspberrypi.lib.inject-overlays-global
|
|
||||||
nixos-uconsole.nixosModules.uconsole-cm5
|
|
||||||
({ config, lib, pkgs, inputs, ... }: let
|
|
||||||
lix-cross = import inputs.nixpkgs-uconsole {
|
|
||||||
localSystem = { system = "x86_64-linux"; };
|
|
||||||
crossSystem = { system = "aarch64-linux"; };
|
|
||||||
overlays = [ inputs.lix.overlays.default ];
|
|
||||||
};
|
|
||||||
in { nix.package = lix-cross.lix; })
|
|
||||||
agenix.nixosModules.default
|
|
||||||
./hosts/uconsole-cm5/configuration.nix
|
|
||||||
./hosts/uconsole-cm5/hardware-configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
devShells.${system}.default = devShell;
|
|
||||||
|
|
||||||
packages.${system} = {
|
|
||||||
uconsole-cm5-image = (nixos-raspberrypi.lib.nixosSystem {
|
|
||||||
system = "aarch64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit self keys inputs;
|
|
||||||
nixos-raspberrypi = nixos-raspberrypi;
|
|
||||||
isCM4 = false;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
{
|
|
||||||
nixpkgs.buildPlatform = system;
|
|
||||||
nixpkgs.hostPlatform = "aarch64-linux";
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
|
nix.package = lix.packages."aarch64-linux".default;
|
||||||
}
|
}
|
||||||
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
|
||||||
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
||||||
nixos-raspberrypi.lib.inject-overlays-global
|
|
||||||
nixos-raspberrypi.nixosModules.sd-image
|
|
||||||
nixos-uconsole.nixosModules.uconsole-cm5
|
nixos-uconsole.nixosModules.uconsole-cm5
|
||||||
agenix.nixosModules.default
|
./hosts/uConsole/configuration.nix
|
||||||
./hosts/uconsole-cm5/configuration.nix
|
./hosts/uConsole/hardware-configuration.nix
|
||||||
];
|
];
|
||||||
}).config.system.build.sdImage;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
devShells.${system}.default = devShell;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,12 @@
|
|||||||
hoardingcow-mount.enable = true;
|
hoardingcow-mount.enable = true;
|
||||||
|
|
||||||
# Flakesss
|
# Flakesss
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" "ca-derivations" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
||||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||||
|
nix.settings.extra-platforms = [ "aarch64-linux" ];
|
||||||
|
|
||||||
|
# QEMU binfmt for cross-building aarch64 NixOS targets
|
||||||
|
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||||
|
|
||||||
# Garbage collection
|
# Garbage collection
|
||||||
nix.gc = {
|
nix.gc = {
|
||||||
@@ -569,5 +573,23 @@
|
|||||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||||
system.stateVersion = "25.05"; # Did you read the comment?
|
system.stateVersion = "25.05"; # Did you read the comment?
|
||||||
|
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Remote builder — dispatches aarch64-linux builds to uConsole
|
||||||
|
# ============================================================
|
||||||
|
services.remoteBuilder = {
|
||||||
|
enable = true;
|
||||||
|
machines = [
|
||||||
|
{
|
||||||
|
hostName = "192.168.1.120";
|
||||||
|
port = 22;
|
||||||
|
sshUser = "builder";
|
||||||
|
sshKey = "/etc/ssh/builder_key";
|
||||||
|
systems = [ "aarch64-linux" ];
|
||||||
|
maxJobs = 4;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
171
hosts/uConsole/configuration.nix
Normal file
171
hosts/uConsole/configuration.nix
Normal file
@@ -0,0 +1,171 @@
|
|||||||
|
{ config, lib, pkgs, paths, self, keys, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# Basic Host Info
|
||||||
|
networking.hostName = "uConsole";
|
||||||
|
time.timeZone = "America/Montreal";
|
||||||
|
i18n.defaultLocale = "en_CA.UTF-8";
|
||||||
|
|
||||||
|
# System State
|
||||||
|
system.stateVersion = "25.05";
|
||||||
|
|
||||||
|
# Boot & Hardware (migrated to kernel bootloader per nixos-raspberrypi deprecation notice)
|
||||||
|
boot.loader.raspberry-pi.bootloader = "kernel";
|
||||||
|
# kernel managed by nixos-raspberrypi module — don't override, patches are version-specific
|
||||||
|
# boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
|
||||||
|
# Networking
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
services.openssh = {
|
||||||
|
enable = true;
|
||||||
|
settings.PermitRootLogin = lib.mkForce "prohibit-password";
|
||||||
|
settings.PasswordAuthentication = lib.mkForce false;
|
||||||
|
};
|
||||||
|
|
||||||
|
# User
|
||||||
|
users.users.gortium = {
|
||||||
|
isNormalUser = true;
|
||||||
|
extraGroups = [ "wheel" "networkmanager" "video" "dialout" "kismet" ];
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
keys.users.gortium.main
|
||||||
|
keys.users.gortium.gitea
|
||||||
|
];
|
||||||
|
};
|
||||||
|
security.sudo.extraRules = [
|
||||||
|
{
|
||||||
|
users = [ "gortium" ];
|
||||||
|
commands = [
|
||||||
|
{
|
||||||
|
command = "ALL";
|
||||||
|
options = [ "NOPASSWD" ];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Package groups
|
||||||
|
# ============================================================
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# ===== Base =====
|
||||||
|
emacs-pgtk
|
||||||
|
git
|
||||||
|
ripgrep
|
||||||
|
fd
|
||||||
|
htop
|
||||||
|
tmux
|
||||||
|
neovim
|
||||||
|
|
||||||
|
# ===== HAM Radio =====
|
||||||
|
js8call
|
||||||
|
wsjtx
|
||||||
|
fldigi
|
||||||
|
pat # Winlink client
|
||||||
|
direwolf # AX.25 packet modem
|
||||||
|
chirp # Radio programming tool
|
||||||
|
hamlib # Ham radio control libraries
|
||||||
|
trustedqsl # Logbook of the World (LoTW)
|
||||||
|
|
||||||
|
# ===== SDR / RF =====
|
||||||
|
sdrpp # SDR++ spectrum analyzer
|
||||||
|
gqrx # SDR receiver GUI
|
||||||
|
rtl-sdr # RTL-SDR drivers & utilities
|
||||||
|
inspectrum # Offline signal analysis
|
||||||
|
soapysdr-with-plugins # SoapySDR + hardware support plugins
|
||||||
|
|
||||||
|
# ===== Mesh / LoRa =====
|
||||||
|
meshtastic # Python CLI for Meshtastic devices
|
||||||
|
reticulumStack # Reticulum Network Stack (rnsd, rnsh, rncp, rnx, rnpath, etc.)
|
||||||
|
lxmf # LXMF messaging protocol
|
||||||
|
nomadnet # Nomad Network client
|
||||||
|
|
||||||
|
# ===== Security =====
|
||||||
|
nmap
|
||||||
|
aircrack-ng
|
||||||
|
kismet # Wi-Fi monitor / IDS
|
||||||
|
bettercap # MITM/network attack framework
|
||||||
|
wireshark # Packet analyzer
|
||||||
|
hashcat # GPU password cracker
|
||||||
|
john # John the Ripper
|
||||||
|
sqlmap # SQL injection tool
|
||||||
|
|
||||||
|
# ===== GPS / Maps =====
|
||||||
|
foxtrotgps
|
||||||
|
viking # GPS map editor
|
||||||
|
gpsbabel # GPS data conversion
|
||||||
|
];
|
||||||
|
|
||||||
|
# Packages noted but not in unstable nixpkgs:
|
||||||
|
# - metasploit: unfree; install manually via Git clone
|
||||||
|
# - burpsuite: unfree Java app (Community Edition available for download)
|
||||||
|
# - sidechannel: not a distinct PyPI package; functionality covered by
|
||||||
|
# the Reticulum stack. For LXMF GUI client, install Sideband manually
|
||||||
|
# from github.com/markqvist/Sideband
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Reticulum Service (rnsd)
|
||||||
|
# ============================================================
|
||||||
|
systemd.services.rnsd = {
|
||||||
|
description = "Reticulum Network Stack Daemon";
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
User = "gortium";
|
||||||
|
Group = "gortium";
|
||||||
|
ExecStart = "${pkgs.reticulumStack}/bin/rnsd";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "10s";
|
||||||
|
LimitNOFILE = 65536;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Kismet Service (Wi-Fi monitoring / mesh node)
|
||||||
|
# ============================================================
|
||||||
|
systemd.services.kismet = {
|
||||||
|
description = "Kismet Wi-Fi Monitor & IDS";
|
||||||
|
wants = [ "network-online.target" ];
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
User = "gortium";
|
||||||
|
Group = "kismet";
|
||||||
|
ExecStart = "${pkgs.kismet}/bin/kismet -c wlan0 --log-base=/home/gortium/kismet_logs --no-nc-ui";
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = "10s";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Kernel modules for SDR and radio
|
||||||
|
# ============================================================
|
||||||
|
boot.kernelModules = [
|
||||||
|
"88x2bu" # Realtek 8812/8821BU USB WiFi (common adapter)
|
||||||
|
"rtl8xxxu" # RTL8188/8192/8723 USB WiFi
|
||||||
|
"rtl2832_sdr" # RTL-SDR kernel module
|
||||||
|
"dvb_usb_rtl28xxu" # RTL-SDR DVB-T
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.blacklistedKernelModules = [ ];
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Extra udev rules for SDR and HAM radio devices
|
||||||
|
# ============================================================
|
||||||
|
services.udev.packages = with pkgs; [ rtl-sdr ];
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Enable IPv6 for Reticulum mesh
|
||||||
|
# ============================================================
|
||||||
|
networking.enableIPv6 = true;
|
||||||
|
|
||||||
|
# ============================================================
|
||||||
|
# Firewall: open ports for Reticulum (optional)
|
||||||
|
# ============================================================
|
||||||
|
networking.firewall.allowedTCPPorts = [ 22 ]; # SSH only
|
||||||
|
networking.firewall.allowedUDPPorts = [ ];
|
||||||
|
# Reticulum uses its own encryption and doesn't need open ports
|
||||||
|
# for basic mesh operations (peer-to-peer discovery).
|
||||||
|
# For TCP interfaces, open additional ports as needed.
|
||||||
|
}
|
||||||
@@ -1,27 +1,23 @@
|
|||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports =
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
# SD card partitions (nixos-uconsole layout)
|
# uConsole CM5 uses NVMe or eMMC for boot storage
|
||||||
fileSystems."/" = {
|
# The uconsole-cm5 module sets up /boot/firmware and default /
|
||||||
device = "/dev/disk/by-label/NIXOS_SD";
|
# Override device label here if using different storage
|
||||||
|
fileSystems."/" = lib.mkDefault {
|
||||||
|
device = "/dev/disk/by-label/NIXOS_UCM5";
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
options = [ "noatime" ];
|
options = [ "noatime" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot/firmware" = {
|
|
||||||
device = "/dev/disk/by-label/FIRMWARE";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ ];
|
swapDevices = [ ];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
{ config, lib, pkgs, keys, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
networking.hostName = "uConsole";
|
|
||||||
time.timeZone = "America/Montreal";
|
|
||||||
i18n.defaultLocale = "en_CA.UTF-8";
|
|
||||||
system.stateVersion = "25.11";
|
|
||||||
|
|
||||||
# SSH — root access avec clés gortium + ai-worker
|
|
||||||
services.openssh = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
PermitRootLogin = lib.mkForce "prohibit-password";
|
|
||||||
PasswordAuthentication = lib.mkForce false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
users.users.root.openssh.authorizedKeys.keys = with keys; [
|
|
||||||
users.gortium.main
|
|
||||||
users.ai-worker.main
|
|
||||||
];
|
|
||||||
|
|
||||||
# WiFi via NetworkManager + secret agenix
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
|
|
||||||
# Firmware
|
|
||||||
hardware.enableRedistributableFirmware = true;
|
|
||||||
|
|
||||||
# Hyprland Wayland compositor (manual start — no SDDM)
|
|
||||||
programs.hyprland = {
|
|
||||||
enable = true;
|
|
||||||
xwayland.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -9,6 +9,13 @@
|
|||||||
ai-worker = {
|
ai-worker = {
|
||||||
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXeGtPPcsP2IYRQNvII41NVWhJsarEk8c4qxs/a5sXf";
|
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAXeGtPPcsP2IYRQNvII41NVWhJsarEk8c4qxs/a5sXf";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
builder = {
|
||||||
|
# Same key on both hosts for bidirectional remote building.
|
||||||
|
# Generate with: ssh-keygen -t ed25519 -f /etc/ssh/builder_key -N ""
|
||||||
|
# Replace the placeholder below with the public key (builder_key.pub).
|
||||||
|
main = "PLACEHOLDER_ADD_BUILDER_PUBKEY_HERE";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
hosts = {
|
hosts = {
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
imports = [
|
|
||||||
./dotfiles.nix
|
|
||||||
./systemd
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.dotfiles;
|
|
||||||
stowDir = cfg.stowDir;
|
|
||||||
|
|
||||||
# Function to recursively find all files in a directory
|
|
||||||
findFiles = dir:
|
|
||||||
let
|
|
||||||
files = builtins.attrNames (builtins.readDir dir);
|
|
||||||
in
|
|
||||||
concatMap (name:
|
|
||||||
let
|
|
||||||
path = dir + "/${name}";
|
|
||||||
in
|
|
||||||
if (builtins.typeOf (builtins.readDir path) == "set")
|
|
||||||
then findFiles path
|
|
||||||
else [ path ]
|
|
||||||
) files;
|
|
||||||
|
|
||||||
# Get a list of all packages (directories) in the stow directory
|
|
||||||
stowPackages = builtins.attrNames (builtins.readDir stowDir);
|
|
||||||
|
|
||||||
# Create an attribute set where each attribute is a package name
|
|
||||||
# and the value is a list of files to be linked.
|
|
||||||
homeManagerLinks = listToAttrs (map (pkg:
|
|
||||||
let
|
|
||||||
pkgPath = stowDir + "/${pkg}";
|
|
||||||
files = findFiles pkgPath;
|
|
||||||
in
|
|
||||||
nameValuePair pkg (map (file: {
|
|
||||||
source = file;
|
|
||||||
target = removePrefix (pkgPath + "/") file;
|
|
||||||
}) files)
|
|
||||||
) stowPackages);
|
|
||||||
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.services.dotfiles = {
|
|
||||||
enable = mkEnableOption "Enable dotfiles management";
|
|
||||||
|
|
||||||
stowDir = mkOption {
|
|
||||||
type = types.path;
|
|
||||||
description = "The directory where your stow packages are located.";
|
|
||||||
};
|
|
||||||
|
|
||||||
user = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = "The user to manage dotfiles for.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
home-manager.users.${cfg.user} = {
|
|
||||||
home.file =
|
|
||||||
let
|
|
||||||
allFiles = concatLists (attrValues homeManagerLinks);
|
|
||||||
in
|
|
||||||
listToAttrs (map (file:
|
|
||||||
nameValuePair file.target {
|
|
||||||
source = file.source;
|
|
||||||
}
|
|
||||||
) allFiles);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
74
modules/nixos/services/remote-builder.nix
Normal file
74
modules/nixos/services/remote-builder.nix
Normal file
@@ -0,0 +1,74 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.remoteBuilder;
|
||||||
|
in {
|
||||||
|
options.services.remoteBuilder = {
|
||||||
|
enable = lib.mkEnableOption "remote Nix build machine";
|
||||||
|
|
||||||
|
machines = lib.mkOption {
|
||||||
|
type = lib.types.listOf (lib.types.submodule {
|
||||||
|
options = {
|
||||||
|
hostName = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = "Hostname or IP of the remote build machine.";
|
||||||
|
};
|
||||||
|
port = lib.mkOption {
|
||||||
|
type = lib.types.port;
|
||||||
|
default = 22;
|
||||||
|
description = "SSH port.";
|
||||||
|
};
|
||||||
|
sshUser = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
default = "builder";
|
||||||
|
description = "SSH user on the remote build machine.";
|
||||||
|
};
|
||||||
|
sshKey = lib.mkOption {
|
||||||
|
type = lib.types.str;
|
||||||
|
description = "Path to SSH private key for the builder.";
|
||||||
|
};
|
||||||
|
systems = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.str;
|
||||||
|
default = [ "aarch64-linux" ];
|
||||||
|
description = "System types the remote builder can build for.";
|
||||||
|
};
|
||||||
|
maxJobs = lib.mkOption {
|
||||||
|
type = lib.types.int;
|
||||||
|
default = 4;
|
||||||
|
description = "Max parallel jobs on the remote builder.";
|
||||||
|
};
|
||||||
|
supportedFeatures = lib.mkOption {
|
||||||
|
type = lib.types.listOf lib.types.str;
|
||||||
|
default = [ "benchmark" "big-parallel" "nixos-test" ];
|
||||||
|
description = "Features the remote builder supports.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
default = [];
|
||||||
|
description = "List of remote Nix build machines.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
nix.distributedBuilds = true;
|
||||||
|
nix.buildMachines = map (m: {
|
||||||
|
hostName = m.hostName;
|
||||||
|
sshUser = m.sshUser;
|
||||||
|
sshKey = m.sshKey;
|
||||||
|
systems = m.systems;
|
||||||
|
maxJobs = m.maxJobs;
|
||||||
|
supportedFeatures = m.supportedFeatures;
|
||||||
|
}) cfg.machines;
|
||||||
|
|
||||||
|
# SSH config for port + key (nix.buildMachines has no port option)
|
||||||
|
programs.ssh.extraConfig = lib.concatStringsSep "\n" (map (m: ''
|
||||||
|
Host ${m.hostName}
|
||||||
|
HostName ${m.hostName}
|
||||||
|
Port ${toString m.port}
|
||||||
|
User ${m.sshUser}
|
||||||
|
IdentityFile ${m.sshKey}
|
||||||
|
StrictHostKeyChecking no
|
||||||
|
UserKnownHostsFile /dev/null
|
||||||
|
'') cfg.machines);
|
||||||
|
};
|
||||||
|
}
|
||||||
81
overlays/reticulum.nix
Normal file
81
overlays/reticulum.nix
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
final: prev: let
|
||||||
|
python3 = final.python3;
|
||||||
|
pyPkgs = python3.pkgs;
|
||||||
|
in {
|
||||||
|
reticulumStack = python3.pkgs.buildPythonApplication rec {
|
||||||
|
pname = "reticulum";
|
||||||
|
version = "1.2.9";
|
||||||
|
format = "setuptools";
|
||||||
|
src = pyPkgs.fetchPypi {
|
||||||
|
pname = "rns";
|
||||||
|
inherit version;
|
||||||
|
sha256 = "554814231c237b9caacf8df669312e57dd7d3f84b6d4810125087d1a79a75d75";
|
||||||
|
};
|
||||||
|
propagatedBuildInputs = with pyPkgs; [ cryptography pyserial ];
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "RNS" ];
|
||||||
|
meta = with final.lib; {
|
||||||
|
description = "Self-configuring, encrypted and resilient mesh networking stack";
|
||||||
|
homepage = "https://reticulum.network/";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
lxmf = python3.pkgs.buildPythonApplication rec {
|
||||||
|
pname = "lxmf";
|
||||||
|
version = "0.9.8";
|
||||||
|
format = "setuptools";
|
||||||
|
src = pyPkgs.fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "30f39f3a975a049c12ee2cfceb3261d24cb5adec881c6821f7354464b3f3650c";
|
||||||
|
};
|
||||||
|
propagatedBuildInputs = [ final.reticulumStack ];
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "LXMF" ];
|
||||||
|
meta = with final.lib; {
|
||||||
|
description = "Lightweight Extensible Message Format for Reticulum";
|
||||||
|
homepage = "https://github.com/markqvist/lxmf";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nomadnet = python3.pkgs.buildPythonApplication rec {
|
||||||
|
pname = "nomadnet";
|
||||||
|
version = "1.1.1";
|
||||||
|
format = "setuptools";
|
||||||
|
src = pyPkgs.fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "fa13b64a10e75b705a58024815ab72451700aa726af96d415ba99dec28dfc40a";
|
||||||
|
};
|
||||||
|
propagatedBuildInputs = with pyPkgs; [ final.reticulumStack final.lxmf urwid qrcode ];
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "nomadnet" ];
|
||||||
|
meta = with final.lib; {
|
||||||
|
description = "Nomad Network — resilient mesh communications platform";
|
||||||
|
homepage = "https://github.com/markqvist/NomadNet";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
rnsh = python3.pkgs.buildPythonApplication rec {
|
||||||
|
pname = "rnsh";
|
||||||
|
version = "0.1.7";
|
||||||
|
format = "setuptools";
|
||||||
|
src = pyPkgs.fetchPypi {
|
||||||
|
inherit pname version;
|
||||||
|
sha256 = "9cb72f25abb1c6d300f8014b264184ff78f592fe88e36094938012990b797c93";
|
||||||
|
};
|
||||||
|
propagatedBuildInputs = [ final.reticulumStack ];
|
||||||
|
doCheck = false;
|
||||||
|
pythonImportsCheck = [ "rnsh" ];
|
||||||
|
meta = with final.lib; {
|
||||||
|
description = "Remote shell over Reticulum";
|
||||||
|
homepage = "https://github.com/acehoss/rnsh";
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
|
|
||||||
YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
|
|
||||||
V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
|
|
||||||
Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
|
|
||||||
aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
|
|
||||||
cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
|
|
||||||
TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
|
|
||||||
KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
@@ -11,5 +11,4 @@ in
|
|||||||
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
||||||
"home_wifi.age".publicKeys = authorizedKeys;
|
|
||||||
}
|
}
|
||||||
|
|||||||
13
users/builder.nix
Normal file
13
users/builder.nix
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{ config, lib, pkgs, keys, ... }: {
|
||||||
|
users.users.builder = {
|
||||||
|
isSystemUser = true;
|
||||||
|
group = "builder";
|
||||||
|
home = "/var/empty";
|
||||||
|
createHome = false;
|
||||||
|
shell = pkgs.nologin;
|
||||||
|
openssh.authorizedKeys.keys = with keys; [
|
||||||
|
users.builder.main
|
||||||
|
];
|
||||||
|
};
|
||||||
|
users.groups.builder = {};
|
||||||
|
}
|
||||||
@@ -1,5 +1,4 @@
|
|||||||
{ pkgs, inputs, config, keys, ... }: {
|
{ pkgs, inputs, config, keys, ... }: {
|
||||||
home-manager.users.gortium = import ./home.nix;
|
|
||||||
users.users.gortium = {
|
users.users.gortium = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" "video" "render"];
|
extraGroups = [ "wheel" "docker" "video" "render"];
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
{ pkgs, ... }: {
|
|
||||||
services.dotfiles = {
|
|
||||||
enable = true;
|
|
||||||
stowDir = ../../../assets/dotfiles;
|
|
||||||
user = "gortium";
|
|
||||||
};
|
|
||||||
|
|
||||||
home.username = "gortium";
|
|
||||||
home.homeDirectory = "/home/gortium";
|
|
||||||
home.stateVersion = "23.11"; # Please change this to your version.
|
|
||||||
programs.home-manager.enable = true;
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user