Compare commits

...

3 commits

Author SHA1 Message Date
d23eac866f
silence apt-get 2024-06-20 11:56:03 -05:00
cea8b1a18d
simplify GHA 2024-06-20 11:16:19 -05:00
b3f3ec6c44
update lix-module 2024-06-20 11:14:45 -05:00
4 changed files with 22 additions and 34 deletions

View file

@ -41,7 +41,7 @@ runs:
sudo apt-get purge \ sudo apt-get purge \
--allow-remove-essential \ --allow-remove-essential \
-qq \ -qq \
$(non_manifest_packages) & $(non_manifest_packages) > /dev/null &
fi fi
wait wait

View file

@ -52,7 +52,10 @@ jobs:
- name: Build - name: Build
run: | run: |
for host in ${{ inputs.host }}; do nix run . \
cachix watch-exec daylin -- nix build --print-build-logs "$(nix run . -- output --system-path --host "$host" --flake .)^*" -- \
# nix run . --accept-flake-config -- cache --host "$host" --flake . build --system-path \
done --host "$host" \
--flake . \
-- \
--print-build-logs

View file

@ -500,41 +500,34 @@
"locked": { "locked": {
"lastModified": 1718419213, "lastModified": 1718419213,
"narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=", "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=",
"ref": "refs/tags/2.90.0-rc1",
"rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1", "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1",
"revCount": 15780, "type": "tarball",
"type": "git", "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz"
"url": "https://git@git.lix.systems/lix-project/lix"
}, },
"original": { "original": {
"ref": "refs/tags/2.90.0-rc1", "type": "tarball",
"type": "git", "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"
"url": "https://git@git.lix.systems/lix-project/lix"
} }
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": [ "lix": "lix",
"lix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1718778751, "lastModified": 1718778548,
"narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=", "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=",
"ref": "refs/heads/main", "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9",
"rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8", "type": "tarball",
"revCount": 90, "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz"
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}, },
"original": { "original": {
"type": "git", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"
} }
}, },
"nix-eval-jobs": { "nix-eval-jobs": {
@ -875,7 +868,6 @@
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"hyprman": "hyprman", "hyprman": "hyprman",
"lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",

View file

@ -12,16 +12,9 @@
url = "github:nix-community/nix-index-database"; url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lix = {
url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90.0-rc1";
flake = false;
};
lix-module = { lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
lix.follows = "lix";
nixpkgs.follows = "nixpkgs";
};
}; };
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";