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

Compare commits

base: daylin:79984d5ddcdf3452fd5cf453d88e0ec428566d8e
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:ac4962611820aee9792ab0c37b5ebe52e787e4ee
Branches Tags
daylin:flake-lock
daylin:main

1 commit
79984d5ddc ... ac49626118

Author SHA1 Message Date
daylin-bot
ac49626118 flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=ab0a3268e04f2295ec4455be90ce8d0c2b107b8d&submodules=1' (2024-08-01)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0e86808e5912823f1c6bea1b6d5fcae297fc9f57&submodules=1' (2024-08-05)
• Updated input 'hyprland-contrib':
    'github:hyprwm/contrib/65d42dcbfde2229a75ccdb195c318dfe241f9ade?narHash=sha256-78j/cY%2BAXoMIqqiNc1vWx237EPfpERAcYsb57ABUbwQ%3D' (2024-07-11)
  → 'github:hyprwm/contrib/9d67858b437d4a1299be496d371b66fc0d3e01f6?narHash=sha256-%2B7IS0n3/F0I5j6ZbrVlLcIIPHY3o%2B/vLAqg/G48sG%2Bw%3D' (2024-08-02)
• Updated input 'lix':
    '61a93d5308.tar.gz?narHash=sha256-IDr%2BfHKwmpaWi4hzD2RYLdiaGEFOrsFm%2BNeHKETxMhk%3D' (2024-08-01)
  → '66469fc281.tar.gz?narHash=sha256-FrM0DN/i5kKB06/4KYNkY3mMGpC5hYQhaKtx1mneReU%3D' (2024-08-03)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/c0ca47e8523b578464014961059999d8eddd4aae?narHash=sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY%2B2dv%2BAIcKfmSp5A%3D' (2024-07-28)
  → 'github:nix-community/nix-index-database/97ca0a0fca0391de835f57e44f369a283e37890f?narHash=sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss%3D' (2024-08-04)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce?narHash=sha256-5US0/pgxbMksF92k1%2BeOa8arJTJiPvsdZj9Dl%2BvJkM4%3D' (2024-07-31)
  → 'github:nixos/nixpkgs/785feb91183a50959823ff9ba9ef673105259cd5?narHash=sha256-bPhyAXNnVerBZusxOuPMhMm0X7hSFLFKcH%2B7ynfgLjs%3D' (2024-08-04)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/0bbe640011f1350933109f5450b15f9bd1fb5e9f?narHash=sha256-9YvLtuLAA%2BLVmfrvlOsynHkS0DRCYnHFEp72NfXFVnc%3D' (2024-08-01)
  → 'github:nix-community/nixpkgs-wayland/f6cda1512287fa498bd363c0ae80e87606254cfb?narHash=sha256-hwwKU6Ml5i8I6aBmEWsddz%2Bfm7D0r56d3A9IoGD1qlM%3D' (2024-08-05)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/4ce8efe904950cd85bda9624ff1c2ec55fe2ab6f?narHash=sha256-16XBXW86ceQC%2BjRx7feCREZo696kvIzpKYmN2LnKfaE%3D' (2024-07-28)
  → 'github:nix-community/lib-aggregate/04a4b4d84e02590715e753da3d35fb03cddc6425?narHash=sha256-puSEio9yjWojIBDBts4BSGZ43rv1LzIevdYOKmW/Mjg%3D' (2024-08-04)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/d15f6f6021693898fcd2c6a9bb13707383da9bbc?narHash=sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s%3D' (2024-07-28)
  → 'github:nix-community/nixpkgs.lib/8bebd4c74f368aacb047f0141db09ec6b339733c?narHash=sha256-do2Mfm3T6SR7a5A804RhjQ%2BJTsF5hk4JTPGjCTRM/m8%3D' (2024-08-04)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58?narHash=sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA%3D' (2024-07-31)
  → 'github:nixos/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da?narHash=sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo%3D' (2024-08-02)
