Compare commits
1 Commits
main
...
f7d85cb4f7
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f7d85cb4f7 |
169
.github/workflows/update-claurst.yml
vendored
169
.github/workflows/update-claurst.yml
vendored
@@ -1,169 +0,0 @@
|
|||||||
name: "Update claurst"
|
|
||||||
on:
|
|
||||||
repository_dispatch:
|
|
||||||
workflow_dispatch:
|
|
||||||
schedule:
|
|
||||||
- cron: "00 14 * * 1" # Every Monday at 14:00 UTC
|
|
||||||
concurrency:
|
|
||||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
|
||||||
cancel-in-progress: true
|
|
||||||
jobs:
|
|
||||||
update_claurst:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Install nix
|
|
||||||
uses: https://github.com/DeterminateSystems/nix-installer-action@main
|
|
||||||
- name: Setup Attic cache
|
|
||||||
uses: ryanccn/attic-action@v0
|
|
||||||
with:
|
|
||||||
endpoint: ${{ secrets.ATTIC_ENDPOINT }}
|
|
||||||
cache: ${{ secrets.ATTIC_CACHE }}
|
|
||||||
token: ${{ secrets.ATTIC_TOKEN }}
|
|
||||||
skip-push: "true"
|
|
||||||
- name: Get current claurst version
|
|
||||||
id: current
|
|
||||||
run: |
|
|
||||||
VERSION=$(grep 'version = ' pkgs/claurst/default.nix | head -1 | sed 's/.*version = "\(.*\)".*/\1/')
|
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
|
||||||
echo "Current version: $VERSION"
|
|
||||||
- name: Get latest claurst release
|
|
||||||
id: latest
|
|
||||||
uses: actions/github-script@v7
|
|
||||||
with:
|
|
||||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
script: |
|
|
||||||
const release = await github.rest.repos.getLatestRelease({
|
|
||||||
owner: 'Kuberwastaken',
|
|
||||||
repo: 'claurst',
|
|
||||||
});
|
|
||||||
const tag = release.data.tag_name.replace(/^v/, '');
|
|
||||||
core.setOutput('version', tag);
|
|
||||||
core.info(`Latest release: ${tag}`);
|
|
||||||
- name: Check if update needed
|
|
||||||
id: check_update
|
|
||||||
run: |
|
|
||||||
CURRENT="${{ steps.current.outputs.version }}"
|
|
||||||
LATEST="${{ steps.latest.outputs.version }}"
|
|
||||||
if [ "$CURRENT" = "$LATEST" ]; then
|
|
||||||
echo "No update needed (current: $CURRENT, latest: $LATEST)"
|
|
||||||
echo "update_needed=false" >> $GITHUB_OUTPUT
|
|
||||||
else
|
|
||||||
echo "Update needed (current: $CURRENT, latest: $LATEST)"
|
|
||||||
echo "update_needed=true" >> $GITHUB_OUTPUT
|
|
||||||
fi
|
|
||||||
- name: Update claurst if new version available
|
|
||||||
if: steps.check_update.outputs.update_needed == 'true'
|
|
||||||
id: update
|
|
||||||
run: |
|
|
||||||
NEW_VERSION="${{ steps.latest.outputs.version }}"
|
|
||||||
|
|
||||||
# Backup original file
|
|
||||||
cp pkgs/claurst/default.nix pkgs/claurst/default.nix.bak
|
|
||||||
|
|
||||||
# Update version placeholder with empty hash to compute it
|
|
||||||
sed -i "s/version = \"[^\"]*\"/version = \"$NEW_VERSION\"/" pkgs/claurst/default.nix
|
|
||||||
|
|
||||||
# Try to fetch the new src hash
|
|
||||||
echo "Computing src hash for v$NEW_VERSION..."
|
|
||||||
SRC_HASH=$(nix-prefetch-url --unpack "https://github.com/Kuberwastaken/claurst/archive/refs/tags/v$NEW_VERSION.tar.gz" 2>/dev/null | tail -1 || echo "")
|
|
||||||
|
|
||||||
if [ -z "$SRC_HASH" ]; then
|
|
||||||
echo "Failed to compute src hash, reverting"
|
|
||||||
mv pkgs/claurst/default.nix.bak pkgs/claurst/default.nix
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SRC_HASH="sha256-$SRC_HASH"
|
|
||||||
echo "New src hash: $SRC_HASH"
|
|
||||||
|
|
||||||
# Update src hash
|
|
||||||
sed -i "s|hash = \"sha256-[^\"]*\"|hash = \"$SRC_HASH\"|" pkgs/claurst/default.nix
|
|
||||||
|
|
||||||
# Compute cargoHash - this requires building
|
|
||||||
echo "Computing cargo hash..."
|
|
||||||
CARGO_HASH=$(nix build \
|
|
||||||
--no-eval-cache \
|
|
||||||
--expr "(import ./pkgs/default.nix { nixpkgs = import <nixpkgs> { }; }).mkPkgs \"x86_64-linux\" | .claurst" \
|
|
||||||
2>&1 | grep -oP 'got:\s*\K[^"]+' | head -1 || echo "")
|
|
||||||
|
|
||||||
if [ -z "$CARGO_HASH" ]; then
|
|
||||||
echo "Failed to compute cargo hash, trying with attribute substitution..."
|
|
||||||
CARGO_HASH=$(nix eval \
|
|
||||||
--impure \
|
|
||||||
--expr "
|
|
||||||
let
|
|
||||||
pkgs = import <nixpkgs> { config.allowUnsupportedSystem = true; };
|
|
||||||
claurst = import pkgs/claurst { inherit pkgs; };
|
|
||||||
in claurst.cargoHash
|
|
||||||
" 2>&1 | tail -1)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -z "$CARGO_HASH" ]; then
|
|
||||||
echo "New cargo hash: $CARGO_HASH"
|
|
||||||
sed -i "s|cargoHash = \"[^\"]*\"|cargoHash = \"$CARGO_HASH\"|" pkgs/claurst/default.nix
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f pkgs/claurst/default.nix.bak
|
|
||||||
echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
|
|
||||||
- name: Validate nix flake
|
|
||||||
if: steps.check_update.outputs.update_needed == 'true'
|
|
||||||
run: |
|
|
||||||
echo "Running nix flake check..."
|
|
||||||
nix flake check --show-trace || true
|
|
||||||
- name: Build claurst to verify changes
|
|
||||||
if: steps.check_update.outputs.update_needed == 'true'
|
|
||||||
run: |
|
|
||||||
echo "Building updated claurst package..."
|
|
||||||
nix build ".#artemision.config.environment.systemPackages" --no-eval-cache 2>&1 | tail -20 || true
|
|
||||||
- name: Generate PR body
|
|
||||||
if: steps.check_update.outputs.update_needed == 'true'
|
|
||||||
id: pr_body
|
|
||||||
run: |
|
|
||||||
cat > pr_body.md << 'EOF'
|
|
||||||
# Claurst Update
|
|
||||||
|
|
||||||
Automated claurst package update.
|
|
||||||
|
|
||||||
**Changes:**
|
|
||||||
- Version: `${{ steps.current.outputs.version }}` → `${{ steps.update.outputs.version }}`
|
|
||||||
- Source hash updated
|
|
||||||
- Cargo hash updated
|
|
||||||
|
|
||||||
Auto-generated by [update-claurst.yml][1].
|
|
||||||
|
|
||||||
[1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/update-claurst.yml
|
|
||||||
EOF
|
|
||||||
cat pr_body.md
|
|
||||||
- name: Create Pull Request
|
|
||||||
if: steps.check_update.outputs.update_needed == 'true'
|
|
||||||
uses: https://nayeonie.com/ahuston-0/create-pull-request@main
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
|
||||||
add-paths: pkgs/claurst/default.nix
|
|
||||||
body-path: pr_body.md
|
|
||||||
author: '"github-actions[bot]" <github-actions[bot]@users.noreply.github.com>'
|
|
||||||
title: "automated: Update claurst to ${{ steps.update.outputs.version }}"
|
|
||||||
commit-message: |
|
|
||||||
automated: Update claurst to ${{ steps.update.outputs.version }}
|
|
||||||
|
|
||||||
- Bumped version from ${{ steps.current.outputs.version }} to ${{ steps.update.outputs.version }}
|
|
||||||
- Updated src and cargo hashes
|
|
||||||
|
|
||||||
Auto-generated by [update-claurst.yml][1].
|
|
||||||
|
|
||||||
[1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/update-claurst.yml
|
|
||||||
branch: update-claurst
|
|
||||||
delete-branch: true
|
|
||||||
pr-labels: |
|
|
||||||
dependencies
|
|
||||||
automated
|
|
||||||
- name: Print PR result
|
|
||||||
if: steps.check_update.outputs.update_needed == 'true'
|
|
||||||
run: |
|
|
||||||
echo "Pull request created successfully"
|
|
||||||
echo "Version updated: ${{ steps.current.outputs.version }} → ${{ steps.update.outputs.version }}"
|
|
||||||
permissions:
|
|
||||||
pull-requests: write
|
|
||||||
contents: write
|
|
||||||
6
.vscode/extensions.json
vendored
6
.vscode/extensions.json
vendored
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"recommendations": [
|
"recommendations": [
|
||||||
"davidanson.vscode-markdownlint"
|
"davidanson.vscode-markdownlint"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
105
AGENTS.md
105
AGENTS.md
@@ -1,105 +0,0 @@
|
|||||||
> Note: This document was AI-generated and reviewed by a maintainer.
|
|
||||||
|
|
||||||
# AGENTS Guide for nix-dotfiles
|
|
||||||
|
|
||||||
This file is the quick-start map for coding agents working in this repository.
|
|
||||||
Use this first, then follow the linked source files for full detail.
|
|
||||||
|
|
||||||
## Purpose and Scope
|
|
||||||
|
|
||||||
- Repository type: flake-based NixOS + Home Manager dotfiles/infrastructure.
|
|
||||||
- Primary goals: safe system/user config edits, reproducible builds, and clean secrets handling.
|
|
||||||
- Default assumption: preserve existing module patterns and avoid broad refactors unless requested.
|
|
||||||
|
|
||||||
## Source of Truth
|
|
||||||
|
|
||||||
Read these files before substantial changes:
|
|
||||||
|
|
||||||
- `.github/copilot-instructions.md`: Full repository guide for structure, workflows, dynamic system generation, module patterns, and SOPS handling.
|
|
||||||
- `.github/instructions/ai-doc-attribution.instructions.md`: Markdown rule for top-of-document attribution when docs are fully AI-generated.
|
|
||||||
- `flake.nix`: Flake inputs/outputs entrypoint; system generation begins here.
|
|
||||||
- `lib/systems.nix`: Core dynamic config assembly (`genSystems`, `constructSystem`, and wrapper generators).
|
|
||||||
- `systems/<hostname>/default.nix`: Per-host parameters (users, home, sops, server role, extra modules).
|
|
||||||
- `systems/<hostname>/configuration.nix`: Main host config.
|
|
||||||
- `modules/*.nix`: Global modules automatically imported into all systems.
|
|
||||||
- `users/<username>/home.nix` and `users/<username>/default.nix`: Home Manager and user account configuration.
|
|
||||||
- `hydra/jobs.nix` and `hydra/jobsets.nix`: CI/build orchestration details.
|
|
||||||
|
|
||||||
## Repo Mental Model
|
|
||||||
|
|
||||||
- `systems/` contains host-specific configs.
|
|
||||||
- `modules/` contains global modules applied across hosts.
|
|
||||||
- `users/` contains user and home-manager configs.
|
|
||||||
- `lib/systems.nix` auto-discovers hosts and composes final configs.
|
|
||||||
- SOPS secrets are colocated with hosts/users via `secrets.yaml` files.
|
|
||||||
|
|
||||||
## Dynamic Configuration Rules
|
|
||||||
|
|
||||||
- Hosts are auto-discovered from subdirectories in `systems/`.
|
|
||||||
- Each host's `default.nix` feeds `constructSystem` parameters.
|
|
||||||
- Effective module merge order matters. High-level order is: 1) base external
|
|
||||||
modules, 2) host essentials (`hardware.nix`, `configuration.nix`), 3)
|
|
||||||
host-specific modules from `systems/<host>/default.nix`, 4) global
|
|
||||||
`modules/*.nix`, 5) optional SOPS and Home Manager/user layers.
|
|
||||||
- Global modules load after host config, so explicit overrides may require `lib.mkForce` depending on target option.
|
|
||||||
|
|
||||||
## Editing Conventions
|
|
||||||
|
|
||||||
- Keep changes minimal and scoped to the requested behavior.
|
|
||||||
- Preserve existing Nix style and option naming patterns.
|
|
||||||
- Prefer module options + `lib.mkIf` toggles over hard-coded behavior.
|
|
||||||
- Use `lib.mkDefault` for soft defaults and `lib.mkForce` only when necessary.
|
|
||||||
- Do not commit plaintext secrets.
|
|
||||||
- Update docs when behavior/workflow changes.
|
|
||||||
|
|
||||||
## Validation and Workflow
|
|
||||||
|
|
||||||
Typical local sequence:
|
|
||||||
|
|
||||||
1. Make targeted edits.
|
|
||||||
2. Evaluate and build with `nix flake check` and `nix build .#<hostname>`.
|
|
||||||
3. Optionally deploy/apply with `nh os switch` or `nh home switch`.
|
|
||||||
4. For secrets-related changes, edit with `sops .../secrets.yaml` and validate expected `config.sops.secrets` evaluation paths.
|
|
||||||
|
|
||||||
## Secrets and Safety
|
|
||||||
|
|
||||||
- Secrets live in `systems/<hostname>/secrets.yaml` and `users/<username>/secrets.yaml`.
|
|
||||||
- Use SOPS for create/edit/rekey operations.
|
|
||||||
- During merge conflicts in encrypted files, prefer repository SOPS merge tooling (`utils/sops-mergetool.sh`, `utils/sops-mergetool-new.sh`).
|
|
||||||
|
|
||||||
## Agent and Tool Routing
|
|
||||||
|
|
||||||
When a specialized agent is available, route work by intent:
|
|
||||||
|
|
||||||
- `Explore`: Fast read-only repository exploration and Q&A.
|
|
||||||
- `dependency-auditor`: Flake/module dependency security and CVE-oriented audits.
|
|
||||||
- `security-researcher`: Read-only server security configuration audits.
|
|
||||||
- `server-architect`: Server integration/review planning for `palatine-hill` style infra changes.
|
|
||||||
|
|
||||||
Use Nix lookup tooling for package/options discovery; prefer `unstable` channel when channel selection is available.
|
|
||||||
|
|
||||||
## Where To Look Next (By Task)
|
|
||||||
|
|
||||||
- Add a new host: see `.github/copilot-instructions.md` sections on "Adding a New NixOS System", plus `systems/<new-host>/default.nix`, `hardware.nix`, and `configuration.nix`.
|
|
||||||
- Add/modify a global capability: see `modules/*.nix` and the `.github/copilot-instructions.md` section "Adding a Global Module to modules/".
|
|
||||||
- Change user/home-manager behavior: see `users/<username>/home.nix` and `users/<username>/default.nix`.
|
|
||||||
- Modify build/release automation: see `hydra/jobs.nix` and `hydra/jobsets.nix`.
|
|
||||||
- Work with secrets: see `.sops.yaml`, `systems/*/secrets.yaml`, `users/*/secrets.yaml`, and the `.github/copilot-instructions.md` section "Secrets Management".
|
|
||||||
- Validate module composition/debug evaluation: see `lib/systems.nix` and `nix eval .#nixosConfigurations.<host>...`.
|
|
||||||
|
|
||||||
## Documentation Attribution Rule
|
|
||||||
|
|
||||||
For Markdown docs (`**/*.md`):
|
|
||||||
|
|
||||||
- If a document is fully AI-generated, include explicit attribution near the top.
|
|
||||||
- Accepted label includes "AI-generated documentation" wording.
|
|
||||||
- Do not imply fully human authorship for fully AI-authored content.
|
|
||||||
|
|
||||||
## Quick Command Reference
|
|
||||||
|
|
||||||
- `nh os build`
|
|
||||||
- `nh os switch`
|
|
||||||
- `nh home switch`
|
|
||||||
- `nix build .#<hostname>`
|
|
||||||
- `nix flake check`
|
|
||||||
- `nix eval .#nixosConfigurations.<hostname>.config.<path>`
|
|
||||||
10
flake.nix
10
flake.nix
@@ -164,23 +164,19 @@
|
|||||||
lib = self;
|
lib = self;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
packageSetup = import ./pkgs/default.nix { inherit nixpkgs; };
|
|
||||||
inherit (packageSetup) localPackagesOverlay;
|
|
||||||
inherit (lib.adev.systems) genSystems getImages;
|
inherit (lib.adev.systems) genSystems getImages;
|
||||||
inherit (self) outputs; # for hydra
|
inherit (self) outputs; # for hydra
|
||||||
in
|
in
|
||||||
rec {
|
rec {
|
||||||
inherit lib; # for allowing use of custom functions in nix repl
|
inherit lib; # for allowing use of custom functions in nix repl
|
||||||
|
|
||||||
overlays.default = localPackagesOverlay;
|
|
||||||
|
|
||||||
hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; };
|
hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; };
|
||||||
formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt);
|
formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt);
|
||||||
|
|
||||||
nixosConfigurations = genSystems inputs outputs src (src + "/systems");
|
nixosConfigurations = genSystems inputs outputs src (src + "/systems");
|
||||||
homeConfigurations = {
|
homeConfigurations = {
|
||||||
"alice" = inputs.home-manager.lib.homeManagerConfiguration {
|
"alice" = inputs.home-manager.lib.homeManagerConfiguration {
|
||||||
pkgs = packageSetup.mkPkgs "x86_64-linux";
|
pkgs = import nixpkgs { system = "x86_64-linux"; };
|
||||||
modules = [
|
modules = [
|
||||||
inputs.stylix.homeModules.stylix
|
inputs.stylix.homeModules.stylix
|
||||||
inputs.sops-nix.homeManagerModules.sops
|
inputs.sops-nix.homeManagerModules.sops
|
||||||
@@ -207,7 +203,9 @@
|
|||||||
qcow = getImages nixosConfigurations "qcow";
|
qcow = getImages nixosConfigurations "qcow";
|
||||||
};
|
};
|
||||||
|
|
||||||
packages = forEachSystem packageSetup.mkPackages;
|
packages.x86_64-linux.lego-latest =
|
||||||
|
nixpkgs.legacyPackages.x86_64-linux.callPackage ./pkgs/lego-latest/default.nix
|
||||||
|
{ };
|
||||||
|
|
||||||
checks = import ./checks.nix { inherit inputs forEachSystem formatter; };
|
checks = import ./checks.nix { inherit inputs forEachSystem formatter; };
|
||||||
devShells = import ./shell.nix { inherit inputs forEachSystem checks; };
|
devShells = import ./shell.nix { inherit inputs forEachSystem checks; };
|
||||||
|
|||||||
@@ -172,7 +172,6 @@ rec {
|
|||||||
modules = [
|
modules = [
|
||||||
inputs.nixos-modules.nixosModule
|
inputs.nixos-modules.nixosModule
|
||||||
inputs.nix-index-database.nixosModules.nix-index
|
inputs.nix-index-database.nixosModules.nix-index
|
||||||
{ nixpkgs.overlays = [ outputs.overlays.default ]; }
|
|
||||||
(genHostName hostname)
|
(genHostName hostname)
|
||||||
(configPath + "/hardware.nix")
|
(configPath + "/hardware.nix")
|
||||||
(configPath + "/configuration.nix")
|
(configPath + "/configuration.nix")
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
libnotify,
|
libnotify,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
maintainers = import ../maintainers.nix;
|
|
||||||
bins = [
|
bins = [
|
||||||
jq
|
jq
|
||||||
bitwarden-cli
|
bitwarden-cli
|
||||||
@@ -65,7 +64,6 @@ stdenv.mkDerivation {
|
|||||||
description = "Wrapper for Bitwarden and Rofi";
|
description = "Wrapper for Bitwarden and Rofi";
|
||||||
homepage = "https://github.com/mattydebie/bitwarden-rofi";
|
homepage = "https://github.com/mattydebie/bitwarden-rofi";
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3;
|
||||||
maintainers = [ maintainers.alice ];
|
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,52 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
fetchFromGitHub,
|
|
||||||
rustPlatform,
|
|
||||||
pkg-config,
|
|
||||||
openssl,
|
|
||||||
alsa-lib,
|
|
||||||
dbus,
|
|
||||||
libxkbcommon,
|
|
||||||
libxcb,
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
maintainers = import ../maintainers.nix;
|
|
||||||
in
|
|
||||||
rustPlatform.buildRustPackage rec {
|
|
||||||
pname = "claurst";
|
|
||||||
version = "0.0.9";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "Kuberwastaken";
|
|
||||||
repo = "claurst";
|
|
||||||
rev = "v${version}";
|
|
||||||
hash = "sha256-bTQHtZGZxhEAki0JxSC8smAC3w+otm8ubHvZ9MvwDaE=";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoRoot = "src-rust";
|
|
||||||
cargoHash = "sha256-6+B43spqmUZ983YMl5UBH5647DcUOS2ngw5ChMIPFFo=";
|
|
||||||
buildAndTestSubdir = "src-rust";
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
pkg-config
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
openssl
|
|
||||||
alsa-lib
|
|
||||||
dbus
|
|
||||||
libxkbcommon
|
|
||||||
libxcb
|
|
||||||
];
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Terminal coding agent written in Rust";
|
|
||||||
homepage = "https://github.com/Kuberwastaken/claurst";
|
|
||||||
license = licenses.gpl3Only;
|
|
||||||
mainProgram = "claurst";
|
|
||||||
maintainers = [ maintainers.alice ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
{ nixpkgs }:
|
|
||||||
let
|
|
||||||
localPackagesOverlay = final: _prev: {
|
|
||||||
lego-latest = final.callPackage ./lego-latest/default.nix { };
|
|
||||||
claurst = final.callPackage ./claurst/default.nix { };
|
|
||||||
};
|
|
||||||
|
|
||||||
mkPkgs =
|
|
||||||
system:
|
|
||||||
import nixpkgs {
|
|
||||||
inherit system;
|
|
||||||
overlays = [ localPackagesOverlay ];
|
|
||||||
};
|
|
||||||
|
|
||||||
mkPackages =
|
|
||||||
system:
|
|
||||||
let
|
|
||||||
pkgs = mkPkgs system;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit (pkgs)
|
|
||||||
lego-latest
|
|
||||||
claurst
|
|
||||||
;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit
|
|
||||||
localPackagesOverlay
|
|
||||||
mkPkgs
|
|
||||||
mkPackages
|
|
||||||
;
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
alice = {
|
|
||||||
name = "Alice Huston";
|
|
||||||
email = "aliceghuston@gmail.com";
|
|
||||||
github = "ahuston-0";
|
|
||||||
githubId = 43225907;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -9,7 +9,6 @@
|
|||||||
./acme.nix
|
./acme.nix
|
||||||
./attic
|
./attic
|
||||||
./docker
|
./docker
|
||||||
./garage.nix
|
|
||||||
./gitea.nix
|
./gitea.nix
|
||||||
./firewall.nix
|
./firewall.nix
|
||||||
./haproxy
|
./haproxy
|
||||||
|
|||||||
@@ -50,7 +50,6 @@ frontend ContentSwitching
|
|||||||
acl host_minio hdr(host) -i minio.alicehuston.xyz
|
acl host_minio hdr(host) -i minio.alicehuston.xyz
|
||||||
acl host_minio_console hdr(host) -i minio-console.alicehuston.xyz
|
acl host_minio_console hdr(host) -i minio-console.alicehuston.xyz
|
||||||
acl host_attic hdr(host) -i attic.nayeonie.com
|
acl host_attic hdr(host) -i attic.nayeonie.com
|
||||||
acl host_s3 hdr(host) -i s3.nayeonie.com
|
|
||||||
acl host_minio hdr(host) -i minio.nayeonie.com
|
acl host_minio hdr(host) -i minio.nayeonie.com
|
||||||
acl host_minio_console hdr(host) -i minio-console.nayeonie.com
|
acl host_minio_console hdr(host) -i minio-console.nayeonie.com
|
||||||
#acl host_nextcloud_vol hdr(host) -i nextcloud-vol.alicehuston.xyz
|
#acl host_nextcloud_vol hdr(host) -i nextcloud-vol.alicehuston.xyz
|
||||||
@@ -68,7 +67,6 @@ frontend ContentSwitching
|
|||||||
use_backend nextcloud_nodes if host_nextcloud
|
use_backend nextcloud_nodes if host_nextcloud
|
||||||
use_backend hydra_nodes if host_hydra
|
use_backend hydra_nodes if host_hydra
|
||||||
use_backend attic_nodes if host_attic
|
use_backend attic_nodes if host_attic
|
||||||
use_backend garage_nodes if host_s3
|
|
||||||
#use_backend nextcloud_vol_nodes if host_nextcloud_vol
|
#use_backend nextcloud_vol_nodes if host_nextcloud_vol
|
||||||
# use_backend collabora_nodes if host_collabora
|
# use_backend collabora_nodes if host_collabora
|
||||||
use_backend prometheus_nodes if host_prometheus
|
use_backend prometheus_nodes if host_prometheus
|
||||||
@@ -144,10 +142,6 @@ backend minio_console_nodes
|
|||||||
mode http
|
mode http
|
||||||
server server 192.168.76.2:8501
|
server server 192.168.76.2:8501
|
||||||
|
|
||||||
backend garage_nodes
|
|
||||||
mode http
|
|
||||||
server server 192.168.76.2:8502
|
|
||||||
|
|
||||||
# backend foundry_nodes
|
# backend foundry_nodes
|
||||||
# timeout tunnel 50s
|
# timeout tunnel 50s
|
||||||
# mode http
|
# mode http
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
vars = import ./vars.nix;
|
|
||||||
basePath = "${vars.primary_minio}/garage";
|
|
||||||
in
|
|
||||||
{
|
|
||||||
services.garage = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.garage;
|
|
||||||
logLevel = "info";
|
|
||||||
settings = {
|
|
||||||
metadata_dir = "${basePath}/meta";
|
|
||||||
data_dir = "${basePath}/data";
|
|
||||||
db_engine = "sqlite";
|
|
||||||
replication_factor = 1;
|
|
||||||
|
|
||||||
rpc_bind_addr = "127.0.0.1:8504";
|
|
||||||
rpc_public_addr = "127.0.0.1:8504";
|
|
||||||
rpc_secret_file = config.sops.secrets."garage/rpc-secret".path;
|
|
||||||
|
|
||||||
s3_api = {
|
|
||||||
api_bind_addr = "127.0.0.1:8502";
|
|
||||||
s3_region = "us-east-1";
|
|
||||||
root_domain = ".s3.nayeonie.com";
|
|
||||||
};
|
|
||||||
|
|
||||||
admin = {
|
|
||||||
api_bind_addr = "127.0.0.1:8503";
|
|
||||||
admin_token_file = config.sops.secrets."garage/admin-token".path;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d ${basePath}/meta 0750 garage garage -"
|
|
||||||
"d ${basePath}/data 0750 garage garage -"
|
|
||||||
];
|
|
||||||
|
|
||||||
sops.secrets = {
|
|
||||||
"garage/rpc-secret" = { };
|
|
||||||
"garage/admin-token" = { };
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -42,9 +42,6 @@ server-validation:
|
|||||||
webhook: ENC[AES256_GCM,data:Lwqy4UhyFutpXjai7EJPKp8MDlI+ayDna4T8jluvC6qkeJ7o1UaaDCOsgLy4Fw7LC77tXhJtkcmep9w37JaiHp2CoDOfy2iAaq8o9CCSi/a0zqMJx+HdZYZNemvmpc6E/be0K+JDrFZLbjr3unSpCidQ3whccC6XyY013R12swN3bFZIu1gtzXCgUZ4U,iv:pVbrRwH3ziu4+R5BfimPV7N71QmyerJEc9M5K4eofOc=,tag:zNrCXrIioQWPEPVz/wMDpQ==,type:str]
|
webhook: ENC[AES256_GCM,data:Lwqy4UhyFutpXjai7EJPKp8MDlI+ayDna4T8jluvC6qkeJ7o1UaaDCOsgLy4Fw7LC77tXhJtkcmep9w37JaiHp2CoDOfy2iAaq8o9CCSi/a0zqMJx+HdZYZNemvmpc6E/be0K+JDrFZLbjr3unSpCidQ3whccC6XyY013R12swN3bFZIu1gtzXCgUZ4U,iv:pVbrRwH3ziu4+R5BfimPV7N71QmyerJEc9M5K4eofOc=,tag:zNrCXrIioQWPEPVz/wMDpQ==,type:str]
|
||||||
typhon:
|
typhon:
|
||||||
hashedPassword: ENC[AES256_GCM,data:gMyY8gxUn3HzycQRu2cminqRFWghqWcjzZzTxAQZ5PJqn604iSwDiVdr7icHB7drJfCAfsE7L4oKRJgxaIAE32043oOkb2T7DDH8y2jxMzqmZCfbvrfMI4wdfRTHGqzxb6X/aZ5ai2rr1Q==,iv:4EsTo/lQld0o9iktDX9gobMlPUCitx1i9wn8EL16sIs=,tag:FgVDRHk2glDwpC/mprrPqQ==,type:str]
|
hashedPassword: ENC[AES256_GCM,data:gMyY8gxUn3HzycQRu2cminqRFWghqWcjzZzTxAQZ5PJqn604iSwDiVdr7icHB7drJfCAfsE7L4oKRJgxaIAE32043oOkb2T7DDH8y2jxMzqmZCfbvrfMI4wdfRTHGqzxb6X/aZ5ai2rr1Q==,iv:4EsTo/lQld0o9iktDX9gobMlPUCitx1i9wn8EL16sIs=,tag:FgVDRHk2glDwpC/mprrPqQ==,type:str]
|
||||||
garage:
|
|
||||||
rpc-secret: ENC[AES256_GCM,data:Q2ZaAXcntD3yK6DynEpxab2TITByMZ7ECVrq1pb0ZU7hXOZnhaBmjdty/Os6len8l+GBl6+WaC0An6cFkhQTlQ==,iv:E8C4bnxMLXK9fky+KC7q8sHpmrEU5un0TEAwxVUBiLk=,tag:PiSiU+9NpyilH2aMs2Qc/Q==,type:str]
|
|
||||||
admin-token: ENC[AES256_GCM,data:Xjm8Xq99aDseR0jN50Uj3gLpeDaq2IGXzJCS0o1H0RgKX9LGdP8w508nWWE=,iv:+L9T3TEUSbIz+jo08ykjGHVhuz5ecmzrlhzD2iv48HE=,tag:7P2rY4F8cWFdG4Lm9n/etQ==,type:str]
|
|
||||||
sops:
|
sops:
|
||||||
age:
|
age:
|
||||||
- recipient: age1qw5k8h72k3fjg5gmlxx8q8gwlc2k6n6u08d8hdzpm2pk9r0fnfxsmw33nh
|
- recipient: age1qw5k8h72k3fjg5gmlxx8q8gwlc2k6n6u08d8hdzpm2pk9r0fnfxsmw33nh
|
||||||
@@ -56,8 +53,8 @@ sops:
|
|||||||
cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At
|
cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At
|
||||||
LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw==
|
LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2026-05-02T16:02:29Z"
|
lastmodified: "2026-01-17T01:50:50Z"
|
||||||
mac: ENC[AES256_GCM,data:dDv33vEGVeEEeTSXZPcIG3BO0GjFOswBGUsOY+/6IJqAC8omHaSQ6hdcVaXKScC56kEn5w/494hfOOEEficJt1nGQBrnfE8u95tdBqcODtSmTWbonXgpfckX68jV7Y9iTSxisih6ciAwFToxovhiI36kLrWoeVlzs5DdfwJp1YU=,iv:jkThy/omE/9SyqfAr6ARrDYLGVhhACmSxm4EgM+Is1s=,tag:Key2xC4btvI8HqQglIcXkg==,type:str]
|
mac: ENC[AES256_GCM,data:8TGSqwEcfmrW1PjuzTVNyDTNs6s3oWbT0tI+rg7u2w5Dcw1EEU+SjJ6VpNY06AZHTjSD6E0O7NzUxybtMpslHUGitOGWwQCk+sbqRJuUseFe7bWFboEVoJpEoYGN5pnn52opMT+NeHGkXumaxjhDjCxfwn1RBHR7TgD4ZHEH6pE=,iv:szBUnn3HL/osWhmTwYmHrUghobWdBR60Lc6uUD/eGMY=,tag:6vgdJeJjL4ZYKc8WjixClg==,type:str]
|
||||||
pgp:
|
pgp:
|
||||||
- created_at: "2024-11-28T18:56:39Z"
|
- created_at: "2024-11-28T18:56:39Z"
|
||||||
enc: |-
|
enc: |-
|
||||||
@@ -72,4 +69,4 @@ sops:
|
|||||||
-----END PGP MESSAGE-----
|
-----END PGP MESSAGE-----
|
||||||
fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330
|
fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.12.2
|
version: 3.11.0
|
||||||
|
|||||||
@@ -90,7 +90,6 @@
|
|||||||
|
|
||||||
gocryptfs
|
gocryptfs
|
||||||
awscli2
|
awscli2
|
||||||
claurst
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user