pre-build oizys

write info to step summary
don't run on push
2024-09-19 14:37:19 -05:00 · 2024-08-07 13:08:29 -05:00 · 2024-08-07 13:07:33 -05:00 · 2024-08-07 12:58:59 -05:00 · 2024-08-07 12:53:39 -05:00 · 2024-08-07 12:53:39 -05:00
9 changed files with 73 additions and 37 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -51,6 +51,9 @@ jobs:
          echo '${{ inputs.lockFile }}' > flake.lock
          git diff

+      - name: Pre-build Oizys
+        run: nix build .
+
      - name: Build
        run: |
          nix run . \
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@ -1,10 +1,12 @@
 name: Build NixOS

 on:
-  push:
+  # push:
+  #   paths-ignore:
+  #     - '**/*.md'
+  pull_request:
    paths-ignore:
      - '**/*.md'
-  pull_request:
    branches:
      - main

--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -37,6 +37,9 @@ jobs:
          nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY
          printf '```\n' >> $GITHUB_STEP_SUMMARY

+      - name: Pre-build oizys
+        run: nix build .
+
      - name: Build
        run: |
          nix run . \
@ -79,6 +82,9 @@ jobs:
        with:
          purge-packages: 'true'

+      - name: Pre-build oizys
+        run: nix build .
+

      - name: Build
        run: |
@ -94,6 +100,9 @@ jobs:

      - run: git checkout flake-lock

+      - name: Pre-build oizys
+        run: nix build .
+
      - name: Build Updated
        run: |
          system_attr=$(nix run . -- output --host "${{ matrix.host }}" --flake .)
--- a/flake.lock
+++ b/flake.lock
@ -341,11 +341,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1722956902,
-        "narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=",
+        "lastModified": 1723043089,
+        "narHash": "sha256-b01LQD32/xakBOFxabj8Mtz37ekvFwrM74VKNssUnko=",
        "ref": "refs/heads/main",
