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

Compare commits

base: daylin:d1921985b3de64f4047dcbe22ffbb1d95644fc0a
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:fb8bd35deebde4def152702dd3c96a22ed6b4d57
Branches Tags
daylin:flake-lock
daylin:main

No commits in common. "d1921985b3de64f4047dcbe22ffbb1d95644fc0a" and "fb8bd35deebde4def152702dd3c96a22ed6b4d57" have entirely different histories.
d1921985b3 ... fb8bd35dee

9 changed files with 83 additions and 66 deletions
Show stats Expand all files Collapse all files

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

@ -34,11 +34,11 @@ runs:
echo "Removing unwanted software... " echo "Removing unwanted software... "
# if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then if [[ "${{ inputs.purge-packages }}" == 'true' ]]; then
# sudo apt-get purge \ sudo apt-get purge \
# --allow-remove-essential \ --allow-remove-essential \
# $(non_manifest_packages) # > /dev/null $(non_manifest_packages) # > /dev/null
# fi fi
sudo rm -rf \ sudo rm -rf \
/var/lib/docker/ \ /var/lib/docker/ \

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

@ -32,14 +32,14 @@ jobs:
# - uses: ./.github/actions/clean-disk # - uses: ./.github/actions/clean-disk
- uses: DeterminateSystems/nix-installer-action@v14 - uses: DeterminateSystems/nix-installer-action@v13
with: with:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: | extra-conf: |
experimental-features = pipe-operator experimental-features = pipe-operator
accept-flake-config = true accept-flake-config = true
- uses: DeterminateSystems/magic-nix-cache-action@v8 - uses: DeterminateSystems/magic-nix-cache-action@v7
- uses: cachix/cachix-action@v15 - uses: cachix/cachix-action@v15
with: with:

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

@ -22,7 +22,7 @@ jobs:
with: with:
extra-conf: | extra-conf: |
accept-flake-config = true accept-flake-config = true
- uses: DeterminateSystems/magic-nix-cache-action@v8 - uses: DeterminateSystems/magic-nix-cache-action@v7
- uses: cachix/cachix-action@v15 - uses: cachix/cachix-action@v15
with: with:

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

@ -24,7 +24,7 @@ jobs:
- run: git checkout -B flake-lock - run: git checkout -B flake-lock
- uses: DeterminateSystems/nix-installer-action@v14 - uses: DeterminateSystems/nix-installer-action@v13
with: with:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: | extra-conf: |
@ -80,7 +80,7 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: DeterminateSystems/nix-installer-action@v14 - uses: DeterminateSystems/nix-installer-action@v13
with: with:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: | extra-conf: |

34
README.md
View file

@ -55,18 +55,30 @@ nix run "github:daylinmorgan/oizys"
``` ```
nix begat oizys nix begat oizys
Usage:
oizys {SUBCMD} [sub-command options & parameters]
subcommands: Usage:
help print comprehensive or per-cmd help oizys [command]
build nix build
cache build and push to cachix Available Commands:
ci trigger GHA update flow build nix build
dry dry run build cache build and push to cachix
os nixos-rebuild checks nix build checks
output output ci offload build to GHA
update update and run nixos-rebuild dry poor man's nix flake check
help Help about any command
os nixos-rebuild wrapper
output show nixosConfiguration attr
update update and run nixos rebuild
Flags:
--debug show debug output
--flake string path to flake ($OIZYS_DIR or $HOME/oizys)
-h, --help help for oizys
--host string host(s) to build (current host)
--reset-cache set narinfo-cache-negative-ttl to 0
-v, --verbose show verbose output
Use "oizys [command] --help" for more information about a command.
``` ```
## oizys? ## oizys?

82
flake.lock
View file

@ -323,11 +323,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1726430622, "lastModified": 1726353438,
"narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=", "narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "9e356562446f44c471ae38a80506a9df039305d6", "rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb",
"revCount": 5224, "revCount": 5221,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -488,11 +488,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1726402305, "lastModified": 1725797487,
"narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=", "narHash": "sha256-1NqTS6PePeoLVH8UY6poIoxlNq1Hhgn7RZs+OT8b2wQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "90b637e33ab9be23e0ba3c57905a1837561923ea", "rev": "3c180ce6583583285ef1b105cbc1667ba00c3e8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726411950, "lastModified": 1726342126,
"narHash": "sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX+VTCXDcYviStTk=", "narHash": "sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0=",
"rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87", "rev": "727258241fc0b3c02691b72302d2c3092baca275",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/80202e3ca314c21547c48f3a23d3f629cd9ddb87.tar.gz?rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/727258241fc0b3c02691b72302d2c3092baca275.tar.gz?rev=727258241fc0b3c02691b72302d2c3092baca275"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -647,11 +647,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726449931, "lastModified": 1725765290,
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", "narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", "rev": "642275444c5a9defce57219c944b3179bf2adaa9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -692,11 +692,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1726477654, "lastModified": 1725882169,
"narHash": "sha256-nE34QJfnkLZyZIVOXd73iICyvYROVSOo4h7pVRs0mqg=", "narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5", "rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -723,11 +723,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1726362065, "lastModified": 1725757153,
"narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=", "narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555", "rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1726496380, "lastModified": 1726348607,
"narHash": "sha256-0SPQYespqgqODDBDpdryqWDcwUOObk0NxIMUjRQ7ydY=", "narHash": "sha256-9Y3WXlXemlgmyzusDn4igL6UYg0Ye2fi7fcQL/gg6BA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "cbe4866388730d63d98743cc884062b6374beb41", "rev": "f7a91cffe777b139d0b4e4e54d480950018ab37b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1726320982, "lastModified": 1725693463,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", "rev": "68e7dce0a6532e876980764167ad158174402c6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +791,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726062873,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +823,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1726243404, "lastModified": 1726062873,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +900,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1726359326, "lastModified": 1726146664,
"narHash": "sha256-Nt7Ywk1lO6S4jLv9CYg7HN9nOhmgV79uUiSLWXA4fPE=", "narHash": "sha256-lDUWuoj+iNGdHec5FnzDemhxs7xQgSAMcBlr+vrbTQk=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "7df11424550bb7955a178190a3b341e34d184a19", "rev": "1993cd336b95b9b76d22db1e9e7821de68263910",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1184,11 +1184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726488713, "lastModified": 1726315777,
"narHash": "sha256-af/hZxM6+AVuap2g0sshCbIr4jr2D734JwMI+RdoVrQ=", "narHash": "sha256-lbEfQ3ZWUsmJMeWbrUYDKIIYYas+GUdZVbtgn6txTfU=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "ff9255e02181bad3562f5f24fa27a26036a5f112", "rev": "25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1209,11 +1209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726435403, "lastModified": 1725812318,
"narHash": "sha256-KB95mT5hMppNqV4uX7det1D1m5Y0rTQotjmGXYnnps0=", "narHash": "sha256-kqPJwnlhGByYBE1gqr7WI7O/Em8LmLPTBhPEST8OA8s=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "956b436a3f302d5dbc7fecfa565da666c1b2df77", "rev": "dd78968d4c8deefd33addc2b1cc14f60d89ec1a9",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/networking/vpn.nix
View file

@ -28,6 +28,10 @@ mkOizysModule config "vpn" {
''; '';
autoStart = false; autoStart = false;
updateResolvConf = true; updateResolvConf = true;
# https://github.com/NixOS/nixpkgs/pull/341223
# what happens when PR's are merged without review...
extraArgs = [];
}; };
}; };

7
pkgs/oizys-nim/src/oizys.nim
View file

@ -95,9 +95,10 @@ proc setupCligen() =
let isColor = getEnv("NO_COLOR") == "" let isColor = getEnv("NO_COLOR") == ""
if clCfg.useMulti == "": if clCfg.useMulti == "":
clCfg.useMulti = clCfg.useMulti =
if isColor: "${doc}\e[1mUsage\e[m:\n $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds" if isColor:
else: "${doc}Usage:\n $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds" "${doc}\e[1mUsage\e[m:\n $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\n$subcmds"
else:
"${doc}Usage:\n $command {SUBCMD} [sub-command options & parameters]\n\nsubcommands:\n$subcmds"
if not isColor: return if not isColor: return
if clCfg.helpAttr.len == 0: if clCfg.helpAttr.len == 0:
clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m", clCfg.helpAttr = {"cmd": "\e[1;36m", "clDescrip": "", "clDflVal": "\e[33m",

2
pkgs/oizys-nim/src/oizys/nix.nim
View file

@ -162,7 +162,7 @@ proc systemPathDrvsToBuild(): seq[string] =
result = inputDrvs.filterIt(it in toBuild) result = inputDrvs.filterIt(it in toBuild)
let nToBuild = result.len let nToBuild = result.len
result = result.filterIt(not it.isIgnored) result = result.filterIt(not it.isIgnored)
let nIgnored = nToBuild - result.len let nIgnored = result.len - nToBuild
debug fmt"ignored {nIgnored} derivations" debug fmt"ignored {nIgnored} derivations"
result = result.mapIt(it & "^*") result = result.mapIt(it & "^*")