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 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 { diff --git a/flake.lock b/flake.lock index e0ce7fb..eda1b49 100644 --- a/flake.lock +++ b/flake.lock @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { @@ -252,16 +252,16 @@ ] }, "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.7", + "ref": "v0.0.8", "repo": "ixx", "type": "github" } @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1748197130, - "narHash": "sha256-WkUknPbMYFeusz3GKkhnklGF0r9bz4Z4bpU8h0t1Ddc=", + "lastModified": 1748261770, + "narHash": "sha256-X+QUzjjZ64lZzzd1dkxIGoLHkJvmDqoEHhx81Mmx0rw=", "owner": "nix-community", "repo": "nixvim", - "rev": "b37d429468c1f5133743e967caf97d92dc35ef5b", + "rev": "91ee94cde3d5fdde68550ac861fd0644ff47109f", "type": "github" }, "original": { @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", + "lastModified": 1748298102, + "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", "owner": "NuschtOS", "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", + "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748029503, - "narHash": "sha256-qHewVAhQ2kaZLHcO9lDzMeAGDFmbDd36kls7bi7HgMQ=", + "lastModified": 1748282308, + "narHash": "sha256-pjNhKw3wdj4n1zQrTyuZjpTpr+ssQzG0EPeWMQr9gHo=", "owner": "nix-community", "repo": "stylix", - "rev": "df93f602dd8c84e7bd067654cc2f6422d5868496", + "rev": "c36cc92e08f1ce24a772d2f3ac9f049b963a07f0", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1747912973, - "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "unstable": { "locked": { - "lastModified": 1748107403, - "narHash": "sha256-3W3+7hGHD71iQ1AApEhn07laT/LSmHQCiEJW3ggPnkI=", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "lastModified": 1748281463, + "narHash": "sha256-0VFAX85s2QcFpcNVy7J4yn7j8Cn2IZADd1wsbT+1TYs=", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre804993.063f43f2dbde/nixexprs.tar.xz?rev=063f43f2dbdef86376cc29ad646c45c46e93234c" + "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre805967.62b852f6c674/nixexprs.tar.xz?rev=62b852f6c6742134ade1abdd2a21685fd617a291" }, "original": { "type": "tarball",