mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-21 21:50:43 -06:00
Compare commits
8 commits
180b97e5b3
...
f973420f29
| Author | SHA1 | Date | |
|---|---|---|---|
| f973420f29 | |||
6adc7e7f7d
|
|||
|
19f855252d
|
|||
|
290280f714
|
|||
|
16e417c38e
|
|||
|
805a4ba2f2
|
|||
| 0fe782bf7b | |||
|
2c0a9cf847
|
6 changed files with 181 additions and 22 deletions
20
flake.lock
20
flake.lock
|
|
@ -240,11 +240,11 @@
|
|||
"zig": "zig"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731606318,
|
||||
"narHash": "sha256-JXgJTl6qK8b7+g9ORH94fZ0sLCwebn8tkpxy1ZG0agA=",
|
||||
"lastModified": 1731706414,
|
||||
"narHash": "sha256-9Er1h1w6lXg6hQJnfLVacs6e+naamMyRPKijdBt8gFA=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "4853597cd9829e622be2c3628dc748407c27c423",
|
||||
"revCount": 7968,
|
||||
"rev": "7dbcde72863a09405bf456fcfc41f878330a64f9",
|
||||
"revCount": 7987,
|
||||
"type": "git",
|
||||
"url": "ssh://git@github.com/ghostty-org/ghostty"
|
||||
},
|
||||
|
|
@ -615,11 +615,11 @@
|
|||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731565875,
|
||||
"narHash": "sha256-jN6HcMNVgWPE++8vNQIyerugFDRWG1ffFCORK/vpCUs=",
|
||||
"lastModified": 1731682758,
|
||||
"narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-eval-jobs",
|
||||
"rev": "f2ccb7e2d80601fb43807c36f14703f2342420f3",
|
||||
"rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -745,11 +745,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731645556,
|
||||
"narHash": "sha256-i27WZwS0f18v+5vODBDrnO5GVlzszseDBXcLQiYr5Yo=",
|
||||
"lastModified": 1731684610,
|
||||
"narHash": "sha256-rfb93JFID/fYO7h0Yhsot6TjbUgtEJMl6Qk212cVdOY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "3a7690c5fe0ecfceeddbf09f8642dca424d29793",
|
||||
"rev": "a3fc86160dba0a9160716cf6f1d4ff4da7a53085",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
71
hosts/algiz/caddy/Caddyfile
Normal file
71
hosts/algiz/caddy/Caddyfile
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
|
||||
elizabeth-and-daylin.com {
|
||||
reverse_proxy http://localhost:4321
|
||||
}
|
||||
|
||||
elizabeth.dayl.in, www.elizabeth-and-daylin.com {
|
||||
redir https://elizabeth-and-daylin.com{uri} permanent
|
||||
}
|
||||
|
||||
git.dayl.in {
|
||||
reverse_proxy http://localhost:3000
|
||||
}
|
||||
|
||||
gts.dayl.in {
|
||||
# Optional, but recommended, compress the traffic using proper protocols
|
||||
encode zstd gzip
|
||||
|
||||
# TODO: change port?
|
||||
# The actual proxy configuration to port 8080 (unless you've chosen another port number)
|
||||
reverse_proxy * http://localhost:3758 {
|
||||
# Flush immediatly, to prevent buffered response to the client
|
||||
flush_interval -1
|
||||
}
|
||||
}
|
||||
|
||||
# not currently a running service on algiz
|
||||
# (caddy-common) {
|
||||
# encode gzip
|
||||
# header {
|
||||
# -Server
|
||||
# Strict-Transport-Security "max-age=31536000; include-subdomains;"
|
||||
# X-XSS-Protection "1; mode=block"
|
||||
# X-Frame-Options "DENY"
|
||||
# X-Content-Type-Options nosniff
|
||||
# # Referrer-Policy no-referrer-when-downgrade
|
||||
# X-Robots-Tag "none"
|
||||
# }
|
||||
# }
|
||||
#
|
||||
# lemmy.dayl.in {
|
||||
# import caddy-common
|
||||
# reverse_proxy http://lemmy-ui:1234
|
||||
#
|
||||
# @lemmy {
|
||||
# path /api/*
|
||||
# path /pictrs/*
|
||||
# path /feeds/*
|
||||
# path /nodeinfo/*
|
||||
# path /.well-known/*
|
||||
# }
|
||||
#
|
||||
# @lemmy-hdr {
|
||||
# header Accept application/*
|
||||
# }
|
||||
#
|
||||
# handle @lemmy {
|
||||
# reverse_proxy http://lemmy:8536
|
||||
# }
|
||||
#
|
||||
# handle @lemmy-hdr {
|
||||
# reverse_proxy http://lemmy:8536
|
||||
# }
|
||||
#
|
||||
# @lemmy-post {
|
||||
# method POST
|
||||
# }
|
||||
#
|
||||
# handle @lemmy-post {
|
||||
# reverse_proxy http://lemmy:8536
|
||||
# }
|
||||
# }
|
||||
68
hosts/algiz/caddy/index.html
Normal file
68
hosts/algiz/caddy/index.html
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
<!doctype html>
|
||||
<html>
|
||||
<head>
|
||||
<title>Attic Binary Cache</title>
|
||||
<style>
|
||||
.cursor {
|
||||
display: inline-block;
|
||||
background-color: black;
|
||||
animation-name: cursor;
|
||||
animation-duration: 0.8s;
|
||||
animation-iteration-count: infinite;
|
||||
}
|
||||
@keyframes cursor {
|
||||
0% {
|
||||
background-color: #ffffff;
|
||||
}
|
||||
20% {
|
||||
background-color: #555;
|
||||
}
|
||||
50% {
|
||||
background-color: #555;
|
||||
}
|
||||
60% {
|
||||
background-color: #ffffff;
|
||||
}
|
||||
100% {
|
||||
background-color: #ffffff;
|
||||
}
|
||||
}
|
||||
/* https://stackoverflow.com/a/13356401 */
|
||||
body {
|
||||
background-color: #1e1e2e;
|
||||
}
|
||||
pre {
|
||||
color: #f5e0dc;
|
||||
}
|
||||
#box {
|
||||
width: 100px;
|
||||
height: 100px;
|
||||
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
margin: auto;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div id="box">
|
||||
<pre>
|
||||
┏━━━━━━━━━━━━━━━━┑
|
||||
┃┏━━━ @ ━━━ @ ━━┓┃
|
||||
┃┃ ┃┃
|
||||
┃┃$ attic push <div class="cursor"> </div>┃┃
|
||||
┃┃ ┃┃
|
||||
┃┗━━━ ╰─────╯ ━━┛┃
|
||||
┗━━━━━━━━━━━━━━━━┛
|
||||
╲ ############### ╲
|
||||
╲ ############### ╲
|
||||
╲ ############### ╲
|
||||
━━━━━━━━━━━━━━━━━━
|
||||
</pre>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -4,5 +4,6 @@
|
|||
(writeShellScriptBin "gitea" ''
|
||||
ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"
|
||||
'')
|
||||
jujutsu
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
{ pkgs, enabled, ... }:
|
||||
let
|
||||
atticPort = "5656";
|
||||
static = pkgs.runCommandLocal "static-files" { } ''
|
||||
mkdir $out
|
||||
cp ${./caddy/index.html} $out/index.html
|
||||
'';
|
||||
in
|
||||
{
|
||||
|
||||
|
|
@ -15,12 +19,22 @@ in
|
|||
settings.PasswordAuthentication = false;
|
||||
};
|
||||
|
||||
services.comin = enabled // {
|
||||
remotes = [
|
||||
{
|
||||
name = "origin";
|
||||
url = "https://github.com/daylinmorgan/oizys.git";
|
||||
branches.main.name = "main";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
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";
|
||||
# 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
|
||||
|
|
@ -56,13 +70,19 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
services.comin = enabled // {
|
||||
remotes = [
|
||||
{
|
||||
name = "origin";
|
||||
url = "https://github.com/daylinmorgan/oizys.git";
|
||||
branches.main.name = "main";
|
||||
services.caddy = enabled // {
|
||||
extraConfig = builtins.readFile ./caddy/Caddyfile;
|
||||
virtualHosts."attic.dayl.in".extraConfig = ''
|
||||
redir /oizys /
|
||||
|
||||
handle / {
|
||||
root * ${static}
|
||||
file_server
|
||||
}
|
||||
];
|
||||
|
||||
handle /* {
|
||||
reverse_proxy http://localhost:5656
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
7
todo.md
7
todo.md
|
|
@ -3,14 +3,13 @@
|
|||
## oizys
|
||||
|
||||
- [ ] write a flake template that includes the systems boilerplate
|
||||
- [ ] include all of the defined overlays from `./overlays` in the `forAllSystems` nixpkgs
|
||||
- [ ] get the running action url after `oizys ci {workflow}.yml`
|
||||
|
||||
## software
|
||||
|
||||
- [ ] include langservers for enabled languages?
|
||||
- [ ] wezterm is broken...something to do with fonts?
|
||||
I tried used the nix flake and that didn't help
|
||||
[tracking issue](https://github.com/wez/wezterm/issues/5990)
|
||||
<!--[tracking issue](https://github.com/wez/wezterm/issues/5990)-->
|
||||
- [ ] ~wezterm is broken...something to do with fonts?~ using ghostty
|
||||
|
||||
|
||||
### Window Manager
|
||||
|
|
|
|||
Loading…
Reference in a new issue