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

Compare commits

base: daylin:fb8bd35deebde4def152702dd3c96a22ed6b4d57
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:d1921985b3de64f4047dcbe22ffbb1d95644fc0a
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

7 commits
fb8bd35dee ... d1921985b3

Author SHA1 Message Date
Daylin Morgan
d1921985b3
replace readme help 2024-09-16 10:45:07 -05:00
Daylin Morgan
59c9fe94a5
flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb' (2024-09-14)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=9e356562446f44c471ae38a80506a9df039305d6' (2024-09-15)
• Updated input 'lix':
    '727258241f.tar.gz?narHash=sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0%3D&rev=727258241fc0b3c02691b72302d2c3092baca275' (2024-09-14)
  → '80202e3ca3.tar.gz?narHash=sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX%2BVTCXDcYviStTk%3D&rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87' (2024-09-15)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/642275444c5a9defce57219c944b3179bf2adaa9' (2024-09-08)
  → 'github:nix-community/nix-index-database/c1b0fa0bec5478185eae2fd3f39b9e906fc83995' (2024-09-16)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/34b95b3962f5b3436d4bae5091d1b2ff7c1eb180' (2024-09-09)
  → 'github:nix-community/NixOS-WSL/20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5' (2024-09-16)
• Updated input 'nixos-wsl/nixpkgs':
    'github:NixOS/nixpkgs/68e7dce0a6532e876980764167ad158174402c6f' (2024-09-07)
  → 'github:NixOS/nixpkgs/8f7492cce28977fbf8bd12c72af08b1f6c7c3e49' (2024-09-14)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11)
  → 'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/f7a91cffe777b139d0b4e4e54d480950018ab37b' (2024-09-14)
  → 'github:nix-community/nixpkgs-wayland/cbe4866388730d63d98743cc884062b6374beb41' (2024-09-16)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/3c180ce6583583285ef1b105cbc1667ba00c3e8d' (2024-09-08)
  → 'github:nix-community/lib-aggregate/90b637e33ab9be23e0ba3c57905a1837561923ea' (2024-09-15)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/68584f89dd0eb16fea5d80ae127f3f681f6a5df7' (2024-09-08)
  → 'github:nix-community/nixpkgs.lib/9db4db09d82e4b2207bfa7f1e747a4f49d214555' (2024-09-15)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/4f807e8940284ad7925ebd0a0993d2a1791acb2f' (2024-09-11)
  → 'github:nixos/nixpkgs/345c263f2f53a3710abe117f28a5cb86d0ba4059' (2024-09-13)
• Updated input 'roc':
    'github:roc-lang/roc/1993cd336b95b9b76d22db1e9e7821de68263910' (2024-09-12)
  → 'github:roc-lang/roc/7df11424550bb7955a178190a3b341e34d184a19' (2024-09-15)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59' (2024-09-14)
  → 'github:mitchellh/zig-overlay/ff9255e02181bad3562f5f24fa27a26036a5f112' (2024-09-16)
• Updated input 'zls':
    'github:zigtools/zls/dd78968d4c8deefd33addc2b1cc14f60d89ec1a9' (2024-09-08)
  → 'github:zigtools/zls/956b436a3f302d5dbc7fecfa565da666c1b2df77' (2024-09-15)
 2024-09-16 10:37:53 -05:00