-        "rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c",
-        "revCount": 5055,
+        "rev": "ea728315410e220d73a993f17c83ae9dc9be9015",
+        "revCount": 5067,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -534,11 +534,11 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1722957485,
-        "narHash": "sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo=",
-        "rev": "f84997cbefb2f2dd99e48f0ad39f747ed83d69e9",
+        "lastModified": 1723036070,
+        "narHash": "sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ=",
+        "rev": "ec7552ff7411592305d28ec4bfcb4ea55866ab36",
        "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/ec7552ff7411592305d28ec4bfcb4ea55866ab36.tar.gz"
      },
      "original": {
        "type": "tarball",
@ -715,11 +715,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1722928655,
-        "narHash": "sha256-2BAfUaRzrhHwT/JodTq++DUf/nljgoFEc5A79SS8ydU=",
+        "lastModified": 1723043911,
+        "narHash": "sha256-JAYd5Tq1AmrGK9MBup+WK6dq3rIvkpUHFAgBJ3d8irY=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "423d21c157c2a7b384ae9c766e25759576dceb87",
+        "rev": "5acf5ce79d80e23a2426b8a553a4d4b5996fef46",
        "type": "github"
      },
      "original": {
@ -762,11 +762,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1722926584,
-        "narHash": "sha256-sLA+lfCxTkXf4o3JVxcfe+w9kAzauGfEnJ9roNbNng8=",
+        "lastModified": 1722957468,
+        "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d33cf80b603b3d0cddb48f9816cae707a59e2334",
+        "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043",
        "type": "github"
      },
      "original": {
@ -816,11 +816,11 @@
        "pixi-source": "pixi-source"
      },
      "locked": {
-        "lastModified": 1721665957,
-        "narHash": "sha256-Kq5rZ5wRGLT/a7Gsdi0xBm6+FjPbHgpGUOWmYiZfv1A=",
+        "lastModified": 1723049033,
+        "narHash": "sha256-JMVvLQX+oJ5Gfck419poXJCIKOxWsZGRC23ize6hT6Y=",
        "owner": "daylinmorgan",
        "repo": "pixi-flake",
-        "rev": "433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e",
+        "rev": "7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d",
        "type": "github"
      },
      "original": {
@ -832,16 +832,16 @@
    "pixi-source": {
      "flake": false,
      "locked": {
-        "lastModified": 1721638392,
-        "narHash": "sha256-N8nNB+FOD8n+W7jFYhq9JoEnLOq6xLMLBC77DiK3RLU=",
+        "lastModified": 1723023748,
+        "narHash": "sha256-m1qlDxZBEDUMNV+gRX2bbEdvBRp4lJv7C2ZZlEUA5Dg=",
        "owner": "prefix-dev",
        "repo": "pixi",
-        "rev": "68062d9582b4c14c63f17791b96620908d4148be",
+        "rev": "608a65d977b9d87bae71c747f77989ad01c76ada",
        "type": "github"
      },
      "original": {
        "owner": "prefix-dev",
-        "ref": "v0.26.1",
+        "ref": "v0.27.0",
        "repo": "pixi",
        "type": "github"
      }
@ -857,11 +857,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1722856566,
-        "narHash": "sha256-Yr9P/TyxgVVwgXIiu96up2hgWjMR0zWPbaihyNXp+r0=",
+        "lastModified": 1723012587,
+        "narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=",
        "owner": "roc-lang",
        "repo": "roc",
-        "rev": "13f60cde09ef01c003fe362bf46e592a0f4ae7c6",
+        "rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb",
        "type": "github"
      },
      "original": {
@ -1156,11 +1156,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1722907357,
-        "narHash": "sha256-alp8wfWJtxLXKNuVXPjhWFtrGhp10/3Nle//1RkapgU=",
+        "lastModified": 1722993798,
+        "narHash": "sha256-cXzpRh+nUTBqo4mU+jzG4otZcpTfo29DC0apTmH2gtU=",
        "owner": "Cloudef",
        "repo": "zig2nix",
-        "rev": "32c6285061bbab4920b020ec9e9f4aa5c9a81750",
+        "rev": "5a0307b91ad2cd6c60fd5817b6a88108e254730a",
        "type": "github"
      },
      "original": {
@ -1180,11 +1180,11 @@
        "zig-overlay": "zig-overlay"
      },
      "locked": {
-        "lastModified": 1722919037,
-        "narHash": "sha256-h8BG+XOCli8++tCojSo/cF39AIixVj3mO94b4cuqT94=",
+        "lastModified": 1722987529,
+        "narHash": "sha256-r7tnq70psZQXfLlDj+XzidBj352vfQFrICC7hfKHw7M=",
        "owner": "zigtools",
        "repo": "zls",
-        "rev": "74b5a00f67ab4e5a848646411779221e6cc24b87",
+        "rev": "d8084a342f40b444addf772fdef36a589299ebe6",
        "type": "github"
      },
      "original": {
--- a/hosts/othalan/system.nix
+++ b/hosts/othalan/system.nix
@ -10,7 +10,10 @@
  hardware.sane = enabled // {
    extraBackends = [ pkgs.hplipWithPlugin ];
  };
-  users.users.daylin.extraGroups = ["scanner" "lp"];
+  users.users.daylin.extraGroups = [
+    "scanner"
+    "lp"
+  ];

  # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix
  # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix
--- a/lib/generators.nix
+++ b/lib/generators.nix
@ -12,9 +12,6 @@ let
    mkOizysModule
    enabled
    enableAttrs
-    pkgsFromSystem
-    pkgFromSystem
-    overlayFrom
    isNixFile
    flakeFromSystem
    ;
--- a/modules/desktop/window-managers/hyprland.nix
+++ b/modules/desktop/window-managers/hyprland.nix
@ -6,6 +6,13 @@
  flake,
  ...
 }:
+let
+  activate-snippet = ''
+    if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
+      exec Hyprland
+    fi
+  '';
+in

 mkOizysModule config "hyprland" {
  programs.hyprland = enabled;
@ -53,6 +60,16 @@ mkOizysModule config "hyprland" {
      # dunst
    ]);

