mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-22 14:20:44 -06:00
Compare commits
6 commits
bee3c4b2fb
...
ac8e42d5cf
| Author | SHA1 | Date | |
|---|---|---|---|
| ac8e42d5cf | |||
dbd75eaef0
|
|||
|
56de313d42
|
|||
|
a112d3b2f2
|
|||
|
6a42bc97aa
|
|||
|
718b2d6f75
|
10 changed files with 154 additions and 62 deletions
16
.github/workflows/update.yml
vendored
16
.github/workflows/update.yml
vendored
|
|
@ -32,10 +32,16 @@ jobs:
|
|||
experimental-features = pipe-operator
|
||||
accept-flake-config = true
|
||||
|
||||
- uses: cachix/cachix-action@v15
|
||||
with:
|
||||
name: daylin
|
||||
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
||||
|
||||
- name: Install and login to attic cache
|
||||
run: |
|
||||
nix profile install "nixpkgs#attic-client"
|
||||
attic login oizys https://attic.dayl.in "${{ secrets.ATTIC_TOKEN }}"
|
||||
|
||||
# - uses: cachix/cachix-action@v15
|
||||
# with:
|
||||
# name: daylin
|
||||
# authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
|
||||
|
||||
- name: Update nix flake
|
||||
run: |
|
||||
|
|
@ -51,7 +57,7 @@ jobs:
|
|||
run: >
|
||||
nix run .
|
||||
--
|
||||
build --minimal
|
||||
cache
|
||||
--host "othalan"
|
||||
--flake .
|
||||
--debug
|
||||
|
|
|
|||
40
flake.lock
40
flake.lock
|
|
@ -363,11 +363,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730072482,
|
||||
"narHash": "sha256-3Aotvc0dFS9J2iDnrSVjjngdZcaD9ghfroVU3jl84Gk=",
|
||||
"lastModified": 1730143527,
|
||||
"narHash": "sha256-3uRuQHxAd/+8PptDpIZZlC588O0eTV1mTa+z8v4cWPU=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "6cf193e1662f6f750e964a3e174ae017246b4d48",
|
||||
"revCount": 5385,
|
||||
"rev": "d679d200299ed4670f0d0f138c793d5f507b7cec",
|
||||
"revCount": 5390,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -543,11 +543,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1730069651,
|
||||
"narHash": "sha256-DVzb3RlFOuR72K6BWMRKoJ4mfJmVOUDVjUJKQ/yXMNA=",
|
||||
"rev": "f55ed8399186c25b7d26a8c51f31ba25f5f26a50",
|
||||
"lastModified": 1730141569,
|
||||
"narHash": "sha256-wuSAcXqMRuaBihrvzVNplSM+S8fdoKGj7ubibmiUGGA=",
|
||||
"rev": "9c22a4d31b18715bcca5791fcc40089d4eca35cb",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f55ed8399186c25b7d26a8c51f31ba25f5f26a50.tar.gz?rev=f55ed8399186c25b7d26a8c51f31ba25f5f26a50"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/9c22a4d31b18715bcca5791fcc40089d4eca35cb.tar.gz?rev=9c22a4d31b18715bcca5791fcc40089d4eca35cb"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -768,11 +768,11 @@
|
|||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729717678,
|
||||
"narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=",
|
||||
"lastModified": 1730120924,
|
||||
"narHash": "sha256-I6hwd+YlgefioLfmsM04MxzbEAES1N328/T+VqhcWnQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NixOS-WSL",
|
||||
"rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41",
|
||||
"rev": "b124084667fb4c912fda68fdd9d05f59e18b6ef7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -836,11 +836,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730068416,
|
||||
"narHash": "sha256-ZblJXYHsAwAHPUnER5toHpOMtIrDAVytzzgI4B2rXJ8=",
|
||||
"lastModified": 1730229503,
|
||||
"narHash": "sha256-SYFUfTXsDeIK3q7fy6SrZ1v+lVQrEmZaKc1fpp4wuBQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "8d5faa9440349976c84b7b55d05e3e5dcfabdcc1",
|
||||
"rev": "d3bb51e62dd4a31c7cfea0f1ad511e53774a79fe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -867,11 +867,11 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1729181673,
|
||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
||||
"lastModified": 1729973466,
|
||||
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
||||
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1308,11 +1308,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730031030,
|
||||
"narHash": "sha256-U4ko9Ing1LIciLX+yIWY2wWi31jRARjTnLwkZVUKUXs=",
|
||||
"lastModified": 1730203910,
|
||||
"narHash": "sha256-/nI+D8KoVCOGSMJ+kwqLxu9X/8N3N5cWXfXJGxd5NXk=",
|
||||
"owner": "mitchellh",
|
||||
"repo": "zig-overlay",
|
||||
"rev": "1e8057e6644d4e11ec63dead68a91ba61c8d32f9",
|
||||
"rev": "686cfaa1366e0c50ce85d6e443412082f907fe3f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -49,12 +49,14 @@
|
|||
|
||||
nixConfig = {
|
||||
extra-substituters = [
|
||||
"https://attic.dayl.in/oizys"
|
||||
"https://hyprland.cachix.org"
|
||||
"https://nixpkgs-wayland.cachix.org"
|
||||
"https://daylin.cachix.org"
|
||||
# "https://cache.lix.systems"
|
||||
];
|
||||
extra-trusted-public-keys = [
|
||||
"oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
||||
"daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
|
||||
|
|
|
|||
|
|
@ -27,4 +27,20 @@ To point gitea/forgejo to the shim gitea binary for SSH I symlink the current sy
|
|||
ln -s /run/current-system/sw/bin/gitea /usr/local/bin/gitea
|
||||
```
|
||||
|
||||
## Setting up Attic
|
||||
|
||||
Generated a key using command provided in attic docs:
|
||||
```sh
|
||||
nix run nixpkgs#openssl -- genrsa -traditional 4096 | base64 -w0
|
||||
```
|
||||
And wrote `ATTIC_SERVER_TOKEN_RS256_SECRET_BASE64="output from above"` to `/etc/attic.env`
|
||||
|
||||
I generated a token to configure the caches using the following command:
|
||||
|
||||
```
|
||||
atticd-atticadm make-token --sub daylin --push "*" --pull "*" --validity '1y' --create-cache "*" --configure-cache "*" --configure-cache-retention "*" --destroy-cache "*" --delete "*"
|
||||
```
|
||||
|
||||
If I handled secrets via `sops` or `agenix` I think this could be stored directly in the repo.
|
||||
I also had to modify the firewall so that docker would forward along the requests by caddy to `host.docker.internal` correctly.
|
||||
|
||||
|
|
|
|||
58
hosts/algiz/services.nix
Normal file
58
hosts/algiz/services.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ pkgs, enabled, ... }:
|
||||
let
|
||||
atticPort = "5656";
|
||||
in
|
||||
{
|
||||
|
||||
services.resolved = enabled;
|
||||
|
||||
services.fail2ban = enabled // {
|
||||
maxretry = 5;
|
||||
bantime = "24h";
|
||||
};
|
||||
|
||||
services.openssh = enabled // {
|
||||
settings.PasswordAuthentication = false;
|
||||
};
|
||||
|
||||
security.polkit = enabled; # attic was looking for this...
|
||||
environment.systemPackages = [ pkgs.attic-client ];
|
||||
|
||||
# allow docker to forward the request to the host running attic
|
||||
# https://discourse.nixos.org/t/docker-container-not-resolving-to-host/30259/6
|
||||
networking.firewall.extraCommands = "iptables -A INPUT -p tcp --destination-port ${atticPort} -s 172.16.0.0/12 -j ACCEPT";
|
||||
services.atticd = enabled // {
|
||||
|
||||
# Replace with absolute path to your credentials file
|
||||
environmentFile = "/etc/atticd.env";
|
||||
|
||||
settings = {
|
||||
listen = "[::]:${atticPort}";
|
||||
|
||||
jwt = { };
|
||||
|
||||
# Data chunking
|
||||
#
|
||||
# Warning: If you change any of the values here, it will be
|
||||
# difficult to reuse existing chunks for newly-uploaded NARs
|
||||
# since the cutpoints will be different. As a result, the
|
||||
# deduplication ratio will suffer for a while after the change.
|
||||
chunking = {
|
||||
# The minimum NAR size to trigger chunking
|
||||
#
|
||||
# If 0, chunking is disabled entirely for newly-uploaded NARs.
|
||||
# If 1, all NARs are chunked.
|
||||
nar-size-threshold = 64 * 1024; # 64 KiB
|
||||
|
||||
# The preferred minimum size of a chunk, in bytes
|
||||
min-size = 16 * 1024; # 16 KiB
|
||||
|
||||
# The preferred average size of a chunk, in bytes
|
||||
avg-size = 64 * 1024; # 64 KiB
|
||||
|
||||
# The preferred maximum size of a chunk, in bytes
|
||||
max-size = 256 * 1024; # 256 KiB
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -2,12 +2,6 @@
|
|||
{
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
services.resolved = enabled;
|
||||
|
||||
services.fail2ban = enabled // {
|
||||
maxretry = 5;
|
||||
bantime = "24h";
|
||||
};
|
||||
|
||||
# # added to make using `pip install` work in docker build
|
||||
# networking.nameservers = [ "8.8.8.8"];
|
||||
|
|
@ -20,12 +14,6 @@
|
|||
];
|
||||
};
|
||||
|
||||
services.openssh = enabled // {
|
||||
settings.PasswordAuthentication = false;
|
||||
};
|
||||
|
||||
# users.mutableUsers = false;
|
||||
|
||||
# Use the GRUB 2 boot loader.
|
||||
boot.loader.grub = enabled // {
|
||||
device = "/dev/sda"; # or "nodev" for efi only
|
||||
|
|
|
|||
|
|
@ -10,5 +10,6 @@
|
|||
graphviz
|
||||
typst
|
||||
charm-freeze
|
||||
attic-client
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
## nix begat oizys
|
||||
import std/[os, tables, sequtils, strformat, strutils]
|
||||
import std/[os, osproc, tables, sequtils, strformat, strutils]
|
||||
import hwylterm, hwylterm/[cligen, logging]
|
||||
import oizys/[context, github, nix, overlay, logging]
|
||||
|
||||
|
|
@ -53,9 +53,9 @@ overlay:
|
|||
## nix build
|
||||
nixBuild(minimal, rest)
|
||||
|
||||
proc cache(minimal: bool = false, name: string = "daylin") =
|
||||
## build and push to cachix
|
||||
nixBuildWithCache(minimal, name, rest)
|
||||
proc cache(name: string = "oizys", service: string = "attic", jobs: int = countProcessors()) =
|
||||
## build and push store paths
|
||||
nixBuildWithCache(name, rest, service, jobs)
|
||||
|
||||
proc osCmd() =
|
||||
## nixos-rebuild
|
||||
|
|
@ -97,7 +97,8 @@ when isMainModule:
|
|||
"ref" : "git ref/branch/tag to trigger workflow on"
|
||||
}
|
||||
cacheHelp = //{
|
||||
"name" : "name of cachix binary cache"
|
||||
"name" : "name of cachix binary cache",
|
||||
"jobs" : "jobs when pushing paths"
|
||||
} // sharedHelp
|
||||
let
|
||||
osUsage = $bb("$command [[subcmd] $args\n$doc[bold]Options[/]:\n$options")
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import hwylterm
|
|||
func addArgs*(cmd: var string, args: openArray[string]) =
|
||||
cmd &= " " & args.join(" ")
|
||||
|
||||
func addArg*(cmd: var string, arg: string) =
|
||||
func addArg*(cmd: var string, arg: string ) =
|
||||
cmd &= " " & arg
|
||||
|
||||
proc runCmd*(cmd: string): int =
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@ proc writeDervationsToStepSummary(drvs: seq[string]) =
|
|||
let output = open(summaryFilePath,fmAppend)
|
||||
output.writeLine("| derivation | hash |\n|---|---|")
|
||||
output.writeLine(rows.join("\n"))
|
||||
close output
|
||||
|
||||
proc nixBuild*(minimal: bool, rest: seq[string]) =
|
||||
var cmd = nixCommand("build")
|
||||
|
|
@ -233,23 +234,42 @@ proc nixBuildHostDry*(minimal: bool, rest: seq[string]) =
|
|||
let output = parseDryRunOutput err
|
||||
display output
|
||||
|
||||
proc nixBuildWithCache*(minimal: bool, name: string, rest:seq[string]) =
|
||||
if findExe("cachix") == "": fatalQuit "is cachix installed?"
|
||||
info bbfmt"building and pushing to cache: [b]{name}"
|
||||
var cmd = "cachix"
|
||||
cmd.addArgs ["watch-exec","--"]
|
||||
cmd.addArg "nix build"
|
||||
if minimal:
|
||||
debug "populating args with derivations not built/cached"
|
||||
let drvs = systemPathDrvsToBuild()
|
||||
if drvs.len == 0:
|
||||
info "nothing to build"
|
||||
quit "exiting...", QuitSuccess
|
||||
cmd.addArgs drvs
|
||||
cmd.addArg "--no-link"
|
||||
else:
|
||||
cmd.addArgs nixosConfigAttrs()
|
||||
cmd.addArgs rest
|
||||
let err = runCmd(cmd)
|
||||
quit err
|
||||
|
||||
proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: int) =
|
||||
## build individual derivations not cached and push to cache
|
||||
if findExe(service) == "": fatalQuit fmt"is {service} installed?"
|
||||
info bbfmt"building and pushing to cache: [b]{name}"
|
||||
debug "determining missing cache hits"
|
||||
let drvs = systemPathDrvsToBuild()
|
||||
if drvs.len == 0:
|
||||
info "nothing to build"
|
||||
quit "exiting...", QuitSuccess
|
||||
|
||||
for drv in drvs:
|
||||
var cmd = "nix build"
|
||||
cmd.addArg drv
|
||||
cmd.addArgs rest
|
||||
let buildErr = runCmd(cmd)
|
||||
if buildErr != 0:
|
||||
error "failed to build: " & drv
|
||||
continue
|
||||
|
||||
let results = collect(
|
||||
for k, p in walkDir(".", relative = true):
|
||||
if k in { pcLinkToDir, pcLinkToFile} and p.startsWith("result"):
|
||||
p
|
||||
)
|
||||
|
||||
cmd = service
|
||||
cmd.addArg "push"
|
||||
cmd.addArg name
|
||||
cmd.addArg "--jobs"
|
||||
cmd.addArg $jobs
|
||||
cmd.addArgs results
|
||||
let pushErr = runCmd(cmd)
|
||||
if pushErr != 0:
|
||||
errorQuit "failed to push build to cache"
|
||||
|
||||
for p in results:
|
||||
removeFile p
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue