Compare commits

...

5 commits

Author SHA1 Message Date
b9922f793d
bash 2025-01-17 13:54:49 -06:00
587cf1f0fe
update lix again 2025-01-17 12:28:27 -06:00
75473e4dcb
add nix-info 2025-01-17 12:28:27 -06:00
93b3eea1ba
add bash completion to distrobox 2025-01-17 12:10:58 -06:00
b00ae7e672
add extraArgs to input 2025-01-17 12:10:58 -06:00
5 changed files with 79 additions and 33 deletions

View file

@ -5,8 +5,8 @@ inputs:
description: Extra nix.conf config description: Extra nix.conf config
default: | default: |
accept-flake-config = true accept-flake-config = true
build-dir = /nix/var
experimental-features = pipe-operator experimental-features = pipe-operator
build-dir = /nix/var
keep-derivations = true keep-derivations = true
keep-outputs = true keep-outputs = true
clean: clean:
@ -37,3 +37,8 @@ runs:
run: | run: |
nix profile install "nixpkgs#attic-client" nix profile install "nixpkgs#attic-client"
attic login oizys https://attic.dayl.in "${{ inputs.attic_token}}" attic login oizys https://attic.dayl.in "${{ inputs.attic_token}}"
- name: "Show Nix Info"
shell: bash
run: nix run "nixpkgs#nix-info" -- -m

View file

@ -6,11 +6,15 @@ on:
hosts: hosts:
description: "list of hosts to build" description: "list of hosts to build"
required: true required: true
default: "othalan,algiz"
type: string type: string
default: "othalan,algiz"
lockFile: lockFile:
description: "flake.lock file" description: "flake.lock file"
type: string type: string
extraArgs:
description: "postional args forwared to nix"
type: string
default: "--keep-going"
workflow_call: workflow_call:
inputs: inputs:
@ -54,4 +58,4 @@ jobs:
--flake . --flake .
-vv -vv
-- --
--keep-going ${{ inputs.extraArgs }}

View file

@ -107,6 +107,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -440,38 +458,38 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729298361, "lastModified": 1737086202,
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", "narHash": "sha256-33tcNERQt1R7tr/W7pvQj8R6NJktyTOKMIfY16RHLK8=",
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be", "rev": "0d14c2b67a407825e3427bf079b31de069d9653a",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0d14c2b67a407825e3427bf079b31de069d9653a.tar.gz?rev=0d14c2b67a407825e3427bf079b31de069d9653a"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_2",
"flake-utils"
],
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": [
"lix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1729360442, "lastModified": 1733522213,
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=",
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6", "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c374ebf5548c7b6d4bf884369a5b6879cfc916ea.tar.gz?rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
} }
}, },
"my-nixpkgs": { "my-nixpkgs": {
@ -640,6 +658,7 @@
"hyprman": "hyprman", "hyprman": "hyprman",
"jj": "jj", "jj": "jj",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"my-nixpkgs": "my-nixpkgs", "my-nixpkgs": "my-nixpkgs",
"nim2nix": "nim2nix", "nim2nix": "nim2nix",
@ -743,6 +762,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"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": [

View file

@ -8,22 +8,23 @@
stable.url = "github:nixos/nixpkgs/nixos-24.05"; stable.url = "github:nixos/nixpkgs/nixos-24.05";
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable"; my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
# lix = { lix = {
# url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
# flake = false; flake = false;
# }; };
# lix-module = { lix-module = {
# url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
# inputs.lix.follows = "lix"; inputs.lix.follows = "lix";
# }; };
# lix is failing to build only on GHA? # lix is failing to build only on GHA?
# keep for when lix breaks :/ # keep for when lix breaks :/
lix-module = { # lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils"; # inputs.flake-utils.follows = "flake-utils";
}; # };
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";

View file

@ -47,8 +47,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
''; '';
postInstall = '' postInstall = ''
ls completions/zsh installShellCompletion \
installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox --cmd distrbox \
--zsh completions/zsh/_distrobox \
--bash completions/bash/distrbox
''; '';
meta = with lib; { meta = with lib; {