+  services.getty = {
+    extraArgs = [ "--skip-login" ];
+    loginOptions = "-p -- ${config.oizys.user}";
+  };
+
+  environment.etc = {
+    "bashrc.local".text = activate-snippet;
+    "zshenv.local".text = activate-snippet;
+  };
+
  nixpkgs.overlays = [
    (flake.overlay "hyprland-contrib")
    # (overlayFrom "nixpkgs-wayland")
--- a/pkgs/oizys/cmd/dry.go
+++ b/pkgs/oizys/cmd/dry.go
@ -10,7 +10,7 @@ var dryCmd = &cobra.Command{
 	Use:   "dry",
 	Short: "poor man's nix flake check",
 	Run: func(cmd *cobra.Command, args []string) {
-		oizys.Dry( minimal, args...)
+		oizys.Dry(minimal, args...)
 	},
 }

--- a/pkgs/oizys/internal/oizys/main.go
+++ b/pkgs/oizys/internal/oizys/main.go
@ -256,6 +256,11 @@ func NixBuild(minimal bool, rest ...string) {
 			log.Info("nothing to build. exiting...")
 			os.Exit(0)
 		}
+		if o.inCI {
+			o.writeToGithubStepSummary("# Building Derivations:\n")
+      // TODO: write as a markdown table with hash + name (without .drv)
+			o.writeToGithubStepSummary(strings.Join(drvs, "\n"))
+		}
 		cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
 	}
 	if !o.inCI {
Author	SHA1	Message	Date
Daylin Morgan	2e4e12f369	pre-build oizys	2024-08-07 13:08:29 -05:00
Daylin Morgan	617ae20642	write info to step summary	2024-08-07 13:07:33 -05:00
Daylin Morgan	0beb4d04bb	don't run on push	2024-08-07 12:58:59 -05:00
Daylin Morgan	8e9fde6967	linting	2024-08-07 12:53:39 -05:00
Daylin Morgan	b6bbdb51fb	auto activate hyprland	2024-08-07 12:53:39 -05:00
daylin-bot	4b181be761	flake.lock: Update Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=b0a70f63e3865eaa77f0b78a04b230aa583bc95c' (2024-08-06) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=ea728315410e220d73a993f17c83ae9dc9be9015' (2024-08-07) • Updated input 'lix': '`f84997cbef`.tar.gz?narHash=sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo%3D' (2024-08-06) → '`ec7552ff74`.tar.gz?narHash=sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ%3D' (2024-08-07) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d33cf80b603b3d0cddb48f9816cae707a59e2334' (2024-08-06) → 'github:nixos/nixpkgs/2a13929e1f191b3690dd2f2db13098b04adb9043' (2024-08-06) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/423d21c157c2a7b384ae9c766e25759576dceb87' (2024-08-06) → 'github:nix-community/nixpkgs-wayland/5acf5ce79d80e23a2426b8a553a4d4b5996fef46' (2024-08-07) • Updated input 'pixi': 'github:daylinmorgan/pixi-flake/433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e' (2024-07-22) → 'github:daylinmorgan/pixi-flake/7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d' (2024-08-07) • Updated input 'pixi/pixi-source': 'github:prefix-dev/pixi/68062d9582b4c14c63f17791b96620908d4148be' (2024-07-22) → 'github:prefix-dev/pixi/608a65d977b9d87bae71c747f77989ad01c76ada' (2024-08-07) • Updated input 'roc': 'github:roc-lang/roc/13f60cde09ef01c003fe362bf46e592a0f4ae7c6' (2024-08-05) → 'github:roc-lang/roc/698bbc3cf1c279baf76b6015754aab58d5ffeffb' (2024-08-07) • Updated input 'zig2nix': 'github:Cloudef/zig2nix/32c6285061bbab4920b020ec9e9f4aa5c9a81750' (2024-08-06) → 'github:Cloudef/zig2nix/5a0307b91ad2cd6c60fd5817b6a88108e254730a' (2024-08-07) • Updated input 'zls': 'github:zigtools/zls/74b5a00f67ab4e5a848646411779221e6cc24b87' (2024-08-06) → 'github:zigtools/zls/d8084a342f40b444addf772fdef36a589299ebe6' (2024-08-06)	2024-08-07 16:46:51 +00:00