• Updated input 'roc':
    'github:roc-lang/roc/790eabd933e13b0836c6ec243c77f873a5956966?narHash=sha256-hjdIYAuQMWLtlxxj9GpgnfFgmGJhxDDYXnBvEVeNXG8%3D' (2024-08-01)
  → 'github:roc-lang/roc/13f60cde09ef01c003fe362bf46e592a0f4ae7c6?narHash=sha256-Yr9P/TyxgVVwgXIiu96up2hgWjMR0zWPbaihyNXp%2Br0%3D' (2024-08-05)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/b368a9170c6d6727375d2f43baf2565280e86019?narHash=sha256-b9q/NoJ3I5LtXVvxxjxNRxDEVMd%2B1daVldCyAYH7aCU%3D' (2024-08-01)
  → 'github:Cloudef/zig2nix/9a3a862bf6b89bc77f2add620678b120b22c34bc?narHash=sha256-WWaaNV8mv4SjLsohrBxGbgVVjSLPJNazQiQL/zqxaLM%3D' (2024-08-05)
• Updated input 'zls':
    'github:zigtools/zls/eba1489b6ffa6db7f0eaefce6e06d53cd9066f7b?narHash=sha256-GAzXTJUJJIXrAlHkInSDwlnVQPL5BV1Enbj3R4ipGFk%3D' (2024-07-28)
  → 'github:zigtools/zls/f2f5339370cf166d75be9b220b9553396543c83c?narHash=sha256-TlP%2BtlSAZTaJaulS2qEIaaQcJ7/z%2BmFs/cNTv%2BccbzM%3D' (2024-08-05)
• Updated input 'zls/zig-overlay':
    'github:mitchellh/zig-overlay/d9099d32bb395be5ed7eeb12ea0145d476632bd1?narHash=sha256-GLI%2B3yaZn6hHvv6wnYJHGqPfX6G3tXJNrTi7qYV9u94%3D' (2024-07-26)
  → 'github:mitchellh/zig-overlay/4c95bb8378ca31cc06eba0a9ee0c04851221c193?narHash=sha256-bRpvmyAvt4OFbQJlmAURyW1To8nlRjNcQJdbOyI1MLE%3D' (2024-08-02)
 2024-08-06 00:33:36 +00:00
11 changed files with 92 additions and 76 deletions
Show stats Expand all files Collapse all files

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

@ -57,6 +57,7 @@ jobs:
build --minimal \ build --minimal \
--host "${{ inputs.hosts }}" \ --host "${{ inputs.hosts }}" \
--flake . \ --flake . \
--verbose \
--debug \ --debug \
-- \ -- \
--print-build-logs --print-build-logs

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

@ -22,7 +22,6 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v13 - uses: DeterminateSystems/nix-installer-action@v13
with: with:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: | extra-conf: |
accept-flake-config = true accept-flake-config = true
@ -44,6 +43,7 @@ jobs:
build --minimal \ build --minimal \
--host "othalan" \ --host "othalan" \
--flake . \ --flake . \
--verbose \
--debug \ --debug \
-- \ -- \
--print-build-logs --print-build-logs
@ -86,6 +86,7 @@ jobs:
-- \ -- \
build $system_attr \ build $system_attr \
--flake . \ --flake . \
--verbose \
--debug \ --debug \
-- \ -- \
--print-build-logs \ --print-build-logs \
@ -100,9 +101,9 @@ jobs:
-- \ -- \
build $system_attr \ build $system_attr \
--flake . \ --flake . \
--verbose \
--debug \ --debug \
-- \ -- \
--keep-going \
--print-build-logs \ --print-build-logs \
--out-link updated --out-link updated

46
flake.lock
View file

