diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 9f70100..142bfe0 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -1,65 +1,28 @@ on: push: jobs: - check-fmt: + check: 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 treefmt + - name: Run checks run: | - nix build --print-build-logs ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem).treefmt" - build-package: + nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \ + --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)" + build-packages: runs-on: nixos - 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 + needs: check steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version - name: Build target - env: - PACKAGE: ${{ matrix.package }} run: | - # 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" + nix-fast-build --max-jobs 1 --no-nom --skip-cached --no-link \ + --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)" build-vm: runs-on: nixos - needs: - - build-package - - check-nvim + needs: build-packages steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - run: nix --version @@ -69,6 +32,7 @@ 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 95db35a..277a3cd 100644 --- a/flake-modules/home-modules.nix +++ b/flake-modules/home-modules.nix @@ -6,7 +6,7 @@ flake.homeModules = let defaultModules = [ - inputs.nixvim.homeModules.nixvim + inputs.nixvim.homeManagerModules.nixvim self.nixvimModules.homeManager ../modules/hm ]; @@ -15,7 +15,7 @@ }; standalone = { imports = defaultModules ++ [ - inputs.stylix.homeModules.stylix + inputs.stylix.homeManagerModules.stylix ( { lib, config, ... }: lib.mkIf config.jhome.gui.enable { diff --git a/flake.lock b/flake.lock index eda1b49..65e5faa 100644 --- a/flake.lock +++ b/flake.lock @@ -252,16 +252,16 @@ ] }, "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.8", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": {