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

Compare commits

base: daylin:c3514988d3417b911a13a4a9d97367a07a8ba196
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:830d27389c4884b0da7298a2283803cfe9c8ffee
Branches Tags
daylin:flake-lock
daylin:main

1 commit
c3514988d3 ... 830d27389c

Author SHA1 Message Date
Daylin Morgan
830d27389c
add matrix for update 2024-07-18 09:09:56 -05:00
9 changed files with 39 additions and 66 deletions
Show stats Expand all files Collapse all files

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

@ -58,7 +58,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
host:
hosts:
- othalan
- algiz
- mannaz

52
flake.lock
View file

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1721234873,
"narHash": "sha256-7BQ6AkXRfDiyO63fV7Vi9jk0CQE44CzJ5j5olKmCizY=",
"lastModified": 1720360803,
"narHash": "sha256-dinkhlPUUcPiw8MAujBjE6ee5SYJnYhgup6ovjPahhw=",
"owner": "daylinmorgan",
"repo": "f1multiviewer-flake",
"rev": "b711311e5b431c6794afbfc2d001fed67f00c99d",
"rev": "d5ecfcbffb830f6d1325ea1c1680e61f6363e451",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1721248202,
"narHash": "sha256-VAhuQQ4EKbw/6z7K2IoR83+gXUdMksLWFQOhJNhSvQE=",
"lastModified": 1721157817,
"narHash": "sha256-G93msn9eSKDjkWJlualhXvrOsEL6gQN3hjDEll+H8VE=",
"ref": "refs/heads/main",
"rev": "300228b503b36e5977b0d58713c5b4cf1f07b8a9",
"revCount": 4930,
"rev": "da956c8a979471282db6790f5fa5dcec320ec226",
"revCount": 4928,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -498,11 +498,11 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1721314880,
"narHash": "sha256-39RhKptnozRK63T4l6TcXGKjCXsvcetC4zCMj+0Xthw=",
"rev": "7b1abf81076c93a84becc310722013e44d850002",
"lastModified": 1721094616,
"narHash": "sha256-xeE9I/oGt+Iz7AwnadBlzSJRk8I5y1XKYt2ifV/2eo0=",
"rev": "d094dd0396a9ec0b4ce725412cc73c6d9af31021",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7b1abf81076c93a84becc310722013e44d850002.tar.gz"
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/d094dd0396a9ec0b4ce725412cc73c6d9af31021.tar.gz"
},
"original": {
"type": "tarball",
@ -627,11 +627,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1721226275,
"narHash": "sha256-fwTSeMR1senkBPaKQyOkbkmFu3+8jj3UHoLZ3TcrOfw=",
"lastModified": 1721037029,
"narHash": "sha256-wuHiinPG5CzCUBr9I51g+IRhP/69Y9gRVh+QnEtFnyI=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "8ebede998342477736e0d0acdcc13ddb166a335f",
"rev": "f6db2d325bdf57d39a3ae43376bdf2a020a6aad2",
"type": "github"
},
"original": {
@ -742,11 +742,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1721116560,
"narHash": "sha256-++TYlGMAJM1Q+0nMVaWBSEvEUjRs7ZGiNQOpqbQApCU=",
"lastModified": 1721080040,
"narHash": "sha256-USDsS90/88RJibP3gEcH1AaVt+JpnX4XCUD9bAJP5I4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9355fa86e6f27422963132c2c9aeedb0fb963d93",
"rev": "b2c1f10bfbb3f617ea8e8669ac13f3f56ceb2ea2",
"type": "github"
},
"original": {
@ -851,11 +851,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1721301142,
"narHash": "sha256-RR/JyDDDapqGu0XgIR2WhwlIuAaTgC3XQkRTM6vmiNI=",
"lastModified": 1721081452,
"narHash": "sha256-vtpHbfU7BMrHj6Dn/azl7vFwhpIj7+OW9MacF9ac3BI=",
"owner": "roc-lang",
"repo": "roc",
"rev": "70fa3ecdc2c76a8bde74bed2048beb8d02bdbd92",
"rev": "5cf4a4af1f01c7cab4cd21ad0974967bb2a3b9ca",
"type": "github"
},
"original": {
@ -1129,11 +1129,11 @@
]
},
"locked": {
"lastModified": 1721131797,
"narHash": "sha256-v5Nmp+PU4S8jJAJh8tQ+mysag1x6w/CcWjgQNZ/stww=",
"lastModified": 1718539737,
"narHash": "sha256-hvQ900gSqzGnJWMRQwv65TixciIbC44iX0Nh5ENRwCU=",
"owner": "mitchellh",
"repo": "zig-overlay",
"rev": "697b4e864fc728f18b79b71c8c086fda8a6fb7ea",
"rev": "6eb42ce6f85d247b1aecf854c45d80902821d0ad",
"type": "github"
},
"original": {
@ -1150,11 +1150,11 @@
]
},
"locked": {
"lastModified": 1721306038,
"narHash": "sha256-eK+XZUOjz1864Lo7qf8xfLNIL7aeaFUbug9B0k07o08=",
"lastModified": 1721179336,
"narHash": "sha256-PPeGUDP5ZL8pnBRKRCBpBG9mYpun11QyGwmWD2orSIA=",
"owner": "Cloudef",
"repo": "zig2nix",
"rev": "7eefb0631345741feb4b31b94898ab20d67f7594",
"rev": "cf6d6a8d6db80370f61469fb682479bdadfad83f",
"type": "github"
},
"original": {

4
lib/extended.nix
View file

@ -63,9 +63,6 @@ let
(substring 6 2 longDate)
]);
flakeVer =
flake: "${flake.shortRev or flake.dirtyShortRev}-${mkDate (toString flake.lastModifiedDate)}";
isNixFile = p: hasSuffix ".nix" p;
isDefaultNixFile = p: hasSuffix "default.nix" p;
filterNotDefaultNixFile = paths: filter (p: !(isDefaultNixFile p) && (isNixFile p)) paths;
@ -84,6 +81,5 @@ in
mkIfIn
isNixFile
listNixFilesRecursive
flakeVer
;
}

16
modules/languages/roc.nix
View file

@ -6,24 +6,14 @@
...
}:
let
inherit (lib) mkIfIn flakeVer;
version = flakeVer inputs.roc;
inherit (lib) mkIfIn;
cfg = config.oizys.languages;
rocPkgs = inputs.roc.packages.${pkgs.system};
# I'm setting the versions so the changes are more apparent as flake is updated
roc = rocPkgs.cli.overrideAttrs {
inherit version;
};
lang-server = rocPkgs.lang-server.overrideAttrs { inherit version; };
in
{
config = mkIfIn "roc" cfg {
environment.systemPackages = [
roc
lang-server
environment.systemPackages = with rocPkgs; [
full # cli + lang_server
];
};
}

12
modules/nix.nix
View file

@ -2,13 +2,9 @@
inputs,
self,
pkgs,
lib,
enabled,
...
}:
let
inherit (lib) makeBinPath;
in
{
imports = [ inputs.nix-index-database.nixosModules.nix-index ];
@ -46,13 +42,7 @@ in
system.activationScripts.diff = ''
if [[ -e /run/current-system ]]; then
PATH=$PATH:${
makeBinPath [
pkgs.nvd
pkgs.nix
]
}
nvd diff /run/current-system "$systemConfig"
${pkgs.nix}/bin/nix store diff-closures /run/current-system "$systemConfig"
fi
'';

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

@ -16,7 +16,7 @@ var updateCmd = &cobra.Command{
Short: "update and run nixos rebuild",
Run: func(cmd *cobra.Command, args []string) {
run := github.GetLastUpdateRun()
md, err := github.GetUpateSummary(run.GetID(), oizys.GetHost())
md, err := github.GetUpateSummary(run.GetID())
if err != nil {
log.Fatal(err)
}

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

@ -60,11 +60,10 @@ func GetArtifacts(runID int64) (*github.ArtifactList, *github.Response) {
return artifactList, resp
}
func GetUpdateSummaryArtifact(runID int64, host string) *github.Artifact {
artifactName := fmt.Sprintf("%s-summary", host)
func GetUpdateSummaryArtifact(runID int64) *github.Artifact {
artifactList, _ := GetArtifacts(runID)
for _, artifact := range artifactList.Artifacts {
if artifact.GetName() == artifactName {
if artifact.GetName() == "summary" {
return artifact
}
}
@ -72,8 +71,8 @@ func GetUpdateSummaryArtifact(runID int64, host string) *github.Artifact {
return nil
}
func GetUpdateSummaryUrl(runID int64, host string) *url.URL {
artifact := GetUpdateSummaryArtifact(runID, host)
func GetUpdateSummaryUrl(runID int64) *url.URL {
artifact := GetUpdateSummaryArtifact(runID)
url, resp, err := client.Actions.DownloadArtifact(context.Background(), "daylinmorgan", "oizys", artifact.GetID(), 4)
if err != nil {
log.Fatal("failed to get update summary URL", "artifact", artifact.GetID(), "resp", resp)
@ -110,8 +109,8 @@ func GetLastUpdateRun() *github.WorkflowRun {
return run
}
func GetUpateSummary(runID int64, host string) (string, error) {
url := GetUpdateSummaryUrl(runID, host)
func GetUpateSummary(runID int64) (string, error) {
url := GetUpdateSummaryUrl(runID)
bytes := GetUpdateSummaryFromUrl(url)
md, err := ReadMarkdownFromZip(bytes, "summary.md")
return md, err

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

@ -6,7 +6,6 @@ import (
"fmt"
"io/fs"
"oizys/internal/git"
// "oizys/internal/github"
"oizys/internal/ui"
"os"
@ -100,7 +99,6 @@ func SetHost(name string) {
}
}
func GetHost() string { return o.host }
func SetVerbose(v bool) {
o.verbose = v
}