@ -341,11 +341,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1722956902, "lastModified": 1722880701,
"narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=", "narHash": "sha256-hAGsRq9YIuT6lC8p1ukd5uDRjgpjCcVb9PxrdNeO3jE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c", "rev": "0e86808e5912823f1c6bea1b6d5fcae297fc9f57",
"revCount": 5055, "revCount": 5052,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -534,11 +534,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722957485, "lastModified": 1722643724,
"narHash": "sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo=", "narHash": "sha256-FrM0DN/i5kKB06/4KYNkY3mMGpC5hYQhaKtx1mneReU=",
"rev": "f84997cbefb2f2dd99e48f0ad39f747ed83d69e9", "rev": "66469fc281fc4abb3284574f77a8051fee8116b9",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f84997cbefb2f2dd99e48f0ad39f747ed83d69e9.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66469fc281fc4abb3284574f77a8051fee8116b9.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -715,11 +715,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1722928655, "lastModified": 1722889110,
"narHash": "sha256-2BAfUaRzrhHwT/JodTq++DUf/nljgoFEc5A79SS8ydU=", "narHash": "sha256-hwwKU6Ml5i8I6aBmEWsddz+fm7D0r56d3A9IoGD1qlM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "423d21c157c2a7b384ae9c766e25759576dceb87", "rev": "f6cda1512287fa498bd363c0ae80e87606254cfb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1722926584, "lastModified": 1722802969,
"narHash": "sha256-sLA+lfCxTkXf4o3JVxcfe+w9kAzauGfEnJ9roNbNng8=", "narHash": "sha256-bPhyAXNnVerBZusxOuPMhMm0X7hSFLFKcH+7ynfgLjs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d33cf80b603b3d0cddb48f9816cae707a59e2334", "rev": "785feb91183a50959823ff9ba9ef673105259cd5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -794,11 +794,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1722813957, "lastModified": 1722630782,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1156,11 +1156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722907357, "lastModified": 1722820746,
"narHash": "sha256-alp8wfWJtxLXKNuVXPjhWFtrGhp10/3Nle//1RkapgU=", "narHash": "sha256-WWaaNV8mv4SjLsohrBxGbgVVjSLPJNazQiQL/zqxaLM=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "32c6285061bbab4920b020ec9e9f4aa5c9a81750", "rev": "9a3a862bf6b89bc77f2add620678b120b22c34bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1180,11 +1180,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722919037, "lastModified": 1722891504,
"narHash": "sha256-h8BG+XOCli8++tCojSo/cF39AIixVj3mO94b4cuqT94=", "narHash": "sha256-TlP+tlSAZTaJaulS2qEIaaQcJ7/z+mFs/cNTv+ccbzM=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "74b5a00f67ab4e5a848646411779221e6cc24b87", "rev": "f2f5339370cf166d75be9b220b9553396543c83c",
"type": "github" "type": "github"
}, },
"original": { "original": {

49
flake.nix
View file

@ -8,7 +8,10 @@
stable.url = "github:nixos/nixpkgs/nixos-23.11"; stable.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
lix.flake = false; lix.flake = false;
@ -20,23 +23,37 @@
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";
zig2nix.url = "github:Cloudef/zig2nix";
zls.url = "github:zigtools/zls";
pixi.url = "github:daylinmorgan/pixi-flake"; zig2nix = {
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; url = "github:Cloudef/zig2nix";
tsm.url = "github:daylinmorgan/tsm?dir=nix"; inputs.nixpkgs.follows = "nixpkgs";
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git"; };
zls = {
url = "github:zigtools/zls";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprman.inputs.nixpkgs.follows = "nixpkgs"; roc = {
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs"; url = "github:roc-lang/roc";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
pixi.inputs.nixpkgs.follows = "nixpkgs"; };
roc.inputs.nixpkgs.follows = "nixpkgs";
tsm.inputs.nixpkgs.follows = "nixpkgs"; pixi = {
zls.inputs.nixpkgs.follows = "nixpkgs"; url = "github:daylinmorgan/pixi-flake";
zig2nix.inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
};
f1multiviewer = {
url = "github:daylinmorgan/f1multiviewer-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
tsm = {
url = "github:daylinmorgan/tsm?dir=nix";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprman = {
url = "git+https://git.dayl.in/daylin/hyprman.git";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
nixConfig = { nixConfig = {

29
modules/nix.nix
View file

@ -14,29 +14,18 @@ in
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# nix.package = pkgs.nixVersions.latest; # nix.package = pkgs.nixVersions.latest;
nix = { nix.extraOptions = ''
extraOptions = '' experimental-features = nix-command flakes
experimental-features = nix-command flakes use-xdg-base-directories = true
use-xdg-base-directories = true '';
'';
optimise.automatic = true; nix.optimise.automatic = true;
gc = { nix.gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
options = "--delete-older-than 7d"; options = "--delete-older-than 7d";
};
# use the same nixpkgs for nix run "nixpkgs#hello" style commands
registry.nixpkgs.flake = inputs.nixpkgs;
}; };
# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
# use the same nixpkgs for nix-shell -p hello style commands
# I don't know that this is necesary...
# nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
# environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
environment.systemPackages = [ environment.systemPackages = [
pkgs.nixd pkgs.nixd
pkgs.nixfmt-rfc-style pkgs.nixfmt-rfc-style

2
modules/oizys.nix
View file

@ -41,7 +41,7 @@ in
options.oizys = { options.oizys = {
user = mkOption { user = mkOption {
type = lib.types.str; type = lib.types.string;
default = "daylin"; default = "daylin";
description = "main user account"; description = "main user account";
}; };

11
pkgs/oizys/cmd/os.go
View file

@ -10,12 +10,10 @@ import (
) )
var validArgs = []string{ var validArgs = []string{
"switch", "boot", "test", "build", "dry-build", "switch", "boot", "test", "build", "dry-build", "dry-activate", "edit", "repl",
"dry-activate", "edit", "repl",
"build-vm", "build-vm-with-bootloader", "build-vm", "build-vm-with-bootloader",
"list-generations", "list-generations",
} }
var osCmd = &cobra.Command{ var osCmd = &cobra.Command{
Use: "os [subcmd]", Use: "os [subcmd]",
Short: "nixos-rebuild wrapper", Short: "nixos-rebuild wrapper",
@ -23,14 +21,11 @@ var osCmd = &cobra.Command{
if err := cobra.MinimumNArgs(1)(cmd, args); err != nil { if err := cobra.MinimumNArgs(1)(cmd, args); err != nil {
return err return err
} }
// Run the custom validation logic
if slices.Contains(validArgs, args[0]) { if slices.Contains(validArgs, args[0]) {
return nil return nil
} }
return fmt.Errorf( return fmt.Errorf("unexpected arg: %s\nexpected one of:\n %s", args[0], strings.Join(validArgs, ", "))
"unexpected arg: %s\nexpected one of:\n %s",
args[0],
strings.Join(validArgs, ", "),
)
}, },
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
subcmd := args[0] subcmd := args[0]

3
pkgs/oizys/cmd/root.go
View file

@ -32,6 +32,7 @@ var (
flake string flake string
host string host string
debug bool debug bool
verbose bool
systemPath bool systemPath bool
resetCache bool resetCache bool
minimal bool minimal bool
@ -47,6 +48,7 @@ var rootCmd = &cobra.Command{
} }
oizys.SetFlake(flake) oizys.SetFlake(flake)
oizys.SetHost(host) oizys.SetHost(host)
oizys.SetVerbose(verbose)
oizys.SetResetCache(resetCache) oizys.SetResetCache(resetCache)
oizys.SetDebug(debug) oizys.SetDebug(debug)
}, },
@ -74,6 +76,7 @@ func init() {
rootCmd.CompletionOptions.HiddenDefaultCmd = true rootCmd.CompletionOptions.HiddenDefaultCmd = true
rootCmd.PersistentFlags().StringVar(&flake, "flake", "", "path to flake ($OIZYS_DIR or $HOME/oizys)") rootCmd.PersistentFlags().StringVar(&flake, "flake", "", "path to flake ($OIZYS_DIR or $HOME/oizys)")
rootCmd.PersistentFlags().StringVar(&host, "host", "", "host(s) to build (current host)") rootCmd.PersistentFlags().StringVar(&host, "host", "", "host(s) to build (current host)")
rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "show verbose output")
rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "show debug output") rootCmd.PersistentFlags().BoolVar(&debug, "debug", false, "show debug output")
rootCmd.PersistentFlags().BoolVar(&resetCache, "reset-cache", false, "set narinfo-cache-negative-ttl to 0") rootCmd.PersistentFlags().BoolVar(&resetCache, "reset-cache", false, "set narinfo-cache-negative-ttl to 0")
} }

2
pkgs/oizys/go.mod
View file

@ -9,6 +9,7 @@ require (
github.com/google/go-github/v63 v63.0.0 github.com/google/go-github/v63 v63.0.0
github.com/ivanpirog/coloredcobra v1.0.1 github.com/ivanpirog/coloredcobra v1.0.1
github.com/spf13/cobra v1.8.0 github.com/spf13/cobra v1.8.0
golang.org/x/term v0.21.0
) )
require ( require (
@ -27,5 +28,4 @@ require (
github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/pflag v1.0.5 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/sys v0.21.0 // indirect golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
) )

14
pkgs/oizys/internal/github/main.go
View file

@ -9,7 +9,6 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"oizys/internal/oizys" "oizys/internal/oizys"
"strings"
"github.com/charmbracelet/log" "github.com/charmbracelet/log"
"github.com/google/go-github/v63/github" "github.com/google/go-github/v63/github"
@ -155,10 +154,17 @@ func ReadMarkdownFromZip(zipData []byte, fileName string) (string, error) {
return string(content), nil return string(content), nil
} }
// func CI(rest ...string) {
// args := []string{
// "workflow", "run", "build.yml",
// "-F", fmt.Sprintf("hosts=%s", o.host),
// }
// args = append(args, rest...)
// cmd := exec.Command("gh", args...)
// e.ExitWithCommand(cmd)
// }
func CreateDispatch(workflowFileName string, ref string, inputs map[string]interface{}) { func CreateDispatch(workflowFileName string, ref string, inputs map[string]interface{}) {
if !strings.HasSuffix(workflowFileName, ".yml") && !strings.HasSuffix(workflowFileName, ".yaml") {
workflowFileName = workflowFileName + ".yml"
}
log.Infof("creating dispatch event for %s", workflowFileName) log.Infof("creating dispatch event for %s", workflowFileName)
event := github.CreateWorkflowDispatchEventRequest{Ref: ref, Inputs: inputs} event := github.CreateWorkflowDispatchEventRequest{Ref: ref, Inputs: inputs}
_, err := client.Actions.CreateWorkflowDispatchEventByFileName( _, err := client.Actions.CreateWorkflowDispatchEventByFileName(

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

@ -35,6 +35,7 @@ type Oizys struct {
githubToken string githubToken string
local bool local bool
inCI bool inCI bool
verbose bool
systemPath bool systemPath bool
resetCache bool resetCache bool
debug bool debug bool
@ -100,6 +101,9 @@ func SetHost(name string) {
} }
func GetHost() string { return o.host } func GetHost() string { return o.host }
func SetVerbose(v bool) {
o.verbose = v
}
func SetResetCache(reset bool) { func SetResetCache(reset bool) {
o.resetCache = reset o.resetCache = reset
@ -237,7 +241,7 @@ func NixosRebuild(subcmd string, rest ...string) {
if !o.inCI { if !o.inCI {
cmd.Args = append(cmd.Args, "--log-format", "multiline") cmd.Args = append(cmd.Args, "--log-format", "multiline")
} }
if o.debug { if o.verbose {
cmd.Args = append(cmd.Args, "--print-build-logs") cmd.Args = append(cmd.Args, "--print-build-logs")
} }
cmd.Args = append(cmd.Args, rest...) cmd.Args = append(cmd.Args, rest...)