daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-21 17:40:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:180b97e5b329433f0d51e6a5134024079bfdf7e6
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:f973420f298124536f579dad6112341c79ca1d8f
Branches Tags
daylin:flake-lock
daylin:main

8 commits
180b97e5b3 ... f973420f29

Author SHA1 Message Date
daylin-bot
f973420f29 flake.lock: Update 
Flake lock file updates:

• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=4853597cd9829e622be2c3628dc748407c27c423' (2024-11-14)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=7dbcde72863a09405bf456fcfc41f878330a64f9' (2024-11-15)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/3a7690c5fe0ecfceeddbf09f8642dca424d29793' (2024-11-15)
  → 'github:nix-community/nixpkgs-wayland/a3fc86160dba0a9160716cf6f1d4ff4da7a53085' (2024-11-15)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/f2ccb7e2d80601fb43807c36f14703f2342420f3' (2024-11-14)
  → 'github:nix-community/nix-eval-jobs/d926bcd5206c0b7afe47bed92557c8cd5e882b36' (2024-11-15)
 2024-11-15 21:38:22 +00:00
Daylin Morgan
6adc7e7f7d
tidy up caddy setup with alternate frontend to match dayl.in 2024-11-15 14:51:53 -06:00
Daylin Morgan
19f855252d
handle index.html for attic 2024-11-15 14:17:47 -06:00
Daylin Morgan
290280f714
integrate caddy with nixos instead of docker 2024-11-15 12:00:15 -06:00
Daylin Morgan
16e417c38e
add jujutsu to algiz 2024-11-15 10:41:24 -06:00
Daylin Morgan
805a4ba2f2
ignore todo 2024-11-15 10:36:53 -06:00
daylin-bot
0fe782bf7b flake.lock: Update 
Flake lock file updates:

• Updated input 'comin':
    'github:nlewo/comin/84ef9af404b9157eab2c5e3e44d7c29239329901' (2024-08-20)
  → 'github:nlewo/comin/9afca855518f79b5bff3d2a9663b2e6f81dd361a' (2024-11-13)
• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=523e3a6ae3e62463b309c1b3222bafd7b1fb11ef' (2024-11-13)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=4853597cd9829e622be2c3628dc748407c27c423' (2024-11-14)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=3fb47372b79265ebdabeeefdad10359d5b18377a' (2024-11-13)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=098e491a43e8b26f4382b48651a4131464bf6a2f' (2024-11-15)
• Updated input 'hyprman':
    'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=884cb9c68c3d28542e581be762b13dcc380a8135' (2024-11-11)
  → 'git+https://git.dayl.in/daylin/hyprman.git?ref=refs/heads/main&rev=888c8e4c9395e7abfcbfc044d575ff6cf955672a' (2024-11-15)
• Updated input 'hyprman/nim2nix':
    'github:daylinmorgan/nim2nix/42af12ca45025c7146bc24e27f5d8b65b003d663' (2024-09-04)
  → 'github:daylinmorgan/nim2nix/a9f1182dbe51675b9666d6a79bebded7d9839ad7' (2024-11-15)
