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

Compare commits

base: daylin:cd378dcbb997fbb0b28b9f4fd051d9604427de7e
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:fdfb119fa705a23e01246ae12c26160c6dadbcb1
Branches Tags
daylin:flake-lock
daylin:main

1 commit
cd378dcbb9 ... fdfb119fa7

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

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=7c7a84ff60f8c1e00c6a0de3f7656f0bbd933d56' (2024-10-30)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=93b4478e70af6ffb08a4a66a6d0364c3296db296' (2024-10-31)
• Updated input 'lix':
    'beb193d1e2.tar.gz?narHash=sha256-qs7u2nCwfEV93SKV1QSikOwRbHDEA1CWYZiVKI9Hhxk%3D&rev=beb193d1e2121cdbd51e8309572522ee9a841395' (2024-10-30)
  → '8005d17365.tar.gz?narHash=sha256-6wOpwSw1cM5aMg7thaT%2BuC3mfea%2BrBIBuKGEKlQAVes%3D&rev=8005d1736590df482290992afbb8b1a305166f90' (2024-10-31)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a' (2024-10-25)
  → 'github:nixos/nixpkgs/807e9154dcb16384b1b765ebe9cd2bba2ac287fd' (2024-10-29)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/1bb7ec644d299edf5b88fd2dc67042d14c6638ae' (2024-10-31)
  → 'github:nix-community/nixpkgs-wayland/b96564c7722abb8cfff2fae01cef9d6819fca259' (2024-10-31)
• Updated input 'nixpkgs-wayland/nix-eval-jobs':
    'github:nix-community/nix-eval-jobs/a3307ac4b38b6dae769f771c877a6f2c236ee238' (2024-10-10)
  → 'github:nix-community/nix-eval-jobs/7f9159a16584ee86eed077c8a73e845690b7d513' (2024-10-31)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a' (2024-10-25)
  → 'github:nixos/nixpkgs/807e9154dcb16384b1b765ebe9cd2bba2ac287fd' (2024-10-29)
• Updated input 'utils':
    'git+https://git.dayl.in/daylin/utils.git?ref=refs/heads/main&rev=aa0dbe4d05b3109b947f8bd0444228a800f55dc6' (2024-10-30)
  → 'git+https://git.dayl.in/daylin/utils.git?ref=refs/heads/main&rev=d86dff8360781e4ccd82a0e5a8efdf1ad07e97db' (2024-10-31)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/0802240ae001576ebf9cf0bbc003a8b1291c910b' (2024-10-31)
  → 'github:mitchellh/zig-overlay/20b4dafc348320f8deefeed627de70e403742c05' (2024-11-01)
 2024-11-01 01:40:47 +00:00
7 changed files with 86 additions and 229 deletions
Show stats Expand all files Collapse all files

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

@ -20,12 +20,6 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 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: daylin-bot/actions/setup@main
- uses: ./.github/actions/clean-disk - uses: ./.github/actions/clean-disk
@ -57,9 +51,7 @@ jobs:
>> $GITHUB_STEP_SUMMARY >> $GITHUB_STEP_SUMMARY
- name: Pre-build oizys - name: Pre-build oizys
run: | run: nix build .
nix build .
attic push oizys result
- name: Build - name: Build
run: > run: >

