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

Compare commits

base: daylin:3641b1e431369ea4856ec6a954b08d77039d9b1e
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:853678a1a93638c5e2b852ee9351c4f282df7b16
Branches Tags
daylin:flake-lock
daylin:main

5 commits
3641b1e431 ... 853678a1a9

Author SHA1 Message Date
Daylin Morgan
853678a1a9
add build flag 2024-11-03 11:37:11 -06:00
Daylin Morgan
67e94ed1cf
add todo 2024-11-03 11:11:37 -06:00
Daylin Morgan
e6a7e04cfb
autopush the result 2024-11-03 09:48:13 -06:00
Daylin Morgan
9a105ddf62
try adding key 2024-11-03 09:33:36 -06:00
Daylin Morgan
5c0d3713f6
finally the ghostty beta has arrived 2024-11-03 09:11:29 -06:00
6 changed files with 136 additions and 33 deletions
Show stats Expand all files Collapse all files

10
.github/workflows/update.yml vendored
View file

@ -20,6 +20,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup SSH
uses: MrSquaare/ssh-setup-action@v1
with:
host: github.com
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- uses: daylin-bot/actions/setup@main
- uses: ./.github/actions/clean-disk
@ -51,7 +57,9 @@ jobs:
>> $GITHUB_STEP_SUMMARY
- name: Pre-build oizys
run: nix build .
run: |
nix build .
attic push oizys result
- name: Build
run: >

145
flake.lock
View file

@ -40,11 +40,11 @@
]
},
"locked": {
"lastModified": 1729233997,
"narHash": "sha256-NvICw3H/U6J/yZ5ibszSAl/HQMhrp7XPnD70ITwIRFk=",
"lastModified": 1730642645,
"narHash": "sha256-enJml5i2n0pDJ9kVeAylEQKp9fzdXDO45iAm39SqDwM=",
"owner": "daylinmorgan",
"repo": "f1multiviewer-flake",
"rev": "58cc1fd579116b7b49522dd35fe8eddef3e64ecd",
"rev": "c85627a67eeb3e606f1df6b7747dfae6537f79f9",
"type": "github"
},
"original": {
@ -156,14 +156,14 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
@ -230,6 +230,24 @@
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"inputs": {
"systems": "systems_7"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -244,9 +262,9 @@
"type": "github"
}
},
"flake-utils_6": {
"flake-utils_7": {
"inputs": {
"systems": "systems_7"
"systems": "systems_8"
},
"locked": {
"lastModified": 1726560853,
@ -277,6 +295,30 @@
"type": "github"
}
},
"ghostty": {
"inputs": {
"nixpkgs-stable": [
"nixpkgs"
],
"nixpkgs-unstable": [
"nixpkgs"
],
"zig": "zig"
},
"locked": {
"lastModified": 1730568249,
"narHash": "sha256-+yyQ2ORHK61Q69mu9/fILlHmrPd3Es8zUTnqlwiMy3o=",
"ref": "refs/heads/main",
"rev": "d47df211b03894427592851b0be3b528ff8221ff",
"revCount": 7864,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
"original": {
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -359,7 +401,7 @@
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems",
"systems": "systems_2",
"xdph": "xdph"
},
"locked": {
@ -523,7 +565,7 @@
},
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_4",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
@ -556,7 +598,7 @@
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils",
"flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
@ -764,7 +806,7 @@
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3"
},
"locked": {
@ -1008,7 +1050,7 @@
"roc": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_5",
"nixgl": "nixgl",
"nixpkgs": [
"nixpkgs"
@ -1032,6 +1074,7 @@
"root": {
"inputs": {
"f1multiviewer": "f1multiviewer",
"ghostty": "ghostty",
"hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib",
"hyprman": "hyprman",
@ -1090,21 +1133,6 @@
}
},
"systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1119,6 +1147,21 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
@ -1194,6 +1237,21 @@
"type": "github"
}
},
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -1299,10 +1357,35 @@
"type": "github"
}
},
"zig": {
"inputs": {
"flake-compat": [
"ghostty"
],
"flake-utils": "flake-utils",
"nixpkgs": [
"ghostty",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1717848532,
"narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zig-overlay": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_5",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"nixpkgs"
]
@ -1323,7 +1406,7 @@
},
"zls": {
"inputs": {
"flake-utils": "flake-utils_6",
"flake-utils": "flake-utils_7",
"gitignore": "gitignore_2",
"nixpkgs": [
"nixpkgs"

5
flake.nix
View file

@ -22,6 +22,11 @@
inputs.lix.follows = "lix";
};
# https://github.com/ghostty-org/ghostty/issues/2025
ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty";
ghostty.inputs.nixpkgs-stable.follows = "nixpkgs";
ghostty.inputs.nixpkgs-unstable.follows = "nixpkgs";
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
hyprland-contrib.url = "github:hyprwm/contrib";
roc.url = "github:roc-lang/roc";

7
hosts/othalan/pkgs.nix
View file

@ -1,8 +1,13 @@
{ pkgs, flake, ... }:
{
environment.systemPackages =
[ (flake.pkg "utils") ]
[
(flake.pkg "utils")
(flake.pkg "ghostty")
]
++ (with pkgs; [
distrobox
zk
quarto

1
pkgs/oizys/src/oizys/exec.nim
View file

@ -21,6 +21,7 @@ type
CaptStdout
CaptStderr
# TODO: support both capturing and inheriting the stream?
proc runCmdCapt*(
cmd: string,
capture: set[CaptureGrp] = {CaptStdout},

1
pkgs/oizys/src/oizys/nix.nim
View file

@ -253,6 +253,7 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
cmd.addArg drv
cmd.addArg "--no-link"
cmd.addArg "--print-out-paths"
cmd.addArg "-L"
cmd.addArgs rest
let (path, _, buildCode) = runCmdCapt(cmd)
if buildCode != 0: