Compare commits
88 Commits
feat/temp-
...
uconsole-c
| Author | SHA1 | Date | |
|---|---|---|---|
| 09add9f5e4 | |||
| b4b928a985 | |||
| 33e98f32d7 | |||
| 332f1cca1a | |||
| 102586d7e8 | |||
| 43f8d8a61c | |||
| 6aca5466b6 | |||
| f0ec375875 | |||
| e05ef66b8f | |||
| a2096efc3f | |||
| 088a82d730 | |||
| b9e89ce537 | |||
| 1d50b6455d | |||
| bcf924408b | |||
| 820de72c0f | |||
| 6c08958730 | |||
| 3f331e4bfb | |||
| 1550219e77 | |||
| 2572f47e41 | |||
| bd8b1c564e | |||
| bd283de350 | |||
| a6d88f2d41 | |||
| 6399196a2c | |||
| 8651295b0a | |||
| e991359584 | |||
| fba52fa66d | |||
| e95baddb96 | |||
| eb3fe42542 | |||
| cdbb7de04d | |||
| 9004163891 | |||
| f06d9028f0 | |||
| 8423a121eb | |||
| 7238e9d45c | |||
| f344739b94 | |||
| 02ffcdb55e | |||
| ce7f74c66f | |||
| f5d1732346 | |||
| 2ee616839e | |||
| 42202c8a40 | |||
| 2476352fdf | |||
| 8afca7315d | |||
| 0372b37950 | |||
| 11a4969028 | |||
| 6a1c26cac2 | |||
| 9978ea36f4 | |||
| f00477dacc | |||
| 86d8b7bf8b | |||
| 4610a08072 | |||
| 3f985c72de | |||
| 67aafe37db | |||
| cb2b535fde | |||
| 2c9136d1dc | |||
| 6fac886598 | |||
| a4f4891236 | |||
| 3a809938c9 | |||
| 0f765d99cb | |||
| 4d8087badf | |||
| 6543de3a45 | |||
| 0db8071300 | |||
| 9038863728 | |||
| 7e3b2520eb | |||
| 80efb68428 | |||
| 3d86af76b9 | |||
| 656570b39e | |||
| 8b6990ceee | |||
| a312c29221 | |||
| 053dd535d3 | |||
| 35e4155b8c | |||
| e8218c322a | |||
| 931ed2ac27 | |||
| 052081616c | |||
| d3d7cdff44 | |||
| 5202bc1fcb | |||
| 9319e32683 | |||
| 7da46d5769 | |||
| 8ea6be7ac1 | |||
| b455bf6866 | |||
| ce7c594562 | |||
| eb5e64ec67 | |||
| ec44012a64 | |||
| 16acc6a153 | |||
| 5ee644e9dd | |||
| efc50d23c4 | |||
| a527b65eae | |||
| 698d3f91eb | |||
| 1f99ca0d37 | |||
| 1ca58d3da3 | |||
| 0ca7a74653 |
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -1,3 +1,7 @@
|
|||||||
[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
|
||||||
|
branch = master
|
||||||
|
|||||||
Submodule assets/compose updated: d3f2e3b7b9...dab158da0a
1
assets/dotfiles
Submodule
1
assets/dotfiles
Submodule
Submodule assets/dotfiles added at f45387456b
@@ -1,106 +0,0 @@
|
|||||||
# 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"]
|
|
||||||
148
flake.lock
generated
148
flake.lock
generated
@@ -23,6 +23,22 @@
|
|||||||
"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": {
|
||||||
@@ -37,6 +53,21 @@
|
|||||||
"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": [
|
||||||
@@ -58,6 +89,27 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"home-manager_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-uconsole"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1779506708,
|
||||||
|
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-25.11",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"lix": {
|
"lix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
@@ -144,6 +196,80 @@
|
|||||||
"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,
|
||||||
@@ -176,6 +302,22 @@
|
|||||||
"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,
|
||||||
@@ -211,8 +353,12 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
|
"home-manager": "home-manager_2",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixos-raspberrypi": "nixos-raspberrypi",
|
||||||
|
"nixos-uconsole": "nixos-uconsole",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-uconsole": "nixpkgs-uconsole"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
|||||||
208
flake.nix
208
flake.nix
@@ -12,10 +12,26 @@
|
|||||||
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";
|
||||||
};
|
};
|
||||||
self.submodules = true;
|
nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||||
|
nixos-uconsole = {
|
||||||
|
url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
||||||
|
inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
|
||||||
|
};
|
||||||
|
nixos-raspberrypi = {
|
||||||
|
url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
||||||
|
};
|
||||||
|
home-manager = {
|
||||||
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, agenix, lix, ... }@inputs:
|
outputs = { self, nixpkgs, agenix, lix
|
||||||
|
, nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
|
||||||
|
, home-manager
|
||||||
|
, ... }@inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
keys = import ./lib/keys.nix;
|
keys = import ./lib/keys.nix;
|
||||||
@@ -30,57 +46,151 @@
|
|||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system overlays;
|
inherit system overlays;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
config.permittedInsecurePackages = [
|
config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||||
"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
|
|
||||||
{
|
|
||||||
nixosConfigurations = {
|
|
||||||
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
|
||||||
specialArgs = { inherit system self keys paths inputs; };
|
|
||||||
modules = [
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = overlays;
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
nixpkgs.config.rocmSupport = true;
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
|
||||||
"openclaw-2026.3.12"
|
|
||||||
];
|
|
||||||
nix.package = lix.packages.${system}.default;
|
|
||||||
}
|
|
||||||
agenix.nixosModules.default
|
|
||||||
./hosts/lazyworkhorse/configuration.nix
|
|
||||||
./hosts/lazyworkhorse/hardware-configuration.nix
|
|
||||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
|
||||||
./modules/nixos/services/docker_manager.nix
|
|
||||||
./modules/nixos/services/open_code_server.nix
|
|
||||||
./modules/nixos/services/ollama_init_custom_models.nix
|
|
||||||
./modules/nixos/services/openclaw_node.nix
|
|
||||||
./modules/nixos/security/ai-worker-restricted.nix
|
|
||||||
./users/gortium.nix
|
|
||||||
./users/ai-worker.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
cyt-pi = nixpkgs.lib.nixosSystem {
|
# Cross-compile overlay fixes for Hyprland and deps on aarch64
|
||||||
specialArgs = { inherit self keys paths inputs; };
|
uconsoleCrossOverlay = final: prev: {
|
||||||
modules = [
|
libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
|
||||||
{
|
libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
|
||||||
nixpkgs.overlays = overlays;
|
libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
|
||||||
nixpkgs.config.allowUnfree = true;
|
pipewire = prev.pipewire.overrideAttrs (old: {
|
||||||
nixpkgs.hostPlatform = "aarch64-linux";
|
buildInputs = builtins.filter
|
||||||
nix.package = lix.packages."aarch64-linux".default;
|
(x: !(x?pname && x.pname == "libcamera"))
|
||||||
}
|
(old.buildInputs or []);
|
||||||
./hosts/cyt-pi/configuration.nix
|
mesonFlags = builtins.filter
|
||||||
./hosts/cyt-pi/hardware-configuration.nix
|
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
|
||||||
];
|
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
|
||||||
};
|
});
|
||||||
};
|
gjs = prev.gjs.overrideAttrs (old: {
|
||||||
devShells.${system}.default = devShell;
|
mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ];
|
||||||
|
});
|
||||||
|
hyprland = prev.hyprland.override { wrapRuntimeDeps = false; };
|
||||||
|
xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (old: {
|
||||||
|
preConfigure = (old.preConfigure or "") + ''
|
||||||
|
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"
|
||||||
|
'';
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# RPI-specific pipewire libcamera fix (separate nixpkgs instance)
|
||||||
|
uconsoleRpiPipewireOverlay = 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" ];
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
# Shared uConsole CM5 module set — used by both toplevel and SD image
|
||||||
|
uconsoleBaseModules = [
|
||||||
|
{
|
||||||
|
nixpkgs.buildPlatform = "x86_64-linux";
|
||||||
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
boot.loader.raspberry-pi.bootloader = "kernel";
|
||||||
|
nixpkgs.overlays = [ uconsoleCrossOverlay ];
|
||||||
|
}
|
||||||
|
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
||||||
|
({ config, lib, pkgs, ... }: {
|
||||||
|
nixpkgs.overlays = [ uconsoleRpiPipewireOverlay ];
|
||||||
|
})
|
||||||
|
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
||||||
|
nixos-raspberrypi.lib.inject-overlays
|
||||||
|
nixos-raspberrypi.lib.inject-overlays-global
|
||||||
|
nixos-uconsole.nixosModules.uconsole-cm5
|
||||||
|
./modules/nixos/hardware/uconsole-cm5-aio-v2.nix
|
||||||
|
# Cross-compiled Lix for uConsole
|
||||||
|
({ config, lib, pkgs, inputs, ... }: let
|
||||||
|
lixCross = import inputs.nixpkgs-uconsole {
|
||||||
|
localSystem = { system = "x86_64-linux"; };
|
||||||
|
crossSystem = { system = "aarch64-linux"; };
|
||||||
|
overlays = [ inputs.lix.overlays.default ];
|
||||||
|
};
|
||||||
|
in { nix.package = lixCross.lix; })
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
agenix.nixosModules.default
|
||||||
|
./hosts/uconsole-cm5/configuration.nix
|
||||||
|
./hosts/uconsole-cm5/hardware-configuration.nix
|
||||||
|
./modules/nixos/services/wireguard-client.nix
|
||||||
|
./modules/nixos/security/ai-worker-restricted.nix
|
||||||
|
./users/gortium/gortium.nix
|
||||||
|
./users/ai-worker/ai-worker.nix
|
||||||
|
];
|
||||||
|
in {
|
||||||
|
nixosConfigurations = {
|
||||||
|
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = { inherit system self keys paths inputs; };
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = overlays;
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
nixpkgs.config.rocmSupport = true;
|
||||||
|
nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||||
|
nix.package = lix.packages.${system}.default;
|
||||||
|
}
|
||||||
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
agenix.nixosModules.default
|
||||||
|
./hosts/lazyworkhorse/configuration.nix
|
||||||
|
./hosts/lazyworkhorse/hardware-configuration.nix
|
||||||
|
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||||
|
./modules/nixos/services/docker_manager.nix
|
||||||
|
./modules/nixos/services/wireguard-client.nix
|
||||||
|
./modules/nixos/services/ollama_init_custom_models.nix
|
||||||
|
./modules/nixos/security/ai-worker-restricted.nix
|
||||||
|
./users/gortium/gortium.nix
|
||||||
|
./users/ai-worker/ai-worker.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
cyt-pi = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = { inherit self keys paths inputs; };
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = overlays;
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
|
nix.package = lix.packages."aarch64-linux".default;
|
||||||
|
}
|
||||||
|
./hosts/cyt-pi/configuration.nix
|
||||||
|
./hosts/cyt-pi/hardware-configuration.nix
|
||||||
|
./modules/nixos/services/wireguard-client.nix
|
||||||
|
./users/gortium/gortium.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
|
||||||
|
system = "aarch64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
inherit self keys paths inputs;
|
||||||
|
nixos-raspberrypi = nixos-raspberrypi;
|
||||||
|
isCM4 = false;
|
||||||
|
};
|
||||||
|
modules = uconsoleBaseModules;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
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 = uconsoleBaseModules ++ [
|
||||||
|
nixos-raspberrypi.nixosModules.sd-image
|
||||||
|
];
|
||||||
|
}).config.system.build.sdImage;
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
hoardingcow-mount.enable = true;
|
hoardingcow-mount.enable = true;
|
||||||
|
|
||||||
# Flakesss
|
# Flakesss
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" "ca-derivations" ];
|
||||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||||
|
|
||||||
# Garbage collection
|
# Garbage collection
|
||||||
@@ -49,24 +49,12 @@
|
|||||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||||
networking.hostId = "deadbeef";
|
networking.hostId = "deadbeef";
|
||||||
|
|
||||||
# WireGuard VPN client -- always up, connects to wg-easy server
|
# WireGuard VPN client -- module, always up, connects to wg-easy server
|
||||||
# Create age-encrypted secrets before deploying (run on the host):
|
gortium.wireguard-client = {
|
||||||
# echo -n "<private_key>" | agenix -e secrets/wireguard_private_key.age
|
enable = true;
|
||||||
# echo -n "<preshared_key>" | agenix -e secrets/wireguard_preshared_key.age
|
vpnIp = "10.8.0.3/24";
|
||||||
networking.wireguard.interfaces = {
|
privateKeyFile = config.age.secrets.wireguard_private_key.path;
|
||||||
wg0 = {
|
presharedKeyFile = config.age.secrets.wireguard_preshared_key.path;
|
||||||
ips = [ "10.8.0.3/24" ];
|
|
||||||
privateKeyFile = config.age.secrets.wireguard_private_key.path;
|
|
||||||
peers = [
|
|
||||||
{
|
|
||||||
publicKey = "rY9zII3AOm8rog2rv02PyA3Bq7zdvTOGkZapfCV1DkE=";
|
|
||||||
presharedKeyFile = config.age.secrets.wireguard_preshared_key.path;
|
|
||||||
allowedIPs = [ "10.8.0.0/24" ];
|
|
||||||
endpoint = "vpn.lazyworkhorse.net:51820";
|
|
||||||
persistentKeepalive = 25;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
|
|||||||
58
hosts/uconsole-cm5/configuration.nix
Normal file
58
hosts/uconsole-cm5/configuration.nix
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
{ 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
|
||||||
|
];
|
||||||
|
|
||||||
|
# AI worker user (Hermes SSH access)
|
||||||
|
|
||||||
|
# Age secret for gortium password (file created by user)
|
||||||
|
age.secrets.gortium_password = {
|
||||||
|
file = ../../secrets/gortium_password.age;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Password file for gortium (merges with users/gortium/default.nix)
|
||||||
|
|
||||||
|
# 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;
|
||||||
|
};
|
||||||
|
# HackerGadgets AIO v2 board
|
||||||
|
hardware.uconsole-cm5-aio-v2 = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
# Rails actifs au boot
|
||||||
|
bootRails = {
|
||||||
|
GPS = false;
|
||||||
|
LORA = false;
|
||||||
|
SDR = false;
|
||||||
|
USB = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
enableGPS = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
30
hosts/uconsole-cm5/hardware-configuration.nix
Normal file
30
hosts/uconsole-cm5/hardware-configuration.nix
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
# SD card partitions (nixos-uconsole layout)
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-label/NIXOS_SD";
|
||||||
|
fsType = "ext4";
|
||||||
|
options = [ "noatime" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot/firmware" = {
|
||||||
|
device = "/dev/disk/by-label/FIRMWARE";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||||
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
|
}
|
||||||
169
modules/nixos/hardware/uconsole-cm5-aio-v2.nix
Normal file
169
modules/nixos/hardware/uconsole-cm5-aio-v2.nix
Normal file
@@ -0,0 +1,169 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.hardware.uconsole-cm5-aio-v2;
|
||||||
|
|
||||||
|
# GPIO pin map matching the AIO v2 board hardware
|
||||||
|
# SDR (RTL-SDR): GPIO 7
|
||||||
|
# LoRa (SX1262) : GPIO 16
|
||||||
|
# USB Hub Interne: GPIO 23
|
||||||
|
# GPS (GNSS) : GPIO 27
|
||||||
|
gpioMap = {
|
||||||
|
GPS = 27;
|
||||||
|
LORA = 16;
|
||||||
|
SDR = 7;
|
||||||
|
USB = 23;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Generate a script that applies boot rail states via pinctrl
|
||||||
|
applyRailsScript = pkgs.writeShellScript "apply-aio-v2-rails" (
|
||||||
|
''
|
||||||
|
set -e
|
||||||
|
PINCTRL=${pkgs.libraspberrypi}/bin/pinctrl
|
||||||
|
''
|
||||||
|
+ concatStringsSep "" (mapAttrsToList (name: pin: ''
|
||||||
|
if [ "${if cfg.bootRails.${name} then "1" else "0"}" = "1" ]; then
|
||||||
|
echo "AIO v2: ${name} (GPIO${toString pin}) -> ON"
|
||||||
|
$PINCTRL set ${toString pin} op dh
|
||||||
|
else
|
||||||
|
echo "AIO v2: ${name} (GPIO${toString pin}) -> OFF"
|
||||||
|
$PINCTRL set ${toString pin} op dl
|
||||||
|
fi
|
||||||
|
'') gpioMap)
|
||||||
|
);
|
||||||
|
|
||||||
|
# aiov2_ctl CLI tool -- fetched from GitHub, available as `aiov2_ctl`
|
||||||
|
aiov2CtlPkg = pkgs.stdenv.mkDerivation rec {
|
||||||
|
pname = "aiov2_ctl";
|
||||||
|
version = "0-unstable-2026-06-16";
|
||||||
|
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "hackergadgets";
|
||||||
|
repo = "aiov2_ctl";
|
||||||
|
rev = "main";
|
||||||
|
hash = "sha256-hqOvS1K5pDVXAroUE50i5R9YqRgC2U3fzby6uuB67K0=";
|
||||||
|
};
|
||||||
|
|
||||||
|
dontUnpack = true;
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/bin $out/share/aiov2_ctl/img
|
||||||
|
cp $src/aiov2_ctl.py $out/bin/aiov2_ctl
|
||||||
|
chmod +x $out/bin/aiov2_ctl
|
||||||
|
patchShebangs $out/bin/aiov2_ctl
|
||||||
|
substituteInPlace $out/bin/aiov2_ctl \
|
||||||
|
--replace-fail '"/usr/local/share/aiov2_ctl/img/' '"'$out'/share/aiov2_ctl/img/'
|
||||||
|
cp -r $src/img/* $out/share/aiov2_ctl/img/
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
description = "HackerGadgets uConsole AIO v2 GPIO control and telemetry tool";
|
||||||
|
homepage = "https://github.com/hackergadgets/aiov2_ctl";
|
||||||
|
license = lib.licenses.mit;
|
||||||
|
maintainers = with lib.maintainers; [ ];
|
||||||
|
platforms = [ "aarch64-linux" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
options.hardware.uconsole-cm5-aio-v2 = {
|
||||||
|
enable = mkEnableOption "HackerGadgets uConsole AIO v2 board support";
|
||||||
|
|
||||||
|
bootRails = {
|
||||||
|
GPS = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable GPS module at boot (GPIO 27)";
|
||||||
|
};
|
||||||
|
LORA = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable LoRa module at boot (GPIO 16)";
|
||||||
|
};
|
||||||
|
SDR = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable SDR module at boot (GPIO 7)";
|
||||||
|
};
|
||||||
|
USB = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable internal USB hub at boot (GPIO 23)";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
package = mkOption {
|
||||||
|
type = types.package;
|
||||||
|
default = aiov2CtlPkg;
|
||||||
|
defaultText = literalExpression "aiov2CtlPkg";
|
||||||
|
description = "aiov2_ctl package to use";
|
||||||
|
};
|
||||||
|
|
||||||
|
enableGPS = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Enable GPS UART (/dev/ttyAMA0 at 9600 baud).
|
||||||
|
Requires enabling UART on the CM5 via boot.kernelParams.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
enableGUI = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = ''
|
||||||
|
Enable the system tray GUI for aiov2_ctl.
|
||||||
|
Requires a desktop environment with system tray support.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
# Package the aiov2_ctl tool + pinctrl
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
cfg.package
|
||||||
|
libraspberrypi # provides pinctrl
|
||||||
|
];
|
||||||
|
|
||||||
|
# Boot rail systemd oneshot service
|
||||||
|
systemd.services.aiov2-rails-boot = {
|
||||||
|
description = "Apply AIO v2 GPIO rail boot states";
|
||||||
|
after = [ "local-fs.target" ];
|
||||||
|
wants = [ "local-fs.target" ];
|
||||||
|
before = [ "multi-user.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = "${applyRailsScript}";
|
||||||
|
RemainAfterExit = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# GPS configuration
|
||||||
|
boot.kernelParams = mkIf cfg.enableGPS [ "uart0=on" ];
|
||||||
|
|
||||||
|
users.users = mkIf cfg.enableGPS {
|
||||||
|
gortium = {
|
||||||
|
extraGroups = [ "dialout" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# GUI autostart (XDG)
|
||||||
|
systemd.user.services.aiov2-ctl-gui = mkIf cfg.enableGUI {
|
||||||
|
description = "AIO v2 System Tray Controller";
|
||||||
|
after = [ "graphical-session.target" ];
|
||||||
|
wants = [ "graphical-session.target" ];
|
||||||
|
wantedBy = [ "graphical-session.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = "${cfg.package}/bin/aiov2_ctl --gui";
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = 5;
|
||||||
|
};
|
||||||
|
environment = {
|
||||||
|
AIOV2_CTL_DEBUG = "0";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
5
modules/nixos/services/default.nix
Normal file
5
modules/nixos/services/default.nix
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./systemd
|
||||||
|
];
|
||||||
|
}
|
||||||
275
modules/nixos/services/staging-vm.nix.bak
Executable file
275
modules/nixos/services/staging-vm.nix.bak
Executable file
@@ -0,0 +1,275 @@
|
|||||||
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.stagingVm;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.services.stagingVm = {
|
||||||
|
enable = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable KVM/libvirt staging VM for compose PR testing";
|
||||||
|
};
|
||||||
|
|
||||||
|
vmName = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "compose-test-vm";
|
||||||
|
description = "Name of the staging VM";
|
||||||
|
};
|
||||||
|
|
||||||
|
memory = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "4096";
|
||||||
|
description = "RAM allocated to the staging VM (MB)";
|
||||||
|
};
|
||||||
|
|
||||||
|
vcpus = mkOption {
|
||||||
|
type = types.int;
|
||||||
|
default = 2;
|
||||||
|
description = "Number of vCPUs for the staging VM";
|
||||||
|
};
|
||||||
|
|
||||||
|
storagePath = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "/var/lib/libvirt/images";
|
||||||
|
description = "Path for libvirt storage pool";
|
||||||
|
};
|
||||||
|
|
||||||
|
dataPath = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "/var/lib/staging-vm";
|
||||||
|
description = "Path for compose test data (PR checkouts, test results)";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
# Enable libvirt daemon
|
||||||
|
virtualisation.libvirtd = {
|
||||||
|
enable = true;
|
||||||
|
qemu = {
|
||||||
|
package = pkgs.qemu_kvm;
|
||||||
|
runAsRoot = true;
|
||||||
|
swtpm.enable = true;
|
||||||
|
ovmf = {
|
||||||
|
enable = true;
|
||||||
|
packages = [ pkgs.OVMFFull.fd ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Kernel modules + groups already handled in configuration.nix
|
||||||
|
|
||||||
|
# libvirt NAT network (192.168.122.0/24)
|
||||||
|
environment.etc."libvirt/qemu/networks/default.xml" = {
|
||||||
|
text = ''
|
||||||
|
<network>
|
||||||
|
<name>default</name>
|
||||||
|
<uuid>2b8f7a3c-9e5d-4a1f-bc3d-6e7a8f9b0c1d</uuid>
|
||||||
|
<forward mode='nat'>
|
||||||
|
<nat>
|
||||||
|
<port start='1024' end='65535'/>
|
||||||
|
</nat>
|
||||||
|
</forward>
|
||||||
|
<bridge name='virbr0' stp='on' delay='0'/>
|
||||||
|
<mac address='52:54:00:12:34:56'/>
|
||||||
|
<ip address='192.168.122.1' netmask='255.255.255.0'>
|
||||||
|
<dhcp>
|
||||||
|
<range start='192.168.122.2' end='192.168.122.254'/>
|
||||||
|
</dhcp>
|
||||||
|
</ip>
|
||||||
|
</network>
|
||||||
|
'';
|
||||||
|
# Autostart the network so it comes up on boot
|
||||||
|
mode = "0644";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Ensure the default network is defined and autostarted
|
||||||
|
systemd.services.libvirtd = {
|
||||||
|
postStart = ''
|
||||||
|
${pkgs.libvirt}/bin/virsh net-define /etc/libvirt/qemu/networks/default.xml 2>/dev/null || true
|
||||||
|
${pkgs.libvirt}/bin/virsh net-autostart default 2>/dev/null || true
|
||||||
|
${pkgs.libvirt}/bin/virsh net-start default 2>/dev/null || true
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# Storage directory for VM images
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d ${cfg.storagePath} 0755 root root -"
|
||||||
|
"d ${cfg.dataPath} 0755 root root -"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Ensure storage pool exists in libvirt
|
||||||
|
systemd.services.libvirtd.postStart = mkAfter ''
|
||||||
|
${pkgs.libvirt}/bin/virsh pool-define-as default dir --target "${cfg.storagePath}" 2>/dev/null || true
|
||||||
|
${pkgs.libvirt}/bin/virsh pool-autostart default 2>/dev/null || true
|
||||||
|
${pkgs.libvirt}/bin/virsh pool-start default 2>/dev/null || true
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Firewall: allow traffic from virbr0 to host and outbound NAT
|
||||||
|
networking.firewall = {
|
||||||
|
extraCommands = ''
|
||||||
|
# Allow inbound DHCP/DNS from libvirt guests
|
||||||
|
iptables -I INPUT -i virbr0 -p udp --dport 67:68 -j ACCEPT
|
||||||
|
iptables -I INPUT -i virbr0 -p tcp --dport 53 -j ACCEPT
|
||||||
|
iptables -I INPUT -i virbr0 -p udp --dport 53 -j ACCEPT
|
||||||
|
|
||||||
|
# Allow established/related traffic back to guests
|
||||||
|
iptables -I FORWARD -i virbr0 -o virbr0 -j ACCEPT
|
||||||
|
iptables -I FORWARD -o virbr0 -j ACCEPT
|
||||||
|
iptables -I FORWARD -i virbr0 -j ACCEPT
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# Packages needed for VM management
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
libvirt
|
||||||
|
qemu_kvm
|
||||||
|
virt-manager # optional GUI for manual management
|
||||||
|
OVMFFull
|
||||||
|
swtpm
|
||||||
|
];
|
||||||
|
|
||||||
|
# Enable docker in the host (already enabled, but ensure for compose testing)
|
||||||
|
virtualisation.docker.enable = true;
|
||||||
|
|
||||||
|
# Helper script: pr-test-vm
|
||||||
|
# Usage:
|
||||||
|
# pr-test-vm build — build the staging VM derivation
|
||||||
|
# pr-test-vm start — boot the VM with a compose PR branch
|
||||||
|
# pr-test-vm stop — graceful shutdown
|
||||||
|
# pr-test-vm destroy — force stop + delete VM
|
||||||
|
# pr-test-vm ssh — SSH into the running VM
|
||||||
|
systemd.tmpfiles.rules = mkAfter [
|
||||||
|
"d ${cfg.dataPath}/scripts 0755 root root -"
|
||||||
|
];
|
||||||
|
|
||||||
|
environment.systemPackages = [ (pkgs.writeShellScriptBin "pr-test-vm" ''
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
DATA="${cfg.dataPath}"
|
||||||
|
VM_NAME="${cfg.vmName}"
|
||||||
|
VM_IMAGE="''${DATA}/''${VM_NAME}.qcow2"
|
||||||
|
VM_PORT=2223
|
||||||
|
|
||||||
|
build_vm() {
|
||||||
|
echo "==> Building NixOS staging VM for compose testing..."
|
||||||
|
# Build the VM config inline — a minimal NixOS with Docker + SSH
|
||||||
|
cat > /tmp/staging-vm-config.nix << 'NIXEOF'
|
||||||
|
{ config, pkgs, lib, ... }: {
|
||||||
|
boot.loader.grub.devices = [ "/dev/vda" ];
|
||||||
|
boot.loader.timeout = 0;
|
||||||
|
|
||||||
|
# Minimal kernel
|
||||||
|
boot.kernelParams = [ "console=ttyS0" ];
|
||||||
|
boot.initrd.kernelModules = [ "virtio_blk" "virtio_net" "virtio_pci" ];
|
||||||
|
|
||||||
|
# SSH access
|
||||||
|
services.openssh = {
|
||||||
|
enable = true;
|
||||||
|
settings.PasswordAuthentication = false;
|
||||||
|
settings.PermitRootLogin = "prohibit-password";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Docker for compose testing
|
||||||
|
virtualisation.docker.enable = true;
|
||||||
|
|
||||||
|
# Network (DHCP via virbr0)
|
||||||
|
networking.useDHCP = true;
|
||||||
|
networking.firewall.enable = false;
|
||||||
|
|
||||||
|
# Users
|
||||||
|
users.users.root.openssh.authorizedKeys.keys = [
|
||||||
|
"$(cat /root/.ssh/authorized_keys 2>/dev/null || echo 'ssh-ed25519 AAAAC3... placeholder')"
|
||||||
|
];
|
||||||
|
users.users.testrunner = {
|
||||||
|
isNormalUser = true;
|
||||||
|
extraGroups = [ "docker" ];
|
||||||
|
openssh.authorizedKeys.keys = [
|
||||||
|
"$(cat /root/.ssh/authorized_keys 2>/dev/null || echo 'ssh-ed25519 AAAAC3... placeholder')"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Git + compose tools
|
||||||
|
environment.systemPackages = with pkgs; [ git docker-compose curl ];
|
||||||
|
|
||||||
|
system.stateVersion = "24.11";
|
||||||
|
}
|
||||||
|
NIXEOF
|
||||||
|
|
||||||
|
nixos-rebuild build-vm -I nixpkgs=channel:nixos-unstable \
|
||||||
|
--arg configuration 'import /tmp/staging-vm-config.nix' \
|
||||||
|
--out-link "''${DATA}/vm-result"
|
||||||
|
echo "==> VM built. Run 'pr-test-vm start' to boot."
|
||||||
|
}
|
||||||
|
|
||||||
|
start_vm() {
|
||||||
|
if [ -f "''${VM_IMAGE}" ]; then
|
||||||
|
echo "==> Booting existing VM..."
|
||||||
|
else
|
||||||
|
echo "==> Creating VM image..."
|
||||||
|
${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "''${VM_IMAGE}" 20G
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if already running
|
||||||
|
if ${pkgs.libvirt}/bin/virsh list --name 2>/dev/null | grep -q "''${VM_NAME}"; then
|
||||||
|
echo "==> VM already running."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
${pkgs.qemu_kvm}/bin/qemu-system-x86_64 \
|
||||||
|
-name "''${VM_NAME}" \
|
||||||
|
-machine q35,accel=kvm \
|
||||||
|
-cpu host \
|
||||||
|
-smp ${toString cfg.vcpus} \
|
||||||
|
-m ${cfg.memory} \
|
||||||
|
-drive file="''${VM_IMAGE}",if=virtio,format=qcow2 \
|
||||||
|
-netdev user,id=net0,hostfwd=tcp::''${VM_PORT}-:22 \
|
||||||
|
-device virtio-net-pci,netdev=net0 \
|
||||||
|
-nographic \
|
||||||
|
-serial mon:stdio \
|
||||||
|
-pidfile "''${DATA}/''${VM_NAME}.pid" \
|
||||||
|
-daemonize
|
||||||
|
|
||||||
|
echo "==> VM booting... SSH on port ''${VM_PORT}"
|
||||||
|
echo "==> Wait for it: ssh -p ''${VM_PORT} testrunner@localhost"
|
||||||
|
}
|
||||||
|
|
||||||
|
stop_vm() {
|
||||||
|
PIDFILE="''${DATA}/''${VM_NAME}.pid"
|
||||||
|
if [ -f "''${PIDFILE}" ]; then
|
||||||
|
PID=$(cat "''${PIDFILE}")
|
||||||
|
kill "''${PID}" 2>/dev/null || true
|
||||||
|
rm -f "''${PIDFILE}"
|
||||||
|
echo "==> VM stopped."
|
||||||
|
else
|
||||||
|
${pkgs.libvirt}/bin/virsh destroy "''${VM_NAME}" 2>/dev/null || true
|
||||||
|
echo "==> VM destroyed."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
ssh_vm() {
|
||||||
|
exec ssh -p "''${VM_PORT}" -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "testrunner@localhost" "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Main dispatch
|
||||||
|
case "''${1:-help}" in
|
||||||
|
build) build_vm ;;
|
||||||
|
start) start_vm ;;
|
||||||
|
stop) stop_vm ;;
|
||||||
|
destroy) stop_vm; rm -f "''${VM_IMAGE}"; echo "==> VM deleted." ;;
|
||||||
|
ssh) shift; ssh_vm "$@" ;;
|
||||||
|
*)
|
||||||
|
echo "Usage: pr-test-vm {build|start|stop|destroy|ssh}"
|
||||||
|
echo ""
|
||||||
|
echo " build — build the NixOS VM derivation"
|
||||||
|
echo " start — boot the VM (create image if needed)"
|
||||||
|
echo " stop — graceful VM shutdown"
|
||||||
|
echo " destroy — stop + delete VM image"
|
||||||
|
echo " ssh — SSH into the running VM"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
'') ];
|
||||||
|
};
|
||||||
|
}
|
||||||
54
modules/nixos/services/wireguard-client.nix
Normal file
54
modules/nixos/services/wireguard-client.nix
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.gortium.wireguard-client;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
##### Options #####
|
||||||
|
options.gortium.wireguard-client = {
|
||||||
|
enable = mkEnableOption "WireGuard VPN client to lazyworkhorse VPN server";
|
||||||
|
|
||||||
|
vpnIp = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "Assigned VPN IP with CIDR, e.g. \"10.8.0.4/24\"";
|
||||||
|
example = "10.8.0.4/24";
|
||||||
|
};
|
||||||
|
|
||||||
|
privateKeyFile = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
description = "Path to the WireGuard private key (age-encrypted, via agenix)";
|
||||||
|
};
|
||||||
|
|
||||||
|
presharedKeyFile = mkOption {
|
||||||
|
type = types.nullOr types.path;
|
||||||
|
default = null;
|
||||||
|
description = "Path to the WireGuard preshared key (optional, age-encrypted)";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
##### Config #####
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
networking.wireguard.interfaces = {
|
||||||
|
wg0 = {
|
||||||
|
ips = [ cfg.vpnIp ];
|
||||||
|
privateKeyFile = cfg.privateKeyFile;
|
||||||
|
|
||||||
|
peers = [
|
||||||
|
{
|
||||||
|
# Server public key (lazyworkhorse wg-easy)
|
||||||
|
publicKey = "rY9zII3AOm8rog2rv02PyA3Bq7zdvTOGkZapfCV1DkE=";
|
||||||
|
presharedKeyFile = cfg.presharedKeyFile;
|
||||||
|
# Split-tunnel: only route the VPN subnet
|
||||||
|
allowedIPs = [ "10.8.0.0/24" ];
|
||||||
|
endpoint = "vpn.lazyworkhorse.net:51820";
|
||||||
|
persistentKeepalive = 25;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [ wireguard-tools ];
|
||||||
|
};
|
||||||
|
}
|
||||||
19
patches/0008-panel-cwu50-fix-init-seq1.patch
Normal file
19
patches/0008-panel-cwu50-fix-init-seq1.patch
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
--- a/drivers/gpu/drm/panel/panel-cwu50.c
|
||||||
|
+++ b/drivers/gpu/drm/panel/panel-cwu50.c
|
||||||
|
@@ -58,5 +58,8 @@
|
||||||
|
dcs_write_seq(0x72,0x06);
|
||||||
|
dcs_write_seq(0x75,0x03);
|
||||||
|
+ /* DSI_INIT0: set 4 lanes (bits[1:0]=11) */
|
||||||
|
+ dcs_write_seq(0x80,0x03);
|
||||||
|
dcs_write_seq(0xE0,0x01);
|
||||||
|
+
|
||||||
|
dcs_write_seq(0x00,0x00);
|
||||||
|
dcs_write_seq(0x01,0x47);//VCOM0x47
|
||||||
|
@@ -721,6 +723,6 @@
|
||||||
|
dsi->lanes = 4;
|
||||||
|
dsi->format = MIPI_DSI_FMT_RGB888;
|
||||||
|
- dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
|
||||||
|
+ dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
|
||||||
|
|
||||||
|
ctx->id_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_IN);
|
||||||
|
if (IS_ERR(ctx->id_gpio)) {
|
||||||
1
result
Symbolic link
1
result
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
/nix/store/z86r4awsbrc5q9qhwwi757wxixcqgn31-nixos-system-uConsole-25.11.20260608.e820eb4
|
||||||
1
result-uconsole
Symbolic link
1
result-uconsole
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
/nix/store/7y7rfksqcf5smz59jjixyl56bxq50j9g-nixos-system-uConsole-25.11.20260608.e820eb4
|
||||||
10
secrets/gortium_password.age
Normal file
10
secrets/gortium_password.age
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA4MlFz
|
||||||
|
SHFjYjJMVHRlTWNGVGI2bHQxc0xRd2tlaExlM0NFMWhlbkR2bVg0CkxxenVTaXkr
|
||||||
|
eWxybDdCeUM0ejRvZWI4cFZCWm5VczRvZkNnT0d5Y1oyYmsKLT4gK1NmRzVtLWdy
|
||||||
|
ZWFzZSB3UDI6TyNaCnF4Ylk0QWduaXZxRFBFbDBOZ0dxeGxiWTVCYjRtZTJBRkFC
|
||||||
|
YU5qaytYWWI4OWl1K1FSdXNlY2JXZjkzak9tTHkKVFlCRlRqY1FVSzFmNS9yZmxF
|
||||||
|
aEUxelUwNEpKN3VXYi9KUWN4bXFscm5oUEFOajhRZDlERWVYcFgvQQotLS0gK1JI
|
||||||
|
VERTQjB6d1k3NDQwbjNveXBqcFk1WE96cHlaTTVkTWRMZENPamFJZwpcT1CP/KvU
|
||||||
|
CsunvfX9RBlSSKuw4eem9N9s3JqJNj4FRQizNx6QzlE1vSME
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
10
secrets/home_wifi.age
Normal file
10
secrets/home_wifi.age
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
|
||||||
|
YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
|
||||||
|
V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
|
||||||
|
Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
|
||||||
|
aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
|
||||||
|
cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
|
||||||
|
TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
|
||||||
|
KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
@@ -8,6 +8,8 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
"containers.env.age".publicKeys = authorizedKeys;
|
"containers.env.age".publicKeys = authorizedKeys;
|
||||||
|
"gortium_password.age".publicKeys = authorizedKeys;
|
||||||
|
"home_wifi.age".publicKeys = authorizedKeys;
|
||||||
"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;
|
||||||
|
|||||||
@@ -22,7 +22,6 @@
|
|||||||
# - NO access to infra repo (no bind mount)
|
# - NO access to infra repo (no bind mount)
|
||||||
# - NO sudo access (no nh, nixos-rebuild, nixpkgs-fmt, nix)
|
# - NO sudo access (no nh, nixos-rebuild, nixpkgs-fmt, nix)
|
||||||
# WORKFLOW: SSH from Hermes container, run docker benchmarks, return and save results to /opt/data/ai-optimizer/
|
# WORKFLOW: SSH from Hermes container, run docker benchmarks, return and save results to /opt/data/ai-optimizer/
|
||||||
services.aiWorkerAccess = true;
|
|
||||||
|
|
||||||
# Restricted sudo for ai-worker - security checks only
|
# Restricted sudo for ai-worker - security checks only
|
||||||
security.sudo.extraRules = [
|
security.sudo.extraRules = [
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
{ pkgs, inputs, config, keys, ... }: {
|
{ pkgs, inputs, config, keys, ... }: {
|
||||||
|
home-manager.extraSpecialArgs = { inherit (config.networking) hostName; dotfiles = ../../assets/dotfiles; };
|
||||||
|
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"];
|
||||||
@@ -9,6 +11,8 @@
|
|||||||
nh
|
nh
|
||||||
];
|
];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
|
passwordFile = config.age.secrets.gortium_password.path;
|
||||||
|
ignoreShellProgramCheck = true;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
keys.users.gortium.main
|
keys.users.gortium.main
|
||||||
];
|
];
|
||||||
65
users/gortium/home.nix
Normal file
65
users/gortium/home.nix
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
{ pkgs, lib, config, inputs, hostName, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
dotfiles = ../../assets/dotfiles;
|
||||||
|
isUconsole = hostName == "uConsole";
|
||||||
|
in {
|
||||||
|
home.username = "gortium";
|
||||||
|
home.homeDirectory = "/home/gortium";
|
||||||
|
home.stateVersion = "23.11";
|
||||||
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
|
home.file = {
|
||||||
|
# tmux
|
||||||
|
".tmux.conf".source = "${dotfiles}/tmux/.tmux.conf";
|
||||||
|
|
||||||
|
# kitty
|
||||||
|
".config/kitty/kitty.conf".source = "${dotfiles}/kitty/.config/kitty/kitty.conf";
|
||||||
|
|
||||||
|
# nvim
|
||||||
|
".config/nvim/init.lua".source = "${dotfiles}/nvim/.config/nvim/init.lua";
|
||||||
|
|
||||||
|
# starship
|
||||||
|
".config/starship.toml".source = "${dotfiles}/starship/.config/starship.toml";
|
||||||
|
|
||||||
|
# btop
|
||||||
|
".config/btop/btop.conf".source = "${dotfiles}/btop/.config/btop/btop.conf";
|
||||||
|
|
||||||
|
# waybar
|
||||||
|
".config/waybar/style.css".source = "${dotfiles}/waybar/.config/waybar/style.css";
|
||||||
|
".config/waybar/config.jsonc".source = "${dotfiles}/waybar/.config/waybar/config.jsonc";
|
||||||
|
|
||||||
|
# wofi
|
||||||
|
".config/wofi/style.css".source = "${dotfiles}/wofi/.config/wofi/style.css";
|
||||||
|
".config/wofi/config".source = "${dotfiles}/wofi/.config/wofi/config";
|
||||||
|
|
||||||
|
# yazi
|
||||||
|
".config/yazi/yazi.toml".source = "${dotfiles}/yazi/.config/yazi/yazi.toml";
|
||||||
|
|
||||||
|
# hyprland — common config
|
||||||
|
".config/hypr/hyprland.conf".source = "${dotfiles}/hypr/.config/hypr/hyprland.conf";
|
||||||
|
".config/hypr/hypridle.conf".source = "${dotfiles}/hypr/.config/hypr/hypridle.conf";
|
||||||
|
".config/hypr/hyprlock.conf".source = "${dotfiles}/hypr/.config/hypr/hyprlock.conf";
|
||||||
|
".config/hypr/hyprpaper.conf".source = "${dotfiles}/hypr/.config/hypr/hyprpaper.conf";
|
||||||
|
".config/hypr/mocha.conf".source = "${dotfiles}/hypr/.config/hypr/mocha.conf";
|
||||||
|
|
||||||
|
# hyprland — host-specific monitor config
|
||||||
|
".config/hypr/host/monitors.conf".source =
|
||||||
|
if isUconsole
|
||||||
|
then "${dotfiles}/hypr/.config/hypr/hosts/uconsole.conf"
|
||||||
|
else "${dotfiles}/hypr/.config/hypr/hosts/laptop.conf";
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
git zsh tmux starship
|
||||||
|
neovim kitty
|
||||||
|
btop yazi ripgrep fd fzf
|
||||||
|
] ++ lib.optionals (!isUconsole) [
|
||||||
|
waybar wofi swww hyprshot
|
||||||
|
] ++ lib.optionals isUconsole [
|
||||||
|
brightnessctl
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.zsh.enable = true;
|
||||||
|
programs.starship.enable = true;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user