From e81d6a251306fb03e78d9c0d375f90df8041ba39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 27 May 2025 13:26:20 +0200
Subject: [PATCH 1/3] fix(hm): importing modules from deprecated paths

---
 flake-modules/home-modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix
index 277a3cd..95db35a 100644
--- a/flake-modules/home-modules.nix
+++ b/flake-modules/home-modules.nix
@@ -6,7 +6,7 @@
   flake.homeModules =
     let
       defaultModules = [
-        inputs.nixvim.homeManagerModules.nixvim
+        inputs.nixvim.homeModules.nixvim
         self.nixvimModules.homeManager
         ../modules/hm
       ];
@@ -15,7 +15,7 @@
       };
       standalone = {
         imports = defaultModules ++ [
-          inputs.stylix.homeManagerModules.stylix
+          inputs.stylix.homeModules.stylix
           (
             { lib, config, ... }:
             lib.mkIf config.jhome.gui.enable {

From 22efbecba63fdc3095507c94efd3249bce3d8564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 27 May 2025 13:38:43 +0200
Subject: [PATCH 2/3] ci: don't use nix-fast-build

It seems to cause too many issues.
---
 .forgejo/workflows/check.yml | 58 +++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 11 deletions(-)

diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml
index 142bfe0..9f70100 100644
--- a/.forgejo/workflows/check.yml
+++ b/.forgejo/workflows/check.yml
@@ -1,28 +1,65 @@
 on:
   push:
 jobs:
-  check:
+  check-fmt:
     runs-on: nixos
     steps:
-      - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
+      - uses: https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - run: nix --version
-      - name: Run checks
+      - name: Run treefmt
         run: |
-          nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \
-            --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)"
-  build-packages:
+          nix build --print-build-logs ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem).treefmt"
+  build-package:
     runs-on: nixos
-    needs: check
+    needs: check-fmt
+    strategy:
+      matrix:
+        package:
+          - audiomenu
+          - docs
+          - docs-home-markdown
+          - docs-nixos-markdown
+          - docs-nvim-markdown
+          - jpassmenu
+          - nvim
+          - nvim-headless
+          - nvim-no-lsps
+          - nvim-no-ts
+          - nvim-small
+          - search
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - run: nix --version
       - name: Build target
+        env:
+          PACKAGE: ${{ matrix.package }}
         run: |
-          nix-fast-build --max-jobs 1 --no-nom --skip-cached --no-link \
-            --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)"
+          # shellcheck disable=SC2016
+          nix build --print-build-logs ".#$PACKAGE"
+  check-nvim:
+    runs-on: nixos
+    needs: build-package
+    strategy:
+      matrix:
+        nvim:
+          - nvim
+          - nvim-headless
+          - nvim-no-lsps
+          - nvim-no-ts
+          - nvim-small
+    steps:
+      - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
+      - run: nix --version
+      - name: Build target
+        env:
+          NVIM: ${{ matrix.nvim }}
+        run: |
+          nix build --print-build-logs ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem).$NVIM"
   build-vm:
     runs-on: nixos
-    needs: build-packages
+    needs:
+      - build-package
+      - check-nvim
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - run: nix --version
@@ -32,7 +69,6 @@ jobs:
   report-size:
     runs-on: nixos
     needs:
-      - build-packages
       - build-vm
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4

From b69d163ec3cb2259afcb12bde1efe3a7fab751aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Tue, 27 May 2025 13:26:20 +0200
Subject: [PATCH 3/3] fix(hm): importing modules from deprecated paths

---
 flake-modules/home-modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix
index 277a3cd..95db35a 100644
--- a/flake-modules/home-modules.nix
+++ b/flake-modules/home-modules.nix
@@ -6,7 +6,7 @@
   flake.homeModules =
     let
       defaultModules = [
-        inputs.nixvim.homeManagerModules.nixvim
+        inputs.nixvim.homeModules.nixvim
         self.nixvimModules.homeManager
         ../modules/hm
       ];
@@ -15,7 +15,7 @@
       };
       standalone = {
         imports = defaultModules ++ [
-          inputs.stylix.homeManagerModules.stylix
+          inputs.stylix.homeModules.stylix
           (
             { lib, config, ... }:
             lib.mkIf config.jhome.gui.enable {