Daylin Morgan
719d67b0d0
correct order 2024-09-16 10:37:53 -05:00
dependabot[bot]
6ce6c9e29b Bump DeterminateSystems/magic-nix-cache-action from 7 to 8 
Bumps [DeterminateSystems/magic-nix-cache-action](https://github.com/determinatesystems/magic-nix-cache-action) from 7 to 8.
- [Release notes](https://github.com/determinatesystems/magic-nix-cache-action/releases)
- [Commits](https://github.com/determinatesystems/magic-nix-cache-action/compare/v7...v8)

---
updated-dependencies:
- dependency-name: DeterminateSystems/magic-nix-cache-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-16 10:37:01 -05:00
dependabot[bot]
8472d2089b Bump DeterminateSystems/nix-installer-action from 13 to 14 
Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 13 to 14.
- [Release notes](https://github.com/determinatesystems/nix-installer-action/releases)
- [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v13...v14)

---
updated-dependencies:
- dependency-name: DeterminateSystems/nix-installer-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-16 10:36:53 -05:00
Daylin Morgan
07cb1e0f16
remove workaround 2024-09-16 10:08:04 -05:00
Daylin Morgan
2d7339599d
apt purge is failing 2024-09-16 10:06:30 -05:00
9 changed files with 65 additions and 82 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@v13 - uses: DeterminateSystems/nix-installer-action@v14
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@v7 - uses: DeterminateSystems/magic-nix-cache-action@v8
- 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@v7 - uses: DeterminateSystems/magic-nix-cache-action@v8
- 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@v13 - uses: DeterminateSystems/nix-installer-action@v14
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@v13 - uses: DeterminateSystems/nix-installer-action@v14
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: |

28
README.md
View file

@ -55,30 +55,18 @@ nix run "github:daylinmorgan/oizys"
``` ```
nix begat oizys nix begat oizys
Usage: Usage:
oizys [command] oizys {SUBCMD} [sub-command options & parameters]
Available Commands: subcommands:
help print comprehensive or per-cmd help
build nix build build nix build
cache build and push to cachix cache build and push to cachix
checks nix build checks ci trigger GHA update flow
ci offload build to GHA dry dry run build
dry poor man's nix flake check os nixos-rebuild
help Help about any command output output
os nixos-rebuild wrapper update update and run nixos-rebuild
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": 1726353438, "lastModified": 1726430622,
"narHash": "sha256-DLSpQXNt6LLkhREYrnhU+/XrfDNiSN41iD575ua9+yA=", "narHash": "sha256-50vt1snpVwS5lqvvH4p6DHiEWspJUZuJ1kYy1DKtrfM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e74efd87e5aa38f9cf84cb3848ee1ab26e5e4bcb", "rev": "9e356562446f44c471ae38a80506a9df039305d6",
"revCount": 5221, "revCount": 5224,
"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": 1725797487, "lastModified": 1726402305,
"narHash": "sha256-1NqTS6PePeoLVH8UY6poIoxlNq1Hhgn7RZs+OT8b2wQ=", "narHash": "sha256-Ps21x+17J0rclqg68crak2Vo/P3+1fZStqmV+OI7k6M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "3c180ce6583583285ef1b105cbc1667ba00c3e8d", "rev": "90b637e33ab9be23e0ba3c57905a1837561923ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +504,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726342126, "lastModified": 1726411950,
"narHash": "sha256-SqATcoZoC90sjVXmjBpvXAiksQfTGR08nuZh4h8esY0=", "narHash": "sha256-OnPGWKN3mJCsbdt4zOCVSTWg8N9QX+VTCXDcYviStTk=",
"rev": "727258241fc0b3c02691b72302d2c3092baca275", "rev": "80202e3ca314c21547c48f3a23d3f629cd9ddb87",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/727258241fc0b3c02691b72302d2c3092baca275.tar.gz?rev=727258241fc0b3c02691b72302d2c3092baca275" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/80202e3ca314c21547c48f3a23d3f629cd9ddb87.tar.gz?rev=80202e3ca314c21547c48f3a23d3f629cd9ddb87"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -647,11 +647,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725765290, "lastModified": 1726449931,
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=", "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "642275444c5a9defce57219c944b3179bf2adaa9", "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -692,11 +692,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1725882169, "lastModified": 1726477654,
"narHash": "sha256-v5L+Dh6KdyycIgcdIc6SQ1fRNNvFJmYz02+fyeptA2o=", "narHash": "sha256-nE34QJfnkLZyZIVOXd73iICyvYROVSOo4h7pVRs0mqg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "34b95b3962f5b3436d4bae5091d1b2ff7c1eb180", "rev": "20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -723,11 +723,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1725757153, "lastModified": 1726362065,
"narHash": "sha256-c1a6iLmCVPFI9EUVMrBN8xdmFxFXEjcVwiTSVmqajOs=", "narHash": "sha256-4h15WKdrs9zf6DGaeeV7ntU/pHHGkH6geYt1QBW0CP4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "68584f89dd0eb16fea5d80ae127f3f681f6a5df7", "rev": "9db4db09d82e4b2207bfa7f1e747a4f49d214555",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -744,11 +744,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1726348607, "lastModified": 1726496380,
"narHash": "sha256-9Y3WXlXemlgmyzusDn4igL6UYg0Ye2fi7fcQL/gg6BA=", "narHash": "sha256-0SPQYespqgqODDBDpdryqWDcwUOObk0NxIMUjRQ7ydY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "f7a91cffe777b139d0b4e4e54d480950018ab37b", "rev": "cbe4866388730d63d98743cc884062b6374beb41",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725693463, "lastModified": 1726320982,
"narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=", "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "68e7dce0a6532e876980764167ad158174402c6f", "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -791,11 +791,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1726062873, "lastModified": 1726243404,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -823,11 +823,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1726062873, "lastModified": 1726243404,
"narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -900,11 +900,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1726146664, "lastModified": 1726359326,
"narHash": "sha256-lDUWuoj+iNGdHec5FnzDemhxs7xQgSAMcBlr+vrbTQk=", "narHash": "sha256-Nt7Ywk1lO6S4jLv9CYg7HN9nOhmgV79uUiSLWXA4fPE=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "1993cd336b95b9b76d22db1e9e7821de68263910", "rev": "7df11424550bb7955a178190a3b341e34d184a19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1184,11 +1184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726315777, "lastModified": 1726488713,
"narHash": "sha256-lbEfQ3ZWUsmJMeWbrUYDKIIYYas+GUdZVbtgn6txTfU=", "narHash": "sha256-af/hZxM6+AVuap2g0sshCbIr4jr2D734JwMI+RdoVrQ=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "25f9cfc60ec930a6abb0be1ff89b3e27cda1cb59", "rev": "ff9255e02181bad3562f5f24fa27a26036a5f112",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1209,11 +1209,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725812318, "lastModified": 1726435403,
"narHash": "sha256-kqPJwnlhGByYBE1gqr7WI7O/Em8LmLPTBhPEST8OA8s=", "narHash": "sha256-KB95mT5hMppNqV4uX7det1D1m5Y0rTQotjmGXYnnps0=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "dd78968d4c8deefd33addc2b1cc14f60d89ec1a9", "rev": "956b436a3f302d5dbc7fecfa565da666c1b2df77",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
modules/networking/vpn.nix
View file

@ -28,10 +28,6 @@ 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,10 +95,9 @@ proc setupCligen() =
let isColor = getEnv("NO_COLOR") == "" let isColor = getEnv("NO_COLOR") == ""
if clCfg.useMulti == "": if clCfg.useMulti == "":
clCfg.useMulti = clCfg.useMulti =
if isColor: if isColor: "${doc}\e[1mUsage\e[m:\n $command {SUBCMD} [sub-command options & parameters]\n\n\e[1msubcommands\e[m:\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"
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 = result.len - nToBuild let nIgnored = nToBuild - result.len
debug fmt"ignored {nIgnored} derivations" debug fmt"ignored {nIgnored} derivations"
result = result.mapIt(it & "^*") result = result.mapIt(it & "^*")