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

Compare commits

base: daylin:02f2cea594773269a708ce4019243b8a50a4edd8
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:7b5ec6510f3bd497ac57606f3bfded5428507328
Branches Tags
daylin:flake-lock
daylin:main

5 commits
02f2cea594 ... 7b5ec6510f

Author SHA1 Message Date
github-actions[bot]
7b5ec6510f flake.lock: Update 
Flake lock file updates:

• Updated input 'f1multiviewer':
    'github:daylinmorgan/f1multiviewer-flake/d5ecfcbffb830f6d1325ea1c1680e61f6363e451?narHash=sha256-dinkhlPUUcPiw8MAujBjE6ee5SYJnYhgup6ovjPahhw%3D' (2024-07-07)
  → 'github:daylinmorgan/f1multiviewer-flake/b711311e5b431c6794afbfc2d001fed67f00c99d?narHash=sha256-7BQ6AkXRfDiyO63fV7Vi9jk0CQE44CzJ5j5olKmCizY%3D' (2024-07-17)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=da956c8a979471282db6790f5fa5dcec320ec226&submodules=1' (2024-07-16)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=293e687389a19b369f312c5c335c9afe7c886be1&submodules=1' (2024-07-16)
• Updated input 'lix':
    'd094dd0396.tar.gz?narHash=sha256-xeE9I/oGt%2BIz7AwnadBlzSJRk8I5y1XKYt2ifV/2eo0%3D' (2024-07-16)
  → 'ef0de7c79f.tar.gz?narHash=sha256-GUH5%2BB1JztzDNSN1D7KbndrYSq0LWvVIJnuWKHlpN3Q%3D' (2024-07-16)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/f6db2d325bdf57d39a3ae43376bdf2a020a6aad2?narHash=sha256-wuHiinPG5CzCUBr9I51g%2BIRhP/69Y9gRVh%2BQnEtFnyI%3D' (2024-07-15)
  → 'github:nix-community/NixOS-WSL/8ebede998342477736e0d0acdcc13ddb166a335f?narHash=sha256-fwTSeMR1senkBPaKQyOkbkmFu3%2B8jj3UHoLZ3TcrOfw%3D' (2024-07-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b2c1f10bfbb3f617ea8e8669ac13f3f56ceb2ea2?narHash=sha256-USDsS90/88RJibP3gEcH1AaVt%2BJpnX4XCUD9bAJP5I4%3D' (2024-07-15)
  → 'github:nixos/nixpkgs/9355fa86e6f27422963132c2c9aeedb0fb963d93?narHash=sha256-%2B%2BTYlGMAJM1Q%2B0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU%3D' (2024-07-16)
• Updated input 'roc':
    'github:roc-lang/roc/5cf4a4af1f01c7cab4cd21ad0974967bb2a3b9ca?narHash=sha256-vtpHbfU7BMrHj6Dn/azl7vFwhpIj7%2BOW9MacF9ac3BI%3D' (2024-07-15)
  → 'github:roc-lang/roc/2002868b56cde0abfad38bda55dc27efe6bb8598?narHash=sha256-WAdO4ioyjTt87pwb9MYGioqmXPecUdvZVW6Su6ELNWs%3D' (2024-07-17)
 2024-07-17 17:36:03 +00:00
Daylin Morgan
2865ec8264
use nvd 2024-07-17 12:34:27 -05:00
Daylin Morgan
7e6aa1f57f
use pngs over svgs 2024-07-17 11:54:45 -05:00
Daylin Morgan
34773c08f3
remove gh call in favor of client api 2024-07-17 11:46:58 -05:00
Daylin Morgan
ff6074ef4b
change oizys update 2024-07-17 11:22:15 -05:00
7 changed files with 93 additions and 46 deletions
Show stats Expand all files Collapse all files

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

@ -101,7 +101,7 @@ jobs:
- run: |
echo "# System Diff" >> $GITHUB_STEP_SUMMARY
diff=$(nix store diff-closures ./current ./updated)
diff=$(nix run "nixpkgs#nvd" ./current ./updated)
echo "$diff"
echo "$diff" >> summary.md
echo "$diff" | sed 's/\x1B\[[0-9;]\{1,\}[A-Za-z]//g' >> $GITHUB_STEP_SUMMARY

16
README.md
View file

@ -15,22 +15,30 @@ See below for the currently maintained hosts.
<th>system</th>
</tr>
<tr>
<td><img src="https://upload.wikimedia.org/wikipedia/commons/7/70/Runic_letter_othalan.svg"></td>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/1/16/Runic_letter_othalan.png" height="100">
</td>
<td>othalan</td>
<td>Thinkpad Carbon X1 Gen 9</td>
</tr>
<tr>
<td><img src="https://upload.wikimedia.org/wikipedia/commons/d/df/Runic_letter_algiz.svg"></td>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/1/14/Runic_letter_algiz.png" height="100">
</td>
<td>algiz</td>
<td>Hetzner VPS hosting forgejo, soft-serve & gts</td>
</tr>
<tr>
<td><img src="https://upload.wikimedia.org/wikipedia/commons/5/57/Runic_letter_mannaz.svg"></td>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/0/0c/Runic_letter_mannaz.png" height="100">
</td>
<td>mannaz</td>
<td>Custom AMD Tower with Nvidia 1050ti</td>
</tr>
<tr>
<td><img src="https://upload.wikimedia.org/wikipedia/commons/3/3f/Runic_letter_naudiz.svg"></td>
<td>
<img src="https://upload.wikimedia.org/wikipedia/commons/b/b9/Runic_letter_naudiz.png" height="100">
</td>
<td>naudiz</td>
<td>Nixos-WSL for those times I'm trapped on windows</td>
</tr>

38
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1720360803,
"narHash": "sha256-dinkhlPUUcPiw8MAujBjE6ee5SYJnYhgup6ovjPahhw=",
"lastModified": 1721234873,
"narHash": "sha256-7BQ6AkXRfDiyO63fV7Vi9jk0CQE44CzJ5j5olKmCizY=",
"owner": "daylinmorgan",
"repo": "f1multiviewer-flake",
"rev": "d5ecfcbffb830f6d1325ea1c1680e61f6363e451",
"rev": "b711311e5b431c6794afbfc2d001fed67f00c99d",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1721157817,
"narHash": "sha256-G93msn9eSKDjkWJlualhXvrOsEL6gQN3hjDEll+H8VE=",
"lastModified": 1721160190,
"narHash": "sha256-dnC7b/C8QRPoGs2H2cAYWmrTRVhN5m1xDpyrNTqV8r8=",
"ref": "refs/heads/main",
"rev": "da956c8a979471282db6790f5fa5dcec320ec226",
"revCount": 4928,
"rev": "293e687389a19b369f312c5c335c9afe7c886be1",
"revCount": 4929,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -499,10 +499,10 @@
"flake": false,
"locked": {
"lastModified": 1721094616,
"narHash": "sha256-xeE9I/oGt+Iz7AwnadBlzSJRk8I5y1XKYt2ifV/2eo0=",
"rev": "d094dd0396a9ec0b4ce725412cc73c6d9af31021",
"narHash": "sha256-GUH5+B1JztzDNSN1D7KbndrYSq0LWvVIJnuWKHlpN3Q=",
"rev": "ef0de7c79f3b32f66db447220d26eae7e7c07b19",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d094dd0396a9ec0b4ce725412cc73c6d9af31021.tar.gz"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ef0de7c79f3b32f66db447220d26eae7e7c07b19.tar.gz"
},
"original": {
"type": "tarball",
@ -627,11 +627,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1721037029,
"narHash": "sha256-wuHiinPG5CzCUBr9I51g+IRhP/69Y9gRVh+QnEtFnyI=",
"lastModified": 1721226275,
"narHash": "sha256-fwTSeMR1senkBPaKQyOkbkmFu3+8jj3UHoLZ3TcrOfw=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "f6db2d325bdf57d39a3ae43376bdf2a020a6aad2",
"rev": "8ebede998342477736e0d0acdcc13ddb166a335f",
"type": "github"
},
"original": {
@ -742,11 +742,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1721080040,
"narHash": "sha256-USDsS90/88RJibP3gEcH1AaVt+JpnX4XCUD9bAJP5I4=",
"lastModified": 1721116560,
"narHash": "sha256-++TYlGMAJM1Q+0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b2c1f10bfbb3f617ea8e8669ac13f3f56ceb2ea2",
"rev": "9355fa86e6f27422963132c2c9aeedb0fb963d93",
"type": "github"
},
"original": {
@ -851,11 +851,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1721081452,
"narHash": "sha256-vtpHbfU7BMrHj6Dn/azl7vFwhpIj7+OW9MacF9ac3BI=",
"lastModified": 1721213019,
"narHash": "sha256-WAdO4ioyjTt87pwb9MYGioqmXPecUdvZVW6Su6ELNWs=",
"owner": "roc-lang",
"repo": "roc",
"rev": "5cf4a4af1f01c7cab4cd21ad0974967bb2a3b9ca",
"rev": "2002868b56cde0abfad38bda55dc27efe6bb8598",
"type": "github"
},
"original": {

25
pkgs/oizys/cmd/ci.go
View file

@ -1,8 +1,10 @@
package cmd
import (
"oizys/internal/oizys"
"oizys/internal/github"
"os"
"github.com/charmbracelet/log"
"github.com/spf13/cobra"
)
@ -12,11 +14,28 @@ var ciCmd = &cobra.Command{
Use: "ci",
Short: "offload build to GHA",
Run: func(cmd *cobra.Command, args []string) {
oizys.CI(args...)
inputs := make(map[string]interface{})
if includeLock {
log.Debug("including lock file in inputs")
inputs["lockFile"] = readLockFile()
}
github.CreateDispatch("build.yml", ref, inputs)
},
}
var includeLock bool
var ref string
func init() {
rootCmd.AddCommand(ciCmd)
ciCmd.Flags().BoolVar(&includeLock, "lockfile", false, "include lock file in inputs")
ciCmd.Flags().StringVar(&ref, "ref", "main", "git ref to trigger workflow on")
}
func readLockFile() string {
dat, err := os.ReadFile("flake.lock")
if err != nil {
log.Fatal("failed to read flake.lock", "err", err)
}
return string(dat)
}

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

@ -16,24 +16,29 @@ var updateCmd = &cobra.Command{
Short: "update and run nixos rebuild",
Run: func(cmd *cobra.Command, args []string) {
run := github.GetLastUpdateRun()
if preview {
md, err := github.GetUpateSummary(run.GetID())
if err != nil {
log.Fatal(err)
}
fmt.Println(md)
if !ui.Confirm("proceed with system update?") {
if preview {
os.Exit(0)
}
if !yes && !ui.Confirm("proceed with system update?") {
os.Exit(0)
}
oizys.UpdateRepo()
oizys.NixosRebuild("switch")
},
}
var preview bool
var (
preview bool
yes bool
)
func init() {
rootCmd.AddCommand(updateCmd)
updateCmd.Flags().BoolVar(&preview, "preview", false, "confirm nix store diff")
updateCmd.Flags().BoolVar(&yes, "yes", false, "reply yes to all confirm prompts")
}

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

@ -152,3 +152,27 @@ func ReadMarkdownFromZip(zipData []byte, fileName string) (string, error) {
// Return the markdown content as string
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{}) {
event := github.CreateWorkflowDispatchEventRequest{Ref: ref, Inputs: inputs}
_, err := client.Actions.CreateWorkflowDispatchEventByFileName(
context.Background(),
"daylinmorgan",
"oizys",
workflowFileName,
event,
)
if err != nil {
log.Fatal("failed to dispatch event", "filename", workflowFileName, "err", err)
}
}

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

@ -6,6 +6,7 @@ import (
"fmt"
"io/fs"
"oizys/internal/git"
// "oizys/internal/github"
"oizys/internal/ui"
"os"
"os/exec"
@ -316,16 +317,6 @@ func CacheBuild(rest ...string) {
e.ExitWithCommand(cmd)
}
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 UpdateRepo() {
log.Info("rebasing HEAD on origin/flake-lock")
o.repo.Fetch()