227
flake.lock
View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730642645, "lastModified": 1729233997,
"narHash": "sha256-enJml5i2n0pDJ9kVeAylEQKp9fzdXDO45iAm39SqDwM=", "narHash": "sha256-NvICw3H/U6J/yZ5ibszSAl/HQMhrp7XPnD70ITwIRFk=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "f1multiviewer-flake", "repo": "f1multiviewer-flake",
"rev": "c85627a67eeb3e606f1df6b7747dfae6537f79f9", "rev": "58cc1fd579116b7b49522dd35fe8eddef3e64ecd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,14 +156,14 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1726560853,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,24 +230,6 @@
"inputs": { "inputs": {
"systems": "systems_6" "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": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -262,9 +244,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_8" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1726560853,
@ -295,30 +277,6 @@
"type": "github" "type": "github"
} }
}, },
"ghostty": {
"inputs": {
"nixpkgs-stable": [
"nixpkgs"
],
"nixpkgs-unstable": [
"nixpkgs"
],
"zig": "zig"
},
"locked": {
"lastModified": 1730656540,
"narHash": "sha256-OsKAF0OGzCk0jHNjNymvdKDtsaC70I+iuoNXWAWr5+4=",
"ref": "refs/heads/main",
"rev": "4dd6598a693c9d0777838bb39cc1549eb5d6f19a",
"revCount": 7866,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
"original": {
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -401,15 +359,15 @@
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1730652188, "lastModified": 1730373668,
"narHash": "sha256-3L+Jh3J3JvJPsGTqSOIKjwZy/AysR0WOLgGKNkXFqxs=", "narHash": "sha256-8p5JTUGFuhnyuF9lD98ioeE3zYaCmsizLWk4Y3KszAI=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "cd0d0491261728260de3d1aff150e1b6c05f9e86", "rev": "93b4478e70af6ffb08a4a66a6d0364c3296db296",
"revCount": 5407, "revCount": 5396,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -565,15 +523,15 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1730635946, "lastModified": 1730031145,
"narHash": "sha256-CdeoMnMXpCq4wBWEWHfUUs68zoyAJLfp1JmfXWtmAgc=", "narHash": "sha256-GZz0LGkeduajnF7zUuPu5evNyoOATcSsRZCkG1OqiwY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "d0ecc1890f77e9e170f2de279d6902d84a0cbc51", "rev": "7d235f23a84b54c39b1579b68b13e1ff83f5b1ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -585,11 +543,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730610940, "lastModified": 1730412807,
"narHash": "sha256-ZsTpii4kZcioRF3bu3/pS374R9GYQVyrMpBNr2ZUnVg=", "narHash": "sha256-6wOpwSw1cM5aMg7thaT+uC3mfea+rBIBuKGEKlQAVes=",
"rev": "b1a0e3c0029c2dd5fb7c8dd2db4f9e0b309c9f54", "rev": "8005d1736590df482290992afbb8b1a305166f90",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b1a0e3c0029c2dd5fb7c8dd2db4f9e0b309c9f54.tar.gz?rev=b1a0e3c0029c2dd5fb7c8dd2db4f9e0b309c9f54" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8005d1736590df482290992afbb8b1a305166f90.tar.gz?rev=8005d1736590df482290992afbb8b1a305166f90"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -598,7 +556,7 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": [ "lix": [
"lix" "lix"
@ -765,11 +723,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730604744, "lastModified": 1729999765,
"narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -806,15 +764,15 @@
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1730453870, "lastModified": 1730120924,
"narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", "narHash": "sha256-I6hwd+YlgefioLfmsM04MxzbEAES1N328/T+VqhcWnQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "adb6bc4b661a43328752b4575be4968a4990c033", "rev": "b124084667fb4c912fda68fdd9d05f59e18b6ef7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -825,11 +783,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730531603, "lastModified": 1729413321,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -841,11 +799,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1730595754, "lastModified": 1729990941,
"narHash": "sha256-F6DyPKY2WAUf8fpaT9vQwwRUs74InQM36ng//h9wNhY=", "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "2376a861a1a15f05339245fbaa4422f2d1bdf485", "rev": "7d68864343650322045894951602d6e82b5296d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -878,11 +836,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1730638537, "lastModified": 1730410240,
"narHash": "sha256-2HOixA1kKx0gmPFWlg6lYlQ452rvt9Ims2+/wk+nsQM=", "narHash": "sha256-PL7RGHRo0fyukX4TRKmtYb5fDA6hCL0Wg8jnSbDL0Zk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "2920f4cc370aedb9043644343ac7fc0251f2cde8", "rev": "b96564c7722abb8cfff2fae01cef9d6819fca259",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -925,11 +883,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1730531603, "lastModified": 1730200266,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -957,11 +915,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1730531603, "lastModified": 1730200266,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1050,7 +1008,7 @@
"roc": { "roc": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -1074,7 +1032,6 @@
"root": { "root": {
"inputs": { "inputs": {
"f1multiviewer": "f1multiviewer", "f1multiviewer": "f1multiviewer",
"ghostty": "ghostty",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"hyprman": "hyprman", "hyprman": "hyprman",
@ -1133,21 +1090,6 @@
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -1162,6 +1104,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_3": { "systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -1237,21 +1194,6 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1344,11 +1286,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730187742, "lastModified": 1728166987,
"narHash": "sha256-M0umGIIvVFqCwA0fQ5edivMTbRYA0r/5tXK8sr+M7EA=", "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "998f646762b94fbac61b0271ce66d3e617262858", "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1357,45 +1299,20 @@
"type": "github" "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": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1730593948, "lastModified": 1730421185,
"narHash": "sha256-1ndLLzFUh2uKaWjvH25lohGCSpBXANwyVmhGCDBFM6c=", "narHash": "sha256-6KovnDOSMKNPRrdmMCIk/FrvomoD5wkt5zRxhbnQklA=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "68091a14f9c3d803ba6ae13cab2a52623c15633d", "rev": "20b4dafc348320f8deefeed627de70e403742c05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1406,7 +1323,7 @@
}, },
"zls": { "zls": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_6",
"gitignore": "gitignore_2", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -1416,11 +1333,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730664479, "lastModified": 1730064361,
"narHash": "sha256-kZ7uEWpO+qZGT1a+0EYOVWcSF04hEj9AqFo/ZMZIUBQ=", "narHash": "sha256-myb/4V8tP3n3WJQlaDrCmQkbmcMEcgX1mFu2jdfwTsk=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "2be424de53eb6f07c5cd0097f6aa99079912e43e", "rev": "b2e89dfe92850cf02cbd4b73004aaaecd5cf1739",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -22,11 +22,6 @@
inputs.lix.follows = "lix"; 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.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.url = "github:hyprwm/contrib";
roc.url = "github:roc-lang/roc"; roc.url = "github:roc-lang/roc";

7
hosts/othalan/pkgs.nix
View file

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

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

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

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

@ -1,7 +1,7 @@
import std/[ import std/[
algorithm, json, algorithm, json,
enumerate, os, sequtils, strformat, enumerate, os, sequtils, strformat,
strutils, sugar, logging, tables, times strutils, sugar, logging, tables
] ]
import hwylterm, hwylterm/logging, jsony import hwylterm, hwylterm/logging, jsony
@ -119,15 +119,9 @@ proc toBuildNixosConfiguration(): seq[string] =
return output.toBuild.mapIt(it.storePath) return output.toBuild.mapIt(it.storePath)
type type
DerivationOutputsOut = object
path: string
DerivationOutputs = object
`out`: DerivationOutputsOut
NixDerivation = object NixDerivation = object
inputDrvs: Table[string, JsonNode] inputDrvs: Table[string, JsonNode]
name: string name: string
outputs: DerivationOutputs
proc evaluateDerivations(drvs: seq[string]): Table[string, NixDerivation] = proc evaluateDerivations(drvs: seq[string]): Table[string, NixDerivation] =
var cmd = "nix derivation show -r" var cmd = "nix derivation show -r"
@ -172,54 +166,18 @@ func isIgnored(drv: string): bool =
if name.startswith(pkg): if name.startswith(pkg):
return true return true
# proc systemPathDrvsToBuild(): seq[string] =
type
OizysDerivation = object
drv: NixDerivation # do i need this ?
output: string
name: string
iterator getSystemPathDrvs(drvs: Table[string, NixDerivation]): string =
let systemPaths = findSystemPaths(drvs)
for p in systemPaths:
for d in drvs[p].inputDrvs.keys():
yield d
proc getOizysDerivations(): seq[OizysDerivation] =
let toBuild = toBuildNixosConfiguration()
let drvs = evaluateDerivations(nixosConfigAttrs())
for name in getSystemPathDrvs(drvs):
if name in toBuild and not isIgnored(name):
let nixDrv = drvs[name]
result.add OizysDerivation(
name: name,
output: nixDrv.outputs.`out`.path,
drv: nixDrv,
)
proc systemPathDrvsToBuild(): seq[string] = proc systemPathDrvsToBuild(): seq[string] =
var inputDrvs, dropped: seq[string] var inputDrvs, dropped: seq[string]
let toBuild = toBuildNixosConfiguration() let toBuild = toBuildNixosConfiguration()
let drvs = evaluateDerivations(nixosConfigAttrs()) let drvs = evaluateDerivations(nixosConfigAttrs())
let systemPaths = findSystemPaths(drvs) let systemPaths = findSystemPaths(drvs)
for p in systemPaths: for p in systemPaths:
inputDrvs &= drvs[p].inputDrvs.keys().toSeq() inputDrvs &= drvs[p].inputDrvs.keys().toSeq()
(result, _) = filterSeq(inputDrvs, (s) => s in toBuild) (result, _) = filterSeq(inputDrvs, (s) => s in toBuild)
(dropped, result) = filterSeq(result, isIgnored) (dropped, result) = filterSeq(result, isIgnored)
echo "SOMETHING SHOULD HAPPEN HERE!"
for drv in result:
echo drv
echo drvs[drv]
debug fmt"ignored {dropped.len} derivations" debug fmt"ignored {dropped.len} derivations"
result = result.mapIt(it & "^*") result = result.mapIt(it & "^*")
func splitDrv(drv: string): tuple[name, hash:string] = func splitDrv(drv: string): tuple[name, hash:string] =
let s = drv.split("-", 1) let s = drv.split("-", 1)
(s[1].replace(".drv^*",""),s[0].split("/")[^1]) (s[1].replace(".drv^*",""),s[0].split("/")[^1])
@ -282,27 +240,27 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
if findExe(service) == "": fatalQuit fmt"is {service} installed?" if findExe(service) == "": fatalQuit fmt"is {service} installed?"
info bbfmt"building and pushing to cache: [b]{name}" info bbfmt"building and pushing to cache: [b]{name}"
debug "determining missing cache hits" debug "determining missing cache hits"
let drvs = getOizysDerivations() let drvs = systemPathDrvsToBuild()
if drvs.len == 0: if drvs.len == 0:
info "nothing to build" info "nothing to build"
quit "exiting...", QuitSuccess quit "exiting...", QuitSuccess
# TODO: add back reporting to GITHUB SUMMARY
var outs: seq[string] var outs: seq[string]
# TODO: add back reporting to GITHUB SUMMARY
# include time to build?
for drv in drvs: for drv in drvs:
let startTime = now()
var cmd = "nix build" var cmd = "nix build"
cmd.addArg drv.name & "^*" cmd.addArg drv
cmd.addArg "--no-link" cmd.addArg "--no-link"
# cmd.addArg "--print-out-paths" cmd.addArg "--print-out-paths"
# cmd.addArg "-L"
cmd.addArgs rest cmd.addArgs rest
let buildCode = runCmd(cmd) let (path, _, buildCode) = runCmdCapt(cmd)
if buildCode != 0: if buildCode != 0:
error "failed to build: " & drv.name # TODO: propagate errors using nix log?
error "failed to build: " & drv
continue continue
info "build duration: " & $(now() - startTime)
outs &= drv.output outs &= path.strip().splitLines()
var cmd = service var cmd = service
cmd.addArg "push" cmd.addArg "push"
@ -314,3 +272,4 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
if pushErr != 0: if pushErr != 0:
errorQuit "failed to push build to cache" errorQuit "failed to push build to cache"

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