Compare commits
163 Commits
fix/backup
...
uconsole-f
| Author | SHA1 | Date | |
|---|---|---|---|
| ecbf226b01 | |||
| 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 | |||
| 36359de6aa | |||
|
|
10b8565fd6 | ||
|
|
f672696b8e | ||
| 0980dca455 | |||
| 96bc20ab70 | |||
| 670ae4f002 | |||
| f785abfd49 | |||
| 6f44aa7f76 | |||
| 8d40f1691f | |||
|
|
2dd2e64986 | ||
|
|
23fc5e0597 | ||
| 0c9c33d735 | |||
| 0bb6890f1c | |||
| 9d5434425f | |||
| 1fb4320dd1 | |||
| 51e9f47fd4 | |||
| 06b3eb840f | |||
| 28ab52209c | |||
|
|
e6f7f0c263 | ||
|
|
5c136e0765 | ||
|
|
f722af7803 | ||
|
|
c07debf088 | ||
| 6806898f04 | |||
| 96e77c5ef2 | |||
| ff7303cf6a | |||
| 9e42f5d2cc | |||
| 614883f3c3 | |||
| 374d022593 | |||
| 9679846cdb | |||
| 4056f91ec6 | |||
| 1ba7d31d2f | |||
| c7e9f8a1e0 | |||
| bbe1a4a850 | |||
| 2b8316060c | |||
| cc2c62faf7 | |||
| 47f1ba6cf2 | |||
| db89881d75 | |||
| 0bb0a270e6 | |||
| 41256ccbde | |||
| e551f0e5c5 | |||
| b11d599f37 | |||
| 782f2fa9ed | |||
| 2e14069584 | |||
| c53460c400 | |||
|
|
ee96593e3d | ||
|
|
030125ab01 | ||
|
|
5935747902 | ||
|
|
9ae0f6ad62 | ||
| 5c481d664a | |||
| 94a7c7195a | |||
| cf279c4fb0 | |||
| b9289a149d | |||
| e0068260cb | |||
| a42b2ff65d | |||
| 92bcf1cc04 | |||
| 7d0b72a513 | |||
| 48245518a1 | |||
| 1673a56439 | |||
|
|
7d3d072961 | ||
| 4cceab05d0 | |||
| bcebf18676 | |||
| 0370d784a0 | |||
| 260b2d2756 | |||
| 2477acdfc7 | |||
| 81c25d3f20 | |||
| 9b1f467db9 | |||
| 65fa778b2b | |||
| 5d3bbe99f3 | |||
|
|
bcf5cadaa0 | ||
| 3e04ccc1e8 | |||
| 21bd4bb283 | |||
| 7994aad8d8 | |||
| f0e21d95e4 | |||
| 18df45819d | |||
| 1ca58d3da3 | |||
| 0ca7a74653 |
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -1,3 +1,7 @@
|
||||
[submodule "assets/compose"]
|
||||
path = assets/compose
|
||||
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
|
||||
|
||||
@@ -5,6 +5,7 @@ This document outlines the development conventions for this NixOS-based infrastr
|
||||
## Build & Deployment
|
||||
|
||||
- **Build/Deploy:** Use `nixos-rebuild switch --flake .#<hostname>` to build and deploy the configuration for a specific host.
|
||||
- **CRITICAL — Validate before pushing:** Always `nix build --no-link '.#nixosConfigurations.<hostname>.config.system.build.toplevel'` (or `nh os build`) and confirm it succeeds before pushing any changes. Never push untested NixOS configs.
|
||||
- **Development Shell:** Activate the development environment with `nix develop`.
|
||||
|
||||
## Linting & Formatting
|
||||
|
||||
Submodule assets/compose updated: fb0f2cbe84...dab158da0a
1
assets/dotfiles
Submodule
1
assets/dotfiles
Submodule
Submodule assets/dotfiles added at f45387456b
148
flake.lock
generated
148
flake.lock
generated
@@ -23,6 +23,22 @@
|
||||
"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": false,
|
||||
"locked": {
|
||||
@@ -37,6 +53,21 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -58,6 +89,27 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
@@ -144,6 +196,80 @@
|
||||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1705033721,
|
||||
@@ -176,6 +302,22 @@
|
||||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1774386573,
|
||||
@@ -211,8 +353,12 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"home-manager": "home-manager_2",
|
||||
"lix": "lix",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixos-raspberrypi": "nixos-raspberrypi",
|
||||
"nixos-uconsole": "nixos-uconsole",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-uconsole": "nixpkgs-uconsole"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
||||
207
flake.nix
207
flake.nix
@@ -12,10 +12,26 @@
|
||||
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
||||
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
|
||||
system = "x86_64-linux";
|
||||
keys = import ./lib/keys.nix;
|
||||
@@ -30,56 +46,151 @@
|
||||
pkgs = import nixpkgs {
|
||||
inherit system overlays;
|
||||
config.allowUnfree = true;
|
||||
config.permittedInsecurePackages = [
|
||||
"openclaw-2026.3.12"
|
||||
];
|
||||
config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||
};
|
||||
|
||||
devShell = import ./shells/nix_dev.nix {
|
||||
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
|
||||
./users/gortium.nix
|
||||
./users/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
|
||||
];
|
||||
};
|
||||
};
|
||||
devShells.${system}.default = devShell;
|
||||
# Cross-compile overlay fixes for Hyprland and deps on aarch64
|
||||
uconsoleCrossOverlay = final: prev: {
|
||||
libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
|
||||
libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
|
||||
libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
|
||||
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 = prev.gjs.overrideAttrs (old: {
|
||||
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;
|
||||
|
||||
# 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" ];
|
||||
|
||||
# Garbage collection
|
||||
@@ -36,7 +36,7 @@
|
||||
"transparent_hugepage=always" # because mucho ram
|
||||
];
|
||||
# 2. Load the specific drivers found by sensors-detect
|
||||
boot.kernelModules = [ "nct6775" "lm96163" ];
|
||||
boot.kernelModules = [ "nct6775" "lm96163" "iptable_nat" "iptable_filter" ];
|
||||
# 3. Force the nct6775 driver to recognize the chip if it's stubborn
|
||||
boot.extraModprobeConfig = ''
|
||||
options nct6775 force_id=0xd280
|
||||
@@ -49,6 +49,14 @@
|
||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
networking.hostId = "deadbeef";
|
||||
|
||||
# WireGuard VPN client -- module, always up, connects to wg-easy server
|
||||
gortium.wireguard-client = {
|
||||
enable = true;
|
||||
vpnIp = "10.8.0.3/24";
|
||||
privateKeyFile = config.age.secrets.wireguard_private_key.path;
|
||||
presharedKeyFile = config.age.secrets.wireguard_preshared_key.path;
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/Montreal";
|
||||
|
||||
@@ -158,7 +166,7 @@
|
||||
settings = {
|
||||
PasswordAuthentication = false;
|
||||
KbdInteractiveAuthentication = false;
|
||||
PermitRootLogin = "prohibit-password";
|
||||
# Additional hardening settings below in SERVER HARDENING section
|
||||
};
|
||||
hostKeys = [
|
||||
{
|
||||
@@ -187,6 +195,7 @@
|
||||
ai = {
|
||||
path = self + "/assets/compose/ai";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
ports = [ 22000 ]; # Syncthing TCP sync
|
||||
};
|
||||
|
||||
cloudstorage = {
|
||||
@@ -221,6 +230,11 @@
|
||||
path = self + "/assets/compose/homepage";
|
||||
};
|
||||
|
||||
vpn = {
|
||||
path = self + "/assets/compose/vpn";
|
||||
envFile = config.age.secrets.containers_env.path;
|
||||
};
|
||||
|
||||
# tak = {
|
||||
# path = self + "/assets/compose/tak";
|
||||
# };
|
||||
@@ -264,6 +278,20 @@
|
||||
mode = "0440";
|
||||
path = "/run/secrets/openclaw_gateway_token";
|
||||
};
|
||||
wireguard_private_key = {
|
||||
file = ../../secrets/wireguard_private_key.age;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0400";
|
||||
path = "/run/secrets/wireguard_private_key";
|
||||
};
|
||||
wireguard_preshared_key = {
|
||||
file = ../../secrets/wireguard_preshared_key.age;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0400";
|
||||
path = "/run/secrets/wireguard_preshared_key";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -308,6 +336,203 @@
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# =============================================================================
|
||||
# SERVER HARDENING - Firewall, Fail2ban, SSH, Kernel
|
||||
# =============================================================================
|
||||
|
||||
# Firewall - default deny, explicit allow
|
||||
networking.firewall = {
|
||||
# Enable firewall with default deny policy (NixOS firewall denies all by default)
|
||||
enable = true;
|
||||
allowPing = true;
|
||||
|
||||
# Only essential ports exposed to internet
|
||||
allowedTCPPorts = [
|
||||
2424 # SSH (non-standard port)
|
||||
2222 # Gitea (version control)
|
||||
80 # HTTP (Traefik redirect)
|
||||
443 # HTTPS (Traefik)
|
||||
# 8000 # Portainer - REVIEW: internal only?
|
||||
# 4242 # Coms - REVIEW: internal only?
|
||||
# 5000 # TAK API - REVIEW: internal only?
|
||||
# 8087 # TAK Connect - REVIEW: internal only?
|
||||
# 8089 # TAK Management - REVIEW: internal only?
|
||||
];
|
||||
|
||||
allowedUDPPorts = [
|
||||
51820 # WireGuard VPN
|
||||
];
|
||||
|
||||
# Rate limiting and attack prevention
|
||||
extraCommands = ''
|
||||
# 1. Wipe the INPUT chain clean at the start of every activation
|
||||
iptables -F INPUT
|
||||
|
||||
# Rate limit SSH connections (max 20 new connections per 60 seconds)
|
||||
iptables -A INPUT -p tcp --dport 2424 -m state --state NEW -m recent --set
|
||||
iptables -A INPUT -p tcp --dport 2424 -m state --state NEW -m recent --update --seconds 60 --hitcount 20 -j DROP
|
||||
|
||||
# Rate limit HTTP/HTTPS (protects Traefik)
|
||||
iptables -A INPUT -p tcp --dport 80 -m state --state NEW -m limit --limit 25/minute --limit-burst 100 -j ACCEPT
|
||||
iptables -A INPUT -p tcp --dport 443 -m state --state NEW -m limit --limit 25/minute --limit-burst 100 -j ACCEPT
|
||||
|
||||
# Drop invalid packets
|
||||
iptables -A INPUT -m state --state INVALID -j DROP
|
||||
|
||||
# Log dropped packets (rate limited)
|
||||
iptables -A INPUT -m limit --limit 5/min -j LOG --log-prefix "IPTables-Dropped: " --log-level 4
|
||||
|
||||
# 3. CRITICAL: Re-link the NixOS default firewall chain
|
||||
# Without this line, the 'allowedTCPPorts' in your Nix config will be ignored!
|
||||
iptables -A INPUT -j nixos-fw
|
||||
'';
|
||||
};
|
||||
|
||||
# Fail2ban - automatic IP banning
|
||||
services.fail2ban = {
|
||||
enable = true;
|
||||
maxretry = 3;
|
||||
bantime = "1h";
|
||||
banaction = "iptables-multiport";
|
||||
|
||||
jails = {
|
||||
# SSH brute force protection (uses systemd journal backend)
|
||||
sshd = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "sshd";
|
||||
port = "2424";
|
||||
maxretry = 3;
|
||||
bantime = "1h";
|
||||
};
|
||||
};
|
||||
|
||||
# Recidive - ban repeat offenders for 1 week
|
||||
recidive = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "recidive";
|
||||
logpath = "/var/log/fail2ban.log";
|
||||
bantime = "1w";
|
||||
findtime = "1d";
|
||||
maxretry = 3;
|
||||
};
|
||||
};
|
||||
|
||||
# HTTP authentication failures (Traefik)
|
||||
http-auth = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "traefik-auth";
|
||||
port = "80,443";
|
||||
logpath = "/var/log/traefik/access.log";
|
||||
maxretry = 5;
|
||||
bantime = "1h";
|
||||
};
|
||||
};
|
||||
|
||||
# HTTP scanning/attacks (Traefik)
|
||||
http-botsearch = {
|
||||
enabled = true;
|
||||
settings = {
|
||||
filter = "traefik-botsearch";
|
||||
port = "80,443";
|
||||
logpath = "/var/log/traefik/access.log";
|
||||
maxretry = 2;
|
||||
bantime = "2h";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Custom fail2ban filters for Traefik
|
||||
environment.etc."fail2ban/filter.d/traefik-auth.conf".text = ''
|
||||
[Definition]
|
||||
failregex = ^<HOST> -.*"(GET|POST|HEAD|PUT|DELETE).*" (401|403) \d+.*$
|
||||
ignoreregex =
|
||||
'';
|
||||
|
||||
environment.etc."fail2ban/filter.d/traefik-botsearch.conf".text = ''
|
||||
[Definition]
|
||||
failregex = ^<HOST> -.*"(GET|POST|HEAD|PUT|DELETE).*" 404 \d+.*$
|
||||
^<HOST> -.*"(GET|POST|HEAD|PUT|DELETE).*/(\.|wp-|php|admin|login|xmlrpc|\.env|\.git|\.aws|\.azure).*" \d+.*$
|
||||
ignoreregex =
|
||||
'';
|
||||
|
||||
# SSH hardening
|
||||
services.openssh.settings = {
|
||||
PermitRootLogin = "no";
|
||||
MaxAuthTries = 3;
|
||||
MaxSessions = 20;
|
||||
LoginGraceTime = 30;
|
||||
ClientAliveInterval = 300;
|
||||
ClientAliveCountMax = 2;
|
||||
PermitEmptyPasswords = "no";
|
||||
ChallengeResponseAuthentication = "no";
|
||||
UsePAM = true;
|
||||
LogLevel = "VERBOSE";
|
||||
X11Forwarding = false;
|
||||
AllowTcpForwarding = "no";
|
||||
AllowAgentForwarding = "no";
|
||||
PermitTunnel = "no";
|
||||
};
|
||||
|
||||
# Kernel network hardening
|
||||
boot.kernel.sysctl = {
|
||||
# IP Spoofing protection
|
||||
"net.ipv4.conf.all.rp_filter" = 1;
|
||||
"net.ipv4.conf.default.rp_filter" = 1;
|
||||
|
||||
# Ignore ICMP broadcasts
|
||||
"net.ipv4.icmp_echo_ignore_broadcasts" = 1;
|
||||
|
||||
# Disable source routing
|
||||
"net.ipv4.conf.all.accept_source_route" = 0;
|
||||
"net.ipv4.conf.default.accept_source_route" = 0;
|
||||
"net.ipv6.conf.all.accept_source_route" = 0;
|
||||
"net.ipv6.conf.default.accept_source_route" = 0;
|
||||
|
||||
# Disable redirects
|
||||
"net.ipv4.conf.all.send_redirects" = 0;
|
||||
"net.ipv4.conf.default.send_redirects" = 0;
|
||||
|
||||
# SYN flood protection
|
||||
"net.ipv4.tcp_syncookies" = 1;
|
||||
"net.ipv4.tcp_max_syn_backlog" = 2048;
|
||||
"net.ipv4.tcp_synack_retries" = 2;
|
||||
"net.ipv4.tcp_syn_retries" = 5;
|
||||
|
||||
# Log martian packets
|
||||
"net.ipv4.conf.all.log_martians" = 1;
|
||||
"net.ipv4.conf.default.log_martians" = 1;
|
||||
|
||||
# Ignore redirects
|
||||
"net.ipv4.conf.all.accept_redirects" = 0;
|
||||
"net.ipv4.conf.default.accept_redirects" = 0;
|
||||
"net.ipv4.conf.all.secure_redirects" = 0;
|
||||
"net.ipv4.conf.default.secure_redirects" = 0;
|
||||
"net.ipv6.conf.all.accept_redirects" = 0;
|
||||
"net.ipv6.conf.default.accept_redirects" = 0;
|
||||
|
||||
# Connection tuning
|
||||
"net.core.somaxconn" = 4096;
|
||||
"net.core.netdev_max_backlog" = 65536;
|
||||
"net.ipv4.tcp_max_orphans" = 65536;
|
||||
"net.ipv4.tcp_fin_timeout" = 15;
|
||||
"net.ipv4.tcp_keepalive_time" = 300;
|
||||
"net.ipv4.tcp_keepalive_probes" = 5;
|
||||
"net.ipv4.tcp_keepalive_intvl" = 15;
|
||||
};
|
||||
|
||||
# Audit logging
|
||||
security.auditd.enable = true;
|
||||
|
||||
# Fail2ban log directory
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/log/fail2ban 0755 root root -"
|
||||
"d /var/log/traefik 0755 root root -"
|
||||
];
|
||||
|
||||
# Copy the NixOS configuration file and link it from the resulting system
|
||||
# (/run/current-system/configuration.nix). This is useful in case you
|
||||
# accidentally delete configuration.nix.
|
||||
|
||||
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";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
105
modules/nixos/security/README-ai-worker.md
Normal file
105
modules/nixos/security/README-ai-worker.md
Normal file
@@ -0,0 +1,105 @@
|
||||
# AI Worker Restricted Access
|
||||
|
||||
This module provides SSH access for the AI worker (hermes-agent) to run ollama benchmarks on the host.
|
||||
|
||||
## Security Model
|
||||
|
||||
The `ai-worker` user has:
|
||||
|
||||
### Filesystem Access
|
||||
- **Home directory**: `/home/ai-worker` (standard user home)
|
||||
- **No bind mounts**: Cannot access `/home/gortium/infra` or other host files
|
||||
- **Cannot access**: Any files outside standard system paths
|
||||
|
||||
### Sudo Access
|
||||
- **NONE**: ai-worker has no sudo privileges
|
||||
- Cannot run `nh`, `nixos-rebuild`, `nixpkgs-fmt`, or `nix` with elevated permissions
|
||||
|
||||
### Docker Access
|
||||
- Member of `docker` group - can run `docker` and `docker exec` commands
|
||||
- Primary use: `docker exec ollama ollama ...` for benchmarking
|
||||
- Can run `docker exec --privileged ollama rocm-smi ...` for VRAM monitoring
|
||||
|
||||
## Workflow: SSH + Docker Benchmarking
|
||||
|
||||
The AI worker connects from the Hermes container to the host via SSH, runs ollama benchmarks, then returns to save results.
|
||||
|
||||
### Example Workflow
|
||||
|
||||
```bash
|
||||
# From Hermes container, SSH to host
|
||||
ssh -i /path/to/ssh/key ai-worker@host.docker.internal
|
||||
|
||||
# On host, run ollama benchmarks via docker
|
||||
docker exec ollama ollama pull devstral-small-2:24b
|
||||
|
||||
# Create test modelfile
|
||||
docker exec ollama bash -c 'cat <<EOF > /root/.ollama/test.modelfile
|
||||
FROM devstral-small-2:24b
|
||||
PARAMETER num_ctx 65536
|
||||
PARAMETER num_gpu 99
|
||||
PARAMETER flash_attn true
|
||||
EOF'
|
||||
|
||||
# Create and test model
|
||||
docker exec ollama ollama create test-model -f /root/.ollama/test.modelfile
|
||||
docker exec ollama ollama run test-model "Write a Python async function"
|
||||
|
||||
# Check VRAM usage
|
||||
docker exec --privileged ollama rocm-smi --showmeminfo vram
|
||||
|
||||
# Cleanup
|
||||
docker exec ollama ollama rm test-model
|
||||
|
||||
# Exit SSH, return to Hermes container
|
||||
exit
|
||||
|
||||
# Save results in Hermes container
|
||||
# /opt/data/ai-optimizer/state.json
|
||||
# /opt/data/ai-optimizer/results.csv
|
||||
```
|
||||
|
||||
## SSH Access
|
||||
|
||||
Connect as:
|
||||
```bash
|
||||
ssh ai-worker@lazyworkhorse
|
||||
```
|
||||
|
||||
The working directory will be `/home/ai-worker`. No infra repo access.
|
||||
|
||||
## Verification
|
||||
|
||||
Check ai-worker permissions:
|
||||
```bash
|
||||
# On the host, as root or gortium:
|
||||
sudo -u ai-worker sudo -l
|
||||
# Should show: no sudo access
|
||||
|
||||
# Check docker group membership
|
||||
groups ai-worker
|
||||
# Should show: ai-worker docker
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
If ai-worker cannot run docker commands:
|
||||
```bash
|
||||
# Check docker group membership
|
||||
groups ai-worker
|
||||
|
||||
# Verify ollama container is running
|
||||
docker ps | grep ollama
|
||||
|
||||
# Test docker access
|
||||
sudo -u ai-worker docker exec ollama ollama list
|
||||
```
|
||||
|
||||
If SSH connection fails:
|
||||
```bash
|
||||
# Check SSH key is authorized
|
||||
cat /home/ai-worker/.ssh/authorized_keys
|
||||
|
||||
# Check SSH service
|
||||
systemctl status sshd
|
||||
```
|
||||
17
modules/nixos/security/ai-worker-restricted.nix
Normal file
17
modules/nixos/security/ai-worker-restricted.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options.services.aiWorkerAccess = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = "Enable AI worker SSH access with docker group membership for ollama benchmarking";
|
||||
};
|
||||
|
||||
config = mkIf config.services.aiWorkerAccess {
|
||||
# ai-worker is member of docker group - can run docker commands via SSH
|
||||
# No bind mounts, no sudo access - docker-only for ollama benchmarking
|
||||
users.groups.docker.members = [ "ai-worker" ];
|
||||
};
|
||||
}
|
||||
5
modules/nixos/services/default.nix
Normal file
5
modules/nixos/services/default.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
imports = [
|
||||
./systemd
|
||||
];
|
||||
}
|
||||
@@ -1,45 +1,87 @@
|
||||
{ pkgs, ... }: {
|
||||
systemd.services.init-ollama-model = {
|
||||
description = "Initialize LLM models with extra context in Ollama Docker";
|
||||
after = [ "docker-ollama.service" ];
|
||||
|
||||
# On s'assure que Docker tourne avant de lancer ce script
|
||||
after = [ "docker.service" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
script = ''
|
||||
# Wait for Ollama
|
||||
while ! ${pkgs.curl}/bin/curl -s http://localhost:11434/api/tags > /dev/null; do
|
||||
sleep 2
|
||||
done
|
||||
# Fonction de création asynchrone pour ne pas bloquer le démarrage
|
||||
(
|
||||
echo "Starting asynchronous Ollama initialization..."
|
||||
|
||||
# Attente d'Ollama (maximum 120 secondes pour éviter une boucle infinie)
|
||||
TIMEOUT=60
|
||||
COUNT=0
|
||||
while ! ${pkgs.curl}/bin/curl -s -f http://127.0.0.1:11434/api/tags > /dev/null; do
|
||||
if [ $COUNT -ge $TIMEOUT ]; then
|
||||
echo "Ollama did not become ready in time. Exiting."
|
||||
exit 1
|
||||
fi
|
||||
echo "Waiting for Ollama API to be reachable..."
|
||||
sleep 5
|
||||
COUNT=$((COUNT + 5))
|
||||
done
|
||||
|
||||
create_model_if_missing() {
|
||||
local model_name=$1
|
||||
local base_model=$2
|
||||
if ! ${pkgs.docker}/bin/docker exec ollama ollama list | grep -q "$model_name"; then
|
||||
echo "$model_name not found, creating from $base_model..."
|
||||
${pkgs.docker}/bin/docker exec ollama sh -c "cat <<EOF > /root/.ollama/$model_name.modelfile
|
||||
create_model_if_missing() {
|
||||
local model_name=$1
|
||||
local base_model=$2
|
||||
|
||||
# Vérification robuste via l'API HTTP d'Ollama plutôt que docker exec (évite les conflits de tty)
|
||||
if ! ${pkgs.curl}/bin/curl -s http://127.0.0.1:11434/api/tags | ${pkgs.jq}/bin/jq -e ".models[] | select(.name == \"$model_name\")" > /dev/null; then
|
||||
echo "$model_name not found, creating from $base_model..."
|
||||
|
||||
# Utilisation d'un fichier temporaire sur l'hôte pour l'injecter proprement dans Docker
|
||||
TMP_FILE=$(mktemp)
|
||||
cat <<EOF > "$TMP_FILE"
|
||||
FROM $base_model
|
||||
TEMPLATE """{{- if .System }}
|
||||
[SYSTEM_PROMPT]
|
||||
{{ .System }}
|
||||
[/SYSTEM_PROMPT]
|
||||
{{- end }}
|
||||
{{- range .Messages }}
|
||||
{{- if eq .Role "user" }}
|
||||
[INST]
|
||||
{{ .Content }}
|
||||
[/INST]
|
||||
{{- else if eq .Role "assistant" }}
|
||||
{{ .Content }}
|
||||
{{- end }}
|
||||
{{- end }}"""
|
||||
PARAMETER num_ctx 131072
|
||||
PARAMETER num_predict 4096
|
||||
PARAMETER num_keep 1024
|
||||
PARAMETER repeat_penalty 1.1
|
||||
PARAMETER top_k 40
|
||||
PARAMETER stop \"[INST]\"
|
||||
PARAMETER stop \"[/INST]\"
|
||||
PARAMETER stop \"</s>\"
|
||||
EOF"
|
||||
${pkgs.docker}/bin/docker exec ollama ollama create "$model_name" -f "/root/.ollama/$model_name.modelfile"
|
||||
else
|
||||
echo "$model_name already exists, skipping."
|
||||
fi
|
||||
}
|
||||
PARAMETER stop "[INST]"
|
||||
PARAMETER stop "[/INST]"
|
||||
PARAMETER stop "</s>"
|
||||
EOF
|
||||
|
||||
# Create Nemotron
|
||||
create_model_if_missing "nemotron-3-nano:30b-128k" "nemotron-3-nano:30b"
|
||||
|
||||
# Create Devstral
|
||||
create_model_if_missing "devstral-small-2:24b-128k" "devstral-small-2:24b"
|
||||
# Copie et création dans le conteneur
|
||||
${pkgs.docker}/bin/docker cp "$TMP_FILE" ollama:/tmp/model.modelfile
|
||||
${pkgs.docker}/bin/docker exec ollama ollama create "$model_name" -f /tmp/model.modelfile
|
||||
${pkgs.docker}/bin/docker exec ollama rm /tmp/model.modelfile
|
||||
rm -f "$TMP_FILE"
|
||||
else
|
||||
echo "$model_name already exists, skipping."
|
||||
fi
|
||||
}
|
||||
|
||||
# Create Nemotron
|
||||
create_model_if_missing "nemotron-3-nano:30b-128k" "nemotron-3-nano:30b"
|
||||
|
||||
# Create Devstral
|
||||
create_model_if_missing "devstral-small-2:24b-128k" "devstral-small-2:24b"
|
||||
|
||||
) &
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
Type = "forking"; # Permet à systemd de savoir que le script passe en arrière-plan via '&'
|
||||
User = "root";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
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
|
||||
@@ -1,34 +1,36 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBOL29w
|
||||
eGk1N2xxTHJtaUEvWWZmbkh1bk11Tjk3anNnMDB1cCtPYUMzdTNJCkdhQ08vblNG
|
||||
UlV1K2xVTGZVTzFWYXAzcjZaMWs0RTFWdStKSmlSTURvK1EKLT4gLC1zKU8zVkgt
|
||||
Z3JlYXNlIFUiXFcpS302IHByVn5jOy0gRDMKQjV3SHpDWUIybGFyQUg3ZlR0R2hV
|
||||
eWM3SFlCVW5mdlpBVUF3a0xpNlZCeGNUd1oxTTlkc1RkTXdZS0lFTmN3Ci0tLSA3
|
||||
VlBqM1VLWllZc0JnOTMvUFRjMU13OTdzMmhsdGJubkk5eGpERVVLYUk4Cnzh5UbU
|
||||
FlgqpM8jkJ6XlsaIDCw/G3D6uJ/GRJW4gIekuhAUxpZJrc8eOA8ZuHfGrBbH3acV
|
||||
tVafX5F0Kr2oOblqZ6gduZOUS52KmWH8stiBJM+e5ZZ7zRQVE4PJUKUPCzi+WdcH
|
||||
zr295T//FOdicrYHdsjfziKEHzBtUCFiATW05+O2zMjYjO6cPzePcCzPWinwiID6
|
||||
V+f6ngfkkQaj3wBGkzaieQJzRcdSwky21aVhGCCX/bvqx61iW2d5QAKxGbtQ2RcG
|
||||
X1okr+xunAM94nzDMv46vyN97KxY7cZd4pAaOxoICc2Tfhtw6F+iS6QkQh1odJzO
|
||||
7ZH+sSQCvndG+8z9shXGiHalASF5tdguM+JlEvAGljcaiAUtsQWxr9CoWiEkC6c6
|
||||
NCaECSYO8Il+SXBQnSZSGJSNDhuPYCYrsjXGSAONFixuyeslAkq9x2WUaUS4H063
|
||||
1QvRF7XO2tBPtgCLsSjdiGp0h+ImUaGdu6fDR7zrDsGsaAFCSFeH/rGNNXRQ2vP2
|
||||
CSfPfDDCqpUSCn0WuA30BtaPLxGmZT6OjFevKzYMNDmdeq9ia/q8K0hmjLUBdN3k
|
||||
tdYWbwoaf4gYbUWxSleD768b0Jgxss9Vod+sFQ+NYRksdGIeyND+aQIc312XehfA
|
||||
qHFBS8nlj7eUF5bdvCYQ64z741mH4cNlGxyjPBH1x8FHnEOocJXYt1l2AZSRJmJA
|
||||
c3z0QGXyuCbsrLBXWK1EKa/Juo4PGGsEVoLRhwJAQy9+i1JN0yrfRvSPyzvD4px6
|
||||
wRPzlZ80MQdb2lv84WS/zcOEZmZzlLntszTRRdIfAsuaavP2Rquh4rEXABYeTZwp
|
||||
5dem79s8bdW2nFsGMNz1OQKQwocyjYu1jJMHu6Gp7Ngdl1xyW7xfg0dezE1c0cIh
|
||||
xt1aLER9YJp4n5to5cOH16l3mjDHnAvABx38xE9loNL3399J/evw7LxpTYQ4v2Xv
|
||||
x8xnDHcqJ+deFSwyuUnMS5DkUeYuHmUl0Q2WYcfY+ibCmcgCb2ObTtuN1/ZxNYrL
|
||||
OKrnmfuSvBgyuIOj5e6uWW0+Zs8dHKXu2TgV8WignxOhl5zQgCpCBlqVfO0t+NCu
|
||||
Gi26hU/fhGWQ/1oQa3VkpGsypZbJpgQvfWxfcGHP/MMhnl01zzlP8/aexSY3pAxf
|
||||
fz9v0IVh6xxtu3zbiiVzUsXbfG7t+xY98jMphf4AS2mWva3GWVmhhu0lS3J3P+go
|
||||
YEEP4rOFHeU0Y1/6kLydTXvz4jMH0H92XQIzshd7vzQnEJPUPAzqRmw3LKYGgCI+
|
||||
wZEnxJ6ckqTkGBFnxTpy9LLllwmnz2Ky87nY3XAmqxlhb2Ap1XFAlfgszmGjc+Il
|
||||
KkIgoWQHTUm6QM9ta++oUTIDneOvxGd0zZsqoEhiC/7E01BNNZ6E58TeJU3fDlA3
|
||||
mX6n05XjwPRpgXZfayPoAgBlZc2H4KeiynxwNZ/dWu7qz7L6Ppk6Nvtly8giTbFx
|
||||
CA+tto7vq+D+CAEJ4bgyq4BCH4GL4APrhPcWp98Mko1WCiRTIKgkZxQCYvlg/LZq
|
||||
LNhMacP9T1qTvNC+yR1NEMiegE3APzk6CkDpVaO9+5f/sqifNPINCMothenI9ePw
|
||||
zjQLI3Mo1m73bkomytUZ7i1VstP5sEZ5LF72Sq7BpR3oQ3Gp0CAN9w==
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSBWNEpt
|
||||
cGFNeVBBaDRqb3pLSEZGQW0wb3VmVnBoZCswUFkzbnBLUnJ0QTNrClRqVkk4RUVO
|
||||
d29KYjd5YUcwankvaTFmVHUxQVpDT2ZYWHRaY3JXTUtQMU0KLT4gKXBtQ3UsXi1n
|
||||
cmVhc2UgNnwxYCBXVyA/KCQmIHt9NAo3OTZVUHR2UXkvaEFwY0ZBdEJsaFpsbHJ0
|
||||
cklKcDVHcEdWMEdPSkpnN0FiRU43RW5hUWFMdjR3WFRRSFBLSGlmClM3cTNJWlNM
|
||||
TExkdHdXUHJISkNIaE1TTUxUc1NUWkV1a09HeFU3bVZwQXMKLS0tIGhOcXFTUElS
|
||||
azJJNnEreUhMWTJBaVZGSTJPRUFqQkVYS01KRENUVVpZSDgK8+8onFejroBo7MeO
|
||||
dW+so4lOsq4zJKn3f0cxmCFg1f0X8zt6h4Uc3A5Cvr1uU+6yw1FWmJ7xa3jJz3lO
|
||||
EEaKQJXYC+xIIKGcA7qILa0SFp4a/4OuYjcg27HrlPhg7u5wDhQrd0LdVEe1Xngp
|
||||
ZivX7P7HwIna3X8C+TL+K2v/AG2N/z86cdKfRvxyMKNbHhYw+CfHEnWgh8tJ++4h
|
||||
G9evNniuNqte6cQaRe7jODfPNW4FuY/Sb7barlJ/M9iAQdYAdyLAzU1LABeHeUfD
|
||||
wtHjxy9DUZ55Vg8bB8M2JJU9MkoRT4ewiVd9LeC1GWeVmKsm93wsmrov714i7U2j
|
||||
wHtDkjqEF2MmzuQc18sjNaAHiwz8j6o5xU2L/Q4+Q707yISWG7RGZYh389Cr1rnw
|
||||
siUq/Vunqw2wk13+J/4vu9nqt5mMktBaCtp+QiWIurjwB5LUAyChrSm+dg5lb0Mt
|
||||
UhSc0lq1+E3vxAXM2Hmk+vP86VD+6WJvAU82VFApF1s6zG2FU1/AcOVVf54nan/q
|
||||
f+rgSFfASHQCYSblUJHyEtwLNsWEmTGmOEn1buUKD/H0zatPQnc0rYpjlx2V0Sjd
|
||||
6yB5+wPrZ0AkN1pjcsPKOv8Kaog2DzqIjib+SaSTaRxWHQEb9uzvaReAcYI5HOpE
|
||||
gkC040HN33BItATbo4+hz70Im8Ni/VXD+g6yzM6Hj1hJL+PinTKeg5keQRFIZjMx
|
||||
grzievB2wVBBgLgN3qMdTFmpplaL7iL702JjXZUTTK9Izp+9wiCsV1fTa53FWDht
|
||||
ylFL5SWElqXjK+QBXxAe+Jk6VQov5HI21YDXL67S554ABeRok23wxrQ31TCI4xq9
|
||||
PQV7VtNRjyVud7S29m3OwpWOsgTZhn+JclHj2v4bNJzJkJnZRTmcvGPktzRI5+R4
|
||||
e5vxVhGnJDzI71txaHl8+xS1lu9VzCQUrxX6TXyTRV4KjIOz0g06JOBgmBRBvJca
|
||||
7MZbC65xpisl/gyLRbgkVga3t94dPV+dpZsn8eq6427IyRbKslJefatggR9//c6I
|
||||
5N5fl0fR3gJQMB+HRbipBH2YsdbdWJyb4Nn6STZxIfrqoG/xC6C1raF0xK7hUx6i
|
||||
4DUDSPohM8fOIswQPfE+FH3eygfzu/Ln5+ghsgHTEhgFvmgMvyxaAt6kHIzIUhMX
|
||||
M3dASr4VPDpIXuXsRWwYLEifhzxsuvwVxfwtsnCaR6XKijsYECWGDdYOWHdleeqx
|
||||
wDPhxEesfFVhKxhrKY9Ir8k9/FFBKQU/3GjW4+SMAg5Al1YEzxshP9vKuVcsei7W
|
||||
JDwAwotNXaCm6NBckiyZJE53ou6+gckPY7V9cOfnuH74Z9ywkFzB3HW3ZlonaGyM
|
||||
oGmLGcccavFtyhg5s/As4i6X8ARIpDiwe59Pn3GNXMctySqIrrr2ogUoXgrfFCie
|
||||
6GOTdeMW7GeOSdJUxCofghlspS/nq01Og77VI/beWYrIwLubSka6Zaltww9zgObk
|
||||
/FGEMgFkEpq7iyCvYSPA8F46pJKvnMP3S84AWCPmcTcHeg4lwGPvs6btexXBGdoz
|
||||
nkCyq7wdH5Nngm7jUbl88LtaLZPAQkuqXphBVTnrF9Ofbnb4iRZ2Op4xpx9rGyvx
|
||||
mO6UEhL6V1i2YZFNkNMg/W8aoMiUgBdqbkxaxblT9L0aNdlFU9+LbWYolURVEadd
|
||||
Qjv0Z1gMA+tsuBbVszwsMfneZ5+B9Q==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
|
||||
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
|
||||
{
|
||||
"containers.env.age".publicKeys = authorizedKeys;
|
||||
"gortium_password.age".publicKeys = authorizedKeys;
|
||||
"home_wifi.age".publicKeys = authorizedKeys;
|
||||
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
||||
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
||||
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
||||
|
||||
9
secrets/wireguard_preshared_key.age
Normal file
9
secrets/wireguard_preshared_key.age
Normal file
@@ -0,0 +1,9 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA3VG9Z
|
||||
MVFPVFc2VVJ3d0h0dmtBUnI3WHl2SzUxTkRZbjFCaGloWmV3dnd3ClcxdnVPeGd6
|
||||
SU4zR0Q0K1dtVjRRVHd0VW5XSFI0dVFpTjZnYk1DNjRxTVEKLT4gQzlgRy1ncmVh
|
||||
c2UKeUozOWgyUytSTVF0NjY2STBEb2VadwotLS0gblI3bmJCUWxxU3QrYTEyVFBI
|
||||
Snc4NC9rTkh0NnZYbUtxUE9hRWRkelpmMAq58fmH6cK13GeD7wGLxKmx10hmJeW4
|
||||
b7KqnCD1ZP7uG85s32xzVRwRG8RrG4xZo5nR9Mrtg1CoTSFfUGeFnf5xveN+Ej0X
|
||||
wDVB1LwC+Q==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
11
secrets/wireguard_private_key.age
Normal file
11
secrets/wireguard_private_key.age
Normal file
@@ -0,0 +1,11 @@
|
||||
-----BEGIN AGE ENCRYPTED FILE-----
|
||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSA5dzVG
|
||||
WUNvT3NlRmcrWS81bzJqSWlTekVYaDFFTE10SkI2dEgzaGpxcUI4Cmk5Y0FGYTRZ
|
||||
K0NGYzY3VUp4aS9ZZGRmWTgybDJFUURva2pZNmVOS3QxdEUKLT4gPnVRTCtldGMt
|
||||
Z3JlYXNlCk04OTJZeFRNeDI5aGpMVTk1ZTE0Y2FMMnFEMjlJalJpMHRlaTE4ZWIx
|
||||
d2lCRGQ5RHVjcktOMGJCb1VERlNWcTYKaSt0L1Z6dVJ0QWIyZkhsYzFEVjZSQWUr
|
||||
ZWpwVlo1TmhoUFJZdkEvR0gxNlVhcXF2ZTRnCi0tLSBLcmM2MThNVkdWclpHUXRr
|
||||
VTF6QVk2WUZlTXpZMVNLMlpBOFc3M1o5WjZzCs9xbPlIX+u5vRSQ/z9utu+I9S2c
|
||||
02DOsIb1kzxzb1OK91b8Kh4JucQSq3qkyEvRucsNn5QW8hIHDnRuND6EbPyN7p4S
|
||||
YB/F0dxSqgnq
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
@@ -1,14 +0,0 @@
|
||||
{ pkgs, inputs, config, keys, ... }: {
|
||||
users.users.ai-worker = {
|
||||
isSystemUser = true;
|
||||
group = "ai-worker";
|
||||
home = "/home/ai-worker";
|
||||
createHome = true;
|
||||
extraGroups = [ "docker" ];
|
||||
shell = pkgs.bashInteractive;
|
||||
openssh.authorizedKeys.keys = [
|
||||
keys.users.ai-worker.main
|
||||
];
|
||||
};
|
||||
users.groups.ai-worker = {};
|
||||
}
|
||||
92
users/ai-worker/ai-worker.nix
Normal file
92
users/ai-worker/ai-worker.nix
Normal file
@@ -0,0 +1,92 @@
|
||||
{ pkgs, inputs, config, keys, ... }: {
|
||||
users.users.ai-worker = {
|
||||
isSystemUser = true;
|
||||
group = "ai-worker";
|
||||
home = "/home/ai-worker";
|
||||
createHome = true;
|
||||
extraGroups = [ "docker" ];
|
||||
shell = pkgs.bashInteractive;
|
||||
openssh.authorizedKeys.keys = [
|
||||
keys.users.ai-worker.main
|
||||
];
|
||||
# No password login - SSH key only
|
||||
hashedPassword = "!";
|
||||
};
|
||||
users.groups.ai-worker = {};
|
||||
|
||||
# Enable restricted AI worker SSH access for ollama benchmarking
|
||||
# SECURITY: ai-worker can only:
|
||||
# - SSH into host from Hermes container
|
||||
# - Run docker commands (docker exec ollama ...) via docker group
|
||||
# - Run specific security audit commands
|
||||
# - NO access to infra repo (no bind mount)
|
||||
# - 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/
|
||||
|
||||
# Restricted sudo for ai-worker - security checks only
|
||||
security.sudo.extraRules = [
|
||||
{
|
||||
users = [ "ai-worker" ];
|
||||
commands = [
|
||||
# Firewall checks
|
||||
{
|
||||
command = "/run/wrappers/bin/sudo iptables -L -n -v";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/wrappers/bin/sudo iptables -S";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Fail2ban status
|
||||
{
|
||||
command = "/run/current-system/sw/bin/fail2ban-client status";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/fail2ban-client status *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/fail2ban-client get * banned";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Log inspection
|
||||
{
|
||||
command = "/run/current-system/sw/bin/journalctl -t kernel -n 100";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/journalctl -u fail2ban -n 50";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/journalctl -u firewall -n 50";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# SSH config verification
|
||||
{
|
||||
command = "/run/current-system/sw/bin/sshd -T";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Docker service checks
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker ps";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/docker inspect *";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
# Network diagnostics
|
||||
{
|
||||
command = "/run/current-system/sw/bin/ss -tlnp";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
{
|
||||
command = "/run/current-system/sw/bin/cat /proc/net/tcp";
|
||||
options = [ "NOPASSWD" ];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
@@ -1,4 +1,6 @@
|
||||
{ pkgs, inputs, config, keys, ... }: {
|
||||
home-manager.extraSpecialArgs = { inherit (config.networking) hostName; dotfiles = ../../assets/dotfiles; };
|
||||
home-manager.users.gortium = import ./home.nix;
|
||||
users.users.gortium = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "docker" "video" "render"];
|
||||
@@ -6,9 +8,10 @@
|
||||
packages = with pkgs; [
|
||||
tree
|
||||
btop
|
||||
nh
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
passwordFile = config.age.secrets.gortium_password.path;
|
||||
ignoreShellProgramCheck = true;
|
||||
openssh.authorizedKeys.keys = [
|
||||
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