daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-19 18:47:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:6d1f571ad4a841115ebb87b1591cca43261f3051
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:ef83435bed2efbc29bf682e266d7f21d99d0edc2
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

No commits in common. "6d1f571ad4a841115ebb87b1591cca43261f3051" and "ef83435bed2efbc29bf682e266d7f21d99d0edc2" have entirely different histories.
6d1f571ad4 ... ef83435bed

8 changed files with 102 additions and 55 deletions
Show stats Expand all files Collapse all files

10
.github/actions/clean-disk/action.yml vendored
View file

@ -41,13 +41,11 @@ runs:
$(non_manifest_packages) # > /dev/null $(non_manifest_packages) # > /dev/null
fi fi
GLOBIGNORE="/usr/share/git-core/**/*" sudo rm -rf /opt &
sudo rm -rf \ sudo rm -rf "$AGENT_TOOLSDIRECTORY" &
/var/lib/docker/ \
"$AGENT_TOOLSDIRECTORY" \
/opt \
/usr/{local,share} &
sudo rm -rf /var/lib/docker &
sudo rm -rf /usr/{local,share} &
{ {
sudo swapoff -a sudo swapoff -a
sudo rm -f /mnt/swapfile sudo rm -f /mnt/swapfile

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

@ -8,10 +8,6 @@ on:
permissions: permissions:
contents: write contents: write
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
jobs: jobs:
build-minimal: build-minimal:
runs-on: ubuntu-latest runs-on: ubuntu-latest

109
flake.lock
View file

@ -215,11 +215,11 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1710146030,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,6 +246,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_7": {
"inputs": {
"systems": "systems_8"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -323,11 +341,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723241066, "lastModified": 1723224800,
"narHash": "sha256-et+BwLETF5e/9jBHK2GnVh6WGjRztRBThtllMezCvcM=", "narHash": "sha256-2b+cECwR+3FL/ikuZnXE94H8bXdlnYUbhmi1KNpD/tc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "4fdc0d55e4b44bb5300679025d2378fb6de0cae4", "rev": "8b37e81374928856d8fd859b95a62c8bf4211901",
"revCount": 5074, "revCount": 5073,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -516,11 +534,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723233557, "lastModified": 1723213513,
"narHash": "sha256-xfvFAMmR7bc2RaD1ehaT0hBE4Kka/wuqxMeW6L8x3MM=", "narHash": "sha256-XbtSx3sxE6rf/D31fBX9d28CuXnokkbHW6tzOEMVfxw=",
"rev": "c7d97802e4f59b8621e67cf62275d6a7fde8fe62", "rev": "346e340cbfe450df3709cf5d51e26ba247a2c1ad",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/c7d97802e4f59b8621e67cf62275d6a7fde8fe62.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/346e340cbfe450df3709cf5d51e26ba247a2c1ad.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -697,11 +715,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723234766, "lastModified": 1723206805,
"narHash": "sha256-p7VFHo/YlNcdlQCpcTq/ygmgnzZmgeaAgEx88dKHnfQ=", "narHash": "sha256-C75q+dsWnjObUKukRsFj2VKNRtULvZw/XszfGu97PyY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "cece0e097e27f583e61ff54f26916c29af7be7af", "rev": "f9b6659b7a856ad5c470ce224a0d69696c6f8c73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -839,11 +857,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723239681, "lastModified": 1723012587,
"narHash": "sha256-1UPtz+CsXFr4LbM2AijSqnzSZLBuZtfURE4ZPtlS3NI=", "narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "0bffd6001c7b27794222db76ba0eb48506935871", "rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -868,7 +886,7 @@
"roc": "roc", "roc": "roc",
"stable": "stable", "stable": "stable",
"tsm": "tsm", "tsm": "tsm",
"zig-overlay": "zig-overlay", "zig2nix": "zig2nix",
"zls": "zls" "zls": "zls"
} }
}, },
@ -1018,6 +1036,21 @@
"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": [
@ -1095,22 +1128,44 @@
"zig-overlay": { "zig-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_7",
"nixpkgs": [
"zls",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722600600,
"narHash": "sha256-bRpvmyAvt4OFbQJlmAURyW1To8nlRjNcQJdbOyI1MLE=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "4c95bb8378ca31cc06eba0a9ee0c04851221c193",
"type": "github"
},
"original": {
"owner": "mitchellh",
"repo": "zig-overlay",
"type": "github"
}
},
"zig2nix": {
"inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1723249552, "lastModified": 1723166646,
"narHash": "sha256-4nQBvZQOOiI3kr+Ch0XH9ZIhajpLooqGbrcUNMI1Hmw=", "narHash": "sha256-brh8KVKQOcwyc9v+nG/QixMuH+yra2+GLvzd3aKhkGo=",
"owner": "mitchellh", "owner": "Cloudef",
"repo": "zig-overlay", "repo": "zig2nix",
"rev": "d15f6040f95938da639fa7287821799f76dcaef3", "rev": "8d9b9e0134659665937b60ece972cc8108960e3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "mitchellh", "owner": "Cloudef",
"repo": "zig-overlay", "repo": "zig2nix",
"type": "github" "type": "github"
} }
}, },
@ -1122,9 +1177,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"zig-overlay": [ "zig-overlay": "zig-overlay"
"zig-overlay"
]
}, },
"locked": { "locked": {
"lastModified": 1722987529, "lastModified": 1722987529,

5
flake.nix
View file

@ -21,7 +21,7 @@
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";
zig-overlay.url = "github:mitchellh/zig-overlay"; zig2nix.url = "github:Cloudef/zig2nix";
zls.url = "github:zigtools/zls"; zls.url = "github:zigtools/zls";
pixi.url = "github:daylinmorgan/pixi-flake"; pixi.url = "github:daylinmorgan/pixi-flake";
@ -36,8 +36,7 @@
roc.inputs.nixpkgs.follows = "nixpkgs"; roc.inputs.nixpkgs.follows = "nixpkgs";
tsm.inputs.nixpkgs.follows = "nixpkgs"; tsm.inputs.nixpkgs.follows = "nixpkgs";
zls.inputs.nixpkgs.follows = "nixpkgs"; zls.inputs.nixpkgs.follows = "nixpkgs";
zls.inputs.zig-overlay.follows = "zig-overlay"; zig2nix.inputs.nixpkgs.follows = "nixpkgs";
zig-overlay.inputs.nixpkgs.follows = "nixpkgs";
}; };
nixConfig = { nixConfig = {

9
lib/checks.nix
View file

@ -22,24 +22,23 @@ let
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
]; ];
# TODO: start using pipes once support lands in nixd
# selfPackages = self.packages.${pkgs.system} |> attrValues;
selfPackages = (attrValues self.packages.${pkgs.system}); selfPackages = (attrValues self.packages.${pkgs.system});
in in
# selfPackages = self.packages.${pkgs.system} |> attrValues;
{ {
makePackages = makePackages =
pkgs.runCommandLocal "build-third-party" pkgs.runCommandLocal "build-third-party"
{ {
src = ./.;
nativeBuildInputs = nativeBuildInputs =
# packages from overlays # packages from overlays
(with pkgs; [ (with pkgs; [
swww swww
# nixVersions.git nixVersions.stable
]) ])
++ [ ++ [
(flake.pkgs "roc").full (flake.pkgs "roc").full
(flake.pkgs "zig-overlay").master (flake.pkgs "zig2nix").zig.master.bin
(flake.pkg "zls")
] ]
++ hyprPackages ++ hyprPackages
++ selfPackages; ++ selfPackages;

6
modules/languages/zig.nix
View file

@ -7,12 +7,14 @@
let let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
zig = (flake.pkgs "zig2nix").zig.master.bin;
zls = (flake.pkg "zls").overrideAttrs { nativeBuildInputs = [ zig ]; };
in in
{ {
config = mkIfIn "zig" cfg { config = mkIfIn "zig" cfg {
environment.systemPackages = [ environment.systemPackages = [
(flake.pkgs "zig-overlay").master zig
(flake.pkg "zls") zls
]; ];
}; };
} }

12
modules/nix.nix
View file

@ -3,7 +3,7 @@
pkgs, pkgs,
lib, lib,
enabled, enabled,
self, flake,
... ...
}: }:
let let
@ -15,10 +15,10 @@ in
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# nix.package = pkgs.nixVersions.latest; # nix.package = pkgs.nixVersions.latest;
nix = { nix = {
settings = { extraOptions = ''
experimental-features = [ "nix-command" "flakes" "pipe-operator"]; experimental-features = nix-command flakes pipe-operator
use-xdg-base-directories = true; use-xdg-base-directories = true
}; '';
optimise.automatic = true; optimise.automatic = true;
gc = { gc = {
@ -42,7 +42,7 @@ in
pkgs.nixfmt-rfc-style pkgs.nixfmt-rfc-style
pkgs.nix-output-monitor pkgs.nix-output-monitor
self.packages.${pkgs.system}.default (flake.pkg "self")
]; ];
programs.nix-index-database.comma = enabled; programs.nix-index-database.comma = enabled;

2
pkgs/oizys/internal/oizys/main.go
View file

@ -266,7 +266,7 @@ func writeDervationsToStepSummary(drvs []string) {
} }
o.writeToGithubStepSummary( o.writeToGithubStepSummary(
fmt.Sprintf(`# Building Derivations fmt.Sprintf(`# Building Derivations:
| derivation | hash | | derivation | hash |
|---|---| |---|---|
%s %s