• Updated input 'lix':
    '8a9094303b.tar.gz?narHash=sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8%3D&rev=8a9094303bc7873c979e54ea20b9f50464ee3965' (2024-11-11)
  → '43777939eb.tar.gz?narHash=sha256-1LGkwq9g/BfM0JuZmWPYwBX5RiqIpW/BxXcsLwkVcGg%3D&rev=43777939eb2253596ff822771929a8820916fb29' (2024-11-12)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/896019f04b22ce5db4c0ee4f89978694f44345c3' (2024-11-10)
  → 'github:nix-community/nix-index-database/40d882b55e89add1ded379cc99edaab24983d6d9' (2024-11-14)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/adb6bc4b661a43328752b4575be4968a4990c033' (2024-11-01)
  → 'github:nix-community/NixOS-WSL/a6b9cf0b7805e2c50829020a73e7bde683fd36dd' (2024-11-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
  → 'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/c2fa066bb9952469a5e01a08293f78d114c02f09' (2024-11-13)
  → 'github:nix-community/nixpkgs-wayland/3a7690c5fe0ecfceeddbf09f8642dca424d29793' (2024-11-15)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/807ab623e6d01e931269a28a07c59dcfd6474173' (2024-11-10)
  → 'github:nix-community/lib-aggregate/902e1bb3c2ae0f051ff98e4e3eac247f7e6ca392' (2024-11-14)
• Updated input 'nixpkgs-wayland/lib-aggregate/flake-utils':
    'github:numtide/flake-utils/c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a' (2024-09-17)
  → 'github:numtide/flake-utils/11707dc2f618dd54ca8739b309ec4fc024de578b' (2024-11-13)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/96902c4573cd03ea7e533634cb49861148f49a7a' (2024-11-10)
  → 'github:nix-community/nix-eval-jobs/f2ccb7e2d80601fb43807c36f14703f2342420f3' (2024-11-14)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2' (2024-11-09)
  → 'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11)
• Updated input 'stable':
    'github:nixos/nixpkgs/9256f7c71a195ebe7a218043d9f93390d49e6884' (2024-11-10)
  → 'github:nixos/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529' (2024-11-12)
 2024-11-15 09:58:15 -06:00
Daylin Morgan
2c0a9cf847
add todo 2024-11-15 09:33:08 -06:00
6 changed files with 220 additions and 61 deletions
Show stats Expand all files Collapse all files

98
flake.lock
View file

@ -40,11 +40,11 @@
]
},
"locked": {
"lastModified": 1724145018,
"narHash": "sha256-6R5CeMgr3EGKhqWPkqtteOtix7hBaurfpjHepiq2OrU=",
"lastModified": 1731534082,
"narHash": "sha256-n8yVzBixxaj0Qn6SV655t6QUtKSOJ+sR4AEoq0Vqb/0=",
"owner": "nlewo",
"repo": "comin",
"rev": "84ef9af404b9157eab2c5e3e44d7c29239329901",
"rev": "9afca855518f79b5bff3d2a9663b2e6f81dd361a",
"type": "github"
},
"original": {
@ -201,11 +201,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -240,11 +240,11 @@
"zig": "zig"
},
"locked": {
"lastModified": 1731469793,
"narHash": "sha256-ZewQYTlsysOt6orTIIKNR+y43iklehOzeBF/Gfy7fog=",
"lastModified": 1731706414,
"narHash": "sha256-9Er1h1w6lXg6hQJnfLVacs6e+naamMyRPKijdBt8gFA=",
"ref": "refs/heads/main",
"rev": "523e3a6ae3e62463b309c1b3222bafd7b1fb11ef",
"revCount": 7949,
"rev": "7dbcde72863a09405bf456fcfc41f878330a64f9",
"revCount": 7987,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
@ -318,11 +318,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1731526492,
"narHash": "sha256-2Gob+eZEPpF225QrRLXyfeQ9L63YHFa/tNh15FW/Rzo=",
"lastModified": 1731631654,
"narHash": "sha256-a6gy39yki4mX/Oj83aG08nNntXxXhM1wjksNXGZ8x5c=",
"ref": "refs/heads/main",
"rev": "3fb47372b79265ebdabeeefdad10359d5b18377a",
"revCount": 5451,
"rev": "098e491a43e8b26f4382b48651a4131464bf6a2f",
"revCount": 5456,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -413,11 +413,11 @@
]
},
"locked": {
"lastModified": 1731363071,
"narHash": "sha256-FdB1uxTPgS7vcfVIsG720G2+t2l6uHksW3bp3fzz/Q8=",
"lastModified": 1731684150,
"narHash": "sha256-jY0bRx2SWuLU02nwDE8Q5bPuMMSiUISJYaH4GWfUFc4=",
"ref": "refs/heads/main",
"rev": "884cb9c68c3d28542e581be762b13dcc380a8135",
"revCount": 19,
"rev": "888c8e4c9395e7abfcbfc044d575ff6cf955672a",
"revCount": 21,
"type": "git",
"url": "https://git.dayl.in/daylin/hyprman.git"
},
@ -482,11 +482,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1731240728,
"narHash": "sha256-a0xQE3cwZLMsycd9NneFC3z29E+z1PSD/ozhISM7qYQ=",
"lastModified": 1731586450,
"narHash": "sha256-upNRIVk5PmBPJ307djkiowhHOx8Dqwb5bpM4XNJH4Ek=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "807ab623e6d01e931269a28a07c59dcfd6474173",
"rev": "902e1bb3c2ae0f051ff98e4e3eac247f7e6ca392",
"type": "github"
},
"original": {
@ -498,11 +498,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1731334117,
"narHash": "sha256-GoddkPg0/UDv06KcQJiOYP/2IzruYorbI03QRCjN3K8=",
"rev": "8a9094303bc7873c979e54ea20b9f50464ee3965",
"lastModified": 1731416517,
"narHash": "sha256-1LGkwq9g/BfM0JuZmWPYwBX5RiqIpW/BxXcsLwkVcGg=",
"rev": "43777939eb2253596ff822771929a8820916fb29",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a9094303bc7873c979e54ea20b9f50464ee3965.tar.gz?rev=8a9094303bc7873c979e54ea20b9f50464ee3965"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/43777939eb2253596ff822771929a8820916fb29.tar.gz?rev=43777939eb2253596ff822771929a8820916fb29"
},
"original": {
"type": "tarball",
@ -556,11 +556,11 @@
]
},
"locked": {
"lastModified": 1725469705,
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
"lastModified": 1731683943,
"narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=",
"owner": "daylinmorgan",
"repo": "nim2nix",
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
"rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7",
"type": "github"
},
"original": {
@ -615,11 +615,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1731250407,
"narHash": "sha256-AwyDiazOqBZBUPp0vqYEzvBseZo3Eg16mfjAFvKv2lc=",
"lastModified": 1731682758,
"narHash": "sha256-o54e8oNPPNmU7zHm3uTvsbbQLi7EKX3S6EEndXFG594=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "96902c4573cd03ea7e533634cb49861148f49a7a",
"rev": "d926bcd5206c0b7afe47bed92557c8cd5e882b36",
"type": "github"
},
"original": {
@ -657,11 +657,11 @@
]
},
"locked": {
"lastModified": 1731209121,
"narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
"lastModified": 1731593150,
"narHash": "sha256-FvksinoI2Y6kuwH+cKBu1oDA8uPGfoRqgtQV6O8GDc4=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
"rev": "40d882b55e89add1ded379cc99edaab24983d6d9",
"type": "github"
},
"original": {
@ -677,11 +677,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1730453870,
"narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=",
"lastModified": 1731682434,
"narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "adb6bc4b661a43328752b4575be4968a4990c033",
"rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
"type": "github"
},
"original": {
@ -745,11 +745,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1731515670,
"narHash": "sha256-tY1C721VV87LfNdGBsdRwTXpskFlqEXxLokgNO1OnZA=",
"lastModified": 1731684610,
"narHash": "sha256-rfb93JFID/fYO7h0Yhsot6TjbUgtEJMl6Qk212cVdOY=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "c2fa066bb9952469a5e01a08293f78d114c02f09",
"rev": "a3fc86160dba0a9160716cf6f1d4ff4da7a53085",
"type": "github"
},
"original": {
@ -792,11 +792,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github"
},
"original": {
@ -824,11 +824,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github"
},
"original": {
@ -938,11 +938,11 @@
},
"stable": {
"locked": {
"lastModified": 1731239293,
"narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=",
"lastModified": 1731386116,
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
"rev": "689fed12a013f56d4c4d3f612489634267d86529",
"type": "github"
},
"original": {

71
hosts/algiz/caddy/Caddyfile Normal file
View 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
View 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>

1
hosts/algiz/pkgs.nix
View file

@ -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
];
}

36
hosts/algiz/services.nix
View file

@ -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
View file

@ -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