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

Compare commits

base: daylin:1cfef95fc4f3941a8990ff5f6eecc3424ada94a2
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:0c172affc59844c70d19e534687391faea9c52d3
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

No commits in common. "1cfef95fc4f3941a8990ff5f6eecc3424ada94a2" and "0c172affc59844c70d19e534687391faea9c52d3" have entirely different histories.
1cfef95fc4 ... 0c172affc5

3 changed files with 42 additions and 91 deletions
Show stats Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
# - uses: ./.github/actions/clean-disk - uses: ./.github/actions/clean-disk
- uses: DeterminateSystems/nix-installer-action@v12 - uses: DeterminateSystems/nix-installer-action@v12
with: with:

59
.github/workflows/nightly.yml vendored
View file

@ -1,4 +1,4 @@
name: Build NixOS (Nightly) name: Build NixOS (on demand)
on: on:
workflow_dispatch: workflow_dispatch:
@ -8,23 +8,15 @@ on:
# concurrency: # concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.host }} # group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.host }}
# cancel-in-progress: true # cancel-in-progress: true
permissions:
contents: write
jobs: jobs:
build-minimal: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with:
ref: flake-lock
- name: Setup Git Bot - uses: ./.github/actions/clean-disk
run: |
git --version
git config user.name 'github-actions[bot]'
git config user.email 'github-actions[bot]@users.noreply.github.com'
- uses: DeterminateSystems/nix-installer-action@v12 - uses: DeterminateSystems/nix-installer-action@v12
with: with:
@ -39,8 +31,8 @@ jobs:
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- name: Update nix flake - name: Update nix flake
run: | run:
nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY nix flake update >> $GITHUB_STEP_SUMMARY
- name: Build - name: Build
run: | run: |
@ -53,44 +45,3 @@ jobs:
--debug \ --debug \
-- \ -- \
--print-build-logs --print-build-logs
- name: Commit Updates
run: git push --set-upstream --force-with-lease origin flake-lock
build-full:
needs: build-minimal
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: flake-lock
# - name: Setup Git Bot
# run: |
# git --version
# git config user.name 'github-actions[bot]'
# git config user.email 'github-actions[bot]@users.noreply.github.com'
- uses: DeterminateSystems/nix-installer-action@v12
with:
extra-conf: |
accept-flake-config = true
# - uses: DeterminateSystems/magic-nix-cache-action@v7
- uses: ./.github/actions/clean-disk
with:
purge-packages: 'true'
- name: Build
run: |
system_attr=$(nix run . -- output --host "othalan" --flake .)
nix run . \
-- \
build $system_attr \
--flake . \
--verbose \
--debug \
-- \
--print-build-logs

72
flake.lock
View file

@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1720731503, "lastModified": 1720453602,
"narHash": "sha256-Qlm0IRnOrI64RW/SEvW9rA1ytVvPS1CsVvRataNvStI=", "narHash": "sha256-7+PjJZn/jpqNkVKJ3AGVT9G601rVj/R8KkT+WWjhwyk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e728e56cbc6af0a9be1276b2cf8e019a894016e7", "rev": "b03f41efec14273cf25c42d4cef326acc36cb319",
"revCount": 4917, "revCount": 4913,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -325,11 +325,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1720709712, "lastModified": 1718476555,
"narHash": "sha256-78j/cY+AXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ=", "narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "65d42dcbfde2229a75ccdb195c318dfe241f9ade", "rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -426,11 +426,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720545076, "lastModified": 1720203444,
"narHash": "sha256-Pxacc2uoxI00koXp5+CyNqHOTQlqNlK0rlRHDBHX4+g=", "narHash": "sha256-lq2dPPPcwMHTLsFrQ2pRp4c2LwDZWoqzSyjuPdeJCP4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "6174a2a25f4e216c0f1d0c4278adc23c476b1d09", "rev": "a8c3a135701a7b64db0a88ec353a392f402d2a87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -498,11 +498,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1720733512, "lastModified": 1720614167,
"narHash": "sha256-vq9CLDvqSSvH4L7YhDa0ihTOrAry4jntKiuoNb5n98M=", "narHash": "sha256-waTt93GpWt/yHi6ZME+B9I9V+EavX0qyny+8WvWuC3c=",
"rev": "4b109ec1a8fc4550150f56f0f46f2f41d844bda8", "rev": "3dced96741816db01f9990e0884224d38ee58390",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4b109ec1a8fc4550150f56f0f46f2f41d844bda8.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/3dced96741816db01f9990e0884224d38ee58390.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720695775, "lastModified": 1719353937,
"narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=", "narHash": "sha256-86NBqDxAP20ET/UoKX0WvSItblNQ97czXb2q7lkMrwk=",
"rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a", "rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/d70318fb946a0e720dfdd1fb10b0645c14e2a02a.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/5d9d94089fb1ca96222a34bfe245ef5c5ebefd37.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -679,11 +679,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1720662315, "lastModified": 1720471092,
"narHash": "sha256-r0a7rtlx5GzJ57izpq58B30sAzSIH2V/ctwIsMV51rY=", "narHash": "sha256-05wIPweI6ts1BtVaMYbdL5KEelMfM4g5f/Z/xQzXRQI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "8f132445454c6b9f0b21952953885007b961310a", "rev": "813f608e25bc14b16053c005b05ebf8b18d25503",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -694,11 +694,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1720542800, "lastModified": 1720031269,
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "feb2849fdeb70028c70d73b848214b00d324a497", "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1720657034, "lastModified": 1720571246,
"narHash": "sha256-nPhbeFdyN8yn+EXmnPcBWisoypndtQbNIhSKmAinv3E=", "narHash": "sha256-nkUXwunTck+hNMt2wZuYRN+jf2ySRjKTzI0fo5TDH78=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "212defe037698e18fc9521dfe451779a8979844c", "rev": "16e401f01842c5bb2499e78c1fe227f939c0c474",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -774,11 +774,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1720542800, "lastModified": 1720418205,
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "narHash": "sha256-cPJoFPXU44GlhWg4pUk9oUPqurPlCFZ11ZQPk21GTPU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "feb2849fdeb70028c70d73b848214b00d324a497", "rev": "655a58a72a6601292512670343087c2d75d859c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1150,11 +1150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720747212, "lastModified": 1720574485,
"narHash": "sha256-zhxs/o9oNkB9ZszRsseG6qYqfKz29314FE7mdqcAGrc=", "narHash": "sha256-PREKdU7GpAqVtEWdIu8f4PdUcmL1x0x+bn6TrX+Tgsk=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "141b1b633b585e52388620b84c4d2f438b92a45a", "rev": "edb7dc2318e536bf78181eedd9dab0b5f27aa2a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1174,11 +1174,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1720719728, "lastModified": 1720349156,
"narHash": "sha256-uPe4sqNB661tIi4U6YvHR9BpN8ozIcmxUJxcxI9tD1o=", "narHash": "sha256-eTjMZ/PEkzR+68C1hUwz9Qh/gizxwNG5PkMaDgplEZk=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "b8dd9cbbcc7591159f28eb41c21315f5ef5ca995", "rev": "fbd8b9a87a3cd5ab8389054815d9e3f81dfd430b",
"type": "github" "type": "github"
}, },
"original": { "original": {