From addf563bfc05059fc5c52121c75f24d4fe81d4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 16:10:02 +0100 Subject: [PATCH 1/4] refactor: move modules to their own dir --- flake-modules/docs.nix | 7 +- flake-modules/nixos-modules.nix | 115 ++++++++++++------ flake-modules/nvim.nix | 2 +- {home => modules/hm}/default.nix | 20 +-- {home => modules/hm}/gui/default.nix | 0 {home => modules/hm}/gui/keybindings.nix | 0 {home => modules/hm}/gui/sway-config.nix | 0 {home => modules/hm}/gui/waybar-settings.nix | 0 {home => modules/hm}/options.nix | 0 {home => modules/hm}/users.nix | 0 {system => modules/nixos}/default.nix | 2 - {system => modules/nixos}/gui/default.nix | 0 {system => modules/nixos}/options.nix | 0 .../nixos}/starship-nerdfont-symbols.nix | 0 .../nixos}/starship-shorter-text.nix | 0 {system => modules/nixos}/stylix-config.nix | 0 {nvim => modules/nixvim}/augroups.nix | 0 {nvim => modules/nixvim}/default.nix | 0 {nvim => modules/nixvim}/dev-plugins.nix | 0 .../nixvim}/extraPlugins/default.nix | 0 .../nixvim}/extraPlugins/generated.nix | 0 {nvim => modules/nixvim}/extraPlugins/plugins | 0 {nvim => modules/nixvim}/mappings.nix | 0 {nvim => modules/nixvim}/options.nix | 0 {nvim => modules/nixvim}/plugins.nix | 0 {nvim => modules/nixvim}/standalone.nix | 0 26 files changed, 86 insertions(+), 60 deletions(-) rename {home => modules/hm}/default.nix (96%) rename {home => modules/hm}/gui/default.nix (100%) rename {home => modules/hm}/gui/keybindings.nix (100%) rename {home => modules/hm}/gui/sway-config.nix (100%) rename {home => modules/hm}/gui/waybar-settings.nix (100%) rename {home => modules/hm}/options.nix (100%) rename {home => modules/hm}/users.nix (100%) rename {system => modules/nixos}/default.nix (98%) rename {system => modules/nixos}/gui/default.nix (100%) rename {system => modules/nixos}/options.nix (100%) rename {system => modules/nixos}/starship-nerdfont-symbols.nix (100%) rename {system => modules/nixos}/starship-shorter-text.nix (100%) rename {system => modules/nixos}/stylix-config.nix (100%) rename {nvim => modules/nixvim}/augroups.nix (100%) rename {nvim => modules/nixvim}/default.nix (100%) rename {nvim => modules/nixvim}/dev-plugins.nix (100%) rename {nvim => modules/nixvim}/extraPlugins/default.nix (100%) rename {nvim => modules/nixvim}/extraPlugins/generated.nix (100%) rename {nvim => modules/nixvim}/extraPlugins/plugins (100%) rename {nvim => modules/nixvim}/mappings.nix (100%) rename {nvim => modules/nixvim}/options.nix (100%) rename {nvim => modules/nixvim}/plugins.nix (100%) rename {nvim => modules/nixvim}/standalone.nix (100%) diff --git a/flake-modules/docs.nix b/flake-modules/docs.nix index cc85766..76ffb19 100644 --- a/flake-modules/docs.nix +++ b/flake-modules/docs.nix @@ -5,17 +5,18 @@ { packages = let + modules = ../modules; filterVisible = toplevelOption: option: option // { visible = option.visible && builtins.elemAt option.loc 0 == toplevelOption; }; home-eval = lib.evalModules { - modules = [ ../home/options.nix ]; + modules = [ (modules + "/hm/options.nix") ]; specialArgs = { inherit pkgs; }; }; - nvim-eval = lib.evalModules { modules = [ ../nvim/options.nix ]; }; - nixos-eval = lib.evalModules { modules = [ ../system/options.nix ]; }; + nvim-eval = lib.evalModules { modules = [ (modules + "/nixvim/options.nix") ]; }; + nixos-eval = lib.evalModules { modules = [ (modules + "/nixos/options.nix") ]; }; home-markdown = (pkgs.nixosOptionsDoc { inherit (home-eval) options; diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index 1422669..3606a3f 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -1,45 +1,82 @@ -{ inputs, lib, ... }: { - flake.nixosModules = - let - nvim-config = { - imports = [ - inputs.nixvim.homeManagerModules.nixvim - ../nvim - ]; - }; - homeManagerModuleSandalone = import ../home { - inherit nvim-config; - inherit (inputs) stylix; - }; - homeManagerModuleNixOS = import ../home { inherit nvim-config; }; - nixosModule = { - imports = [ - (import ../system { inherit (inputs) stylix; }) - inputs.home-manager.nixosModules.home-manager - ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - sharedModules = [ homeManagerModuleNixOS ]; + self, + inputs, + lib, + ... +}: +let + modules = ../modules; +in +{ + flake = { + nixvimModules = + let + standalone = modules + "/nixvim/standalone.nix"; + homeManager = { + imports = [ + inputs.nixvim.homeManagerModules.nixvim + (modules + "/nixvim") + ]; }; - # Pin nixpkgs - nix.registry.nixpkgs.flake = inputs.nixpkgs; + in + { + inherit standalone homeManager; }; - - machines = [ "vm" ]; - mkMachine = hostname: { - imports = [ - nixosModule - (import (../machines + "/${hostname}")) + homeManagerModules = + let + defaultModules = [ + self.nixvimModules.homeManager + (modules + "/hm") ]; - home-manager.sharedModules = [ { jhome.hostName = hostname; } ]; + nixos = { + imports = defaultModules; + }; + standalone = { + imports = defaultModules ++ [ + inputs.stylix.homeManagerModules.stilyx + ( + { config, ... }: + { + stylix.image = config.jhome.sway.background; + } + ) + ]; + }; + in + { + inherit standalone nixos; }; - machineModules = lib.genAttrs machines mkMachine; - in - { - default = nixosModule; - inherit nixosModule homeManagerModuleNixOS homeManagerModuleSandalone; - } - // machineModules; + nixosModules = + let + nixosModule = { + imports = [ + inputs.stylix.nixosModules.stylix + inputs.home-manager.nixosModules.home-manager + (modules + "/nixos") + ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + sharedModules = [ self.homeManagerModules.nixos ]; + }; + # Pin nixpkgs + nix.registry.nixpkgs.flake = inputs.nixpkgs; + }; + + machines = [ "vm" ]; + mkMachine = hostname: { + imports = [ + nixosModule + (import (../machines + "/${hostname}")) + ]; + home-manager.sharedModules = [ { jhome.hostName = hostname; } ]; + }; + machineModules = lib.genAttrs machines mkMachine; + in + { + default = nixosModule; + inherit nixosModule; + } + // machineModules; + }; } diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix index 89832f3..f62c7ff 100644 --- a/flake-modules/nvim.nix +++ b/flake-modules/nvim.nix @@ -9,7 +9,7 @@ nvimModule = extraConfig: { pkgs = inputs.unstable.legacyPackages.${system}; module = { - imports = [ ../nvim/standalone.nix ]; + imports = [ ../modules/nixvim/standalone.nix ]; config = lib.mkMerge [ { performance.combinePlugins.enable = true; } extraConfig diff --git a/home/default.nix b/modules/hm/default.nix similarity index 96% rename from home/default.nix rename to modules/hm/default.nix index 2a8e6a5..0f1e59a 100644 --- a/home/default.nix +++ b/modules/hm/default.nix @@ -1,7 +1,3 @@ -{ - nvim-config, - stylix ? null, -}: { config, pkgs, @@ -17,17 +13,11 @@ let path: default: if osConfig == null then default else lib.attrsets.attrByPath path default osConfig; in { - imports = - [ - nvim-config - ./options.nix - ./gui - ./users.nix - ] - ++ lib.optionals (stylix != null) [ - stylix.homeManagerModules.stylix - { stylix.image = cfg.sway.background; } - ]; + imports = [ + ./options.nix + ./gui + ./users.nix + ]; config = lib.mkMerge [ (lib.mkIf (cfg.enable && cfg.styling.enable) { diff --git a/home/gui/default.nix b/modules/hm/gui/default.nix similarity index 100% rename from home/gui/default.nix rename to modules/hm/gui/default.nix diff --git a/home/gui/keybindings.nix b/modules/hm/gui/keybindings.nix similarity index 100% rename from home/gui/keybindings.nix rename to modules/hm/gui/keybindings.nix diff --git a/home/gui/sway-config.nix b/modules/hm/gui/sway-config.nix similarity index 100% rename from home/gui/sway-config.nix rename to modules/hm/gui/sway-config.nix diff --git a/home/gui/waybar-settings.nix b/modules/hm/gui/waybar-settings.nix similarity index 100% rename from home/gui/waybar-settings.nix rename to modules/hm/gui/waybar-settings.nix diff --git a/home/options.nix b/modules/hm/options.nix similarity index 100% rename from home/options.nix rename to modules/hm/options.nix diff --git a/home/users.nix b/modules/hm/users.nix similarity index 100% rename from home/users.nix rename to modules/hm/users.nix diff --git a/system/default.nix b/modules/nixos/default.nix similarity index 98% rename from system/default.nix rename to modules/nixos/default.nix index 3fdd0cf..58eb1e4 100644 --- a/system/default.nix +++ b/modules/nixos/default.nix @@ -1,4 +1,3 @@ -{ stylix }: { config, pkgs, @@ -22,7 +21,6 @@ in imports = [ ./options.nix ./gui - stylix.nixosModules.stylix { stylix = import ./stylix-config.nix { inherit config pkgs; }; } ]; diff --git a/system/gui/default.nix b/modules/nixos/gui/default.nix similarity index 100% rename from system/gui/default.nix rename to modules/nixos/gui/default.nix diff --git a/system/options.nix b/modules/nixos/options.nix similarity index 100% rename from system/options.nix rename to modules/nixos/options.nix diff --git a/system/starship-nerdfont-symbols.nix b/modules/nixos/starship-nerdfont-symbols.nix similarity index 100% rename from system/starship-nerdfont-symbols.nix rename to modules/nixos/starship-nerdfont-symbols.nix diff --git a/system/starship-shorter-text.nix b/modules/nixos/starship-shorter-text.nix similarity index 100% rename from system/starship-shorter-text.nix rename to modules/nixos/starship-shorter-text.nix diff --git a/system/stylix-config.nix b/modules/nixos/stylix-config.nix similarity index 100% rename from system/stylix-config.nix rename to modules/nixos/stylix-config.nix diff --git a/nvim/augroups.nix b/modules/nixvim/augroups.nix similarity index 100% rename from nvim/augroups.nix rename to modules/nixvim/augroups.nix diff --git a/nvim/default.nix b/modules/nixvim/default.nix similarity index 100% rename from nvim/default.nix rename to modules/nixvim/default.nix diff --git a/nvim/dev-plugins.nix b/modules/nixvim/dev-plugins.nix similarity index 100% rename from nvim/dev-plugins.nix rename to modules/nixvim/dev-plugins.nix diff --git a/nvim/extraPlugins/default.nix b/modules/nixvim/extraPlugins/default.nix similarity index 100% rename from nvim/extraPlugins/default.nix rename to modules/nixvim/extraPlugins/default.nix diff --git a/nvim/extraPlugins/generated.nix b/modules/nixvim/extraPlugins/generated.nix similarity index 100% rename from nvim/extraPlugins/generated.nix rename to modules/nixvim/extraPlugins/generated.nix diff --git a/nvim/extraPlugins/plugins b/modules/nixvim/extraPlugins/plugins similarity index 100% rename from nvim/extraPlugins/plugins rename to modules/nixvim/extraPlugins/plugins diff --git a/nvim/mappings.nix b/modules/nixvim/mappings.nix similarity index 100% rename from nvim/mappings.nix rename to modules/nixvim/mappings.nix diff --git a/nvim/options.nix b/modules/nixvim/options.nix similarity index 100% rename from nvim/options.nix rename to modules/nixvim/options.nix diff --git a/nvim/plugins.nix b/modules/nixvim/plugins.nix similarity index 100% rename from nvim/plugins.nix rename to modules/nixvim/plugins.nix diff --git a/nvim/standalone.nix b/modules/nixvim/standalone.nix similarity index 100% rename from nvim/standalone.nix rename to modules/nixvim/standalone.nix -- 2.48.1 From eacd1a052001d83341b85fbb914ca15923d3871a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 16:52:36 +0100 Subject: [PATCH 2/4] refactor(nixvim): use flake-parts module A bit more tidy c: --- flake-modules/default.nix | 2 +- flake-modules/nixos-modules.nix | 14 +------- flake-modules/nixvim-modules.nix | 60 ++++++++++++++++++++++++++++++++ flake-modules/nvim.nix | 53 ---------------------------- 4 files changed, 62 insertions(+), 67 deletions(-) create mode 100644 flake-modules/nixvim-modules.nix delete mode 100644 flake-modules/nvim.nix diff --git a/flake-modules/default.nix b/flake-modules/default.nix index 050721e..d7b79eb 100644 --- a/flake-modules/default.nix +++ b/flake-modules/default.nix @@ -10,7 +10,7 @@ in ./docs.nix ./example-vm.nix ./nixos-modules.nix - ./nvim.nix + ./nixvim-modules.nix ./overlays.nix ./scripts.nix ]; diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index 3606a3f..c0acb54 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -9,22 +9,10 @@ let in { flake = { - nixvimModules = - let - standalone = modules + "/nixvim/standalone.nix"; - homeManager = { - imports = [ - inputs.nixvim.homeManagerModules.nixvim - (modules + "/nixvim") - ]; - }; - in - { - inherit standalone homeManager; - }; homeManagerModules = let defaultModules = [ + inputs.nixvim.homeManagerModules.nixvim self.nixvimModules.homeManager (modules + "/hm") ]; diff --git a/flake-modules/nixvim-modules.nix b/flake-modules/nixvim-modules.nix new file mode 100644 index 0000000..9841d46 --- /dev/null +++ b/flake-modules/nixvim-modules.nix @@ -0,0 +1,60 @@ +{ self, inputs, ... }: +let + modules = ../modules; +in +{ + imports = [ inputs.nixvim.flakeModules.default ]; + + nixvim = { + packages.enable = true; + checks.enable = false; # FIXME: borked due to nix-community/nixvim#3074 + }; + + flake.nixvimModules = { + standalone = modules + "/nixvim/standalone.nix"; + homeManager = modules + "/nixvim"; + }; + + perSystem = + { system, ... }: + let + nvimModule = extraConfig: { + inherit system; + modules = [ + self.nixvimModules.standalone + { performance.combinePlugins.enable = true; } + extraConfig + ]; + }; + modules = { + nvim = nvimModule { }; + # Smaller derivations + nvim-headless = nvimModule { + jhome.nvim.dev.enable = false; + jhome.nvim.reduceSize = true; + }; + nvim-small = nvimModule { + jhome.nvim.dev.bundleLSPs = false; + }; + nvim-no-ts = nvimModule { + jhome.nvim.dev.bundleGrammars = false; + }; + nvim-no-lsps = nvimModule { + jhome.nvim.dev = { + bundleLSPs = false; + bundleGrammars = false; + }; + }; + }; + in + { + checks = builtins.mapAttrs ( + _name: module: + inputs.nixvim.lib.${system}.check.mkTestDerivationFromNixvimModule { + module.imports = module.modules; + } + ) modules; + + nixvimConfigurations = builtins.mapAttrs (_name: inputs.nixvim.lib.evalNixvim) modules; + }; +} diff --git a/flake-modules/nvim.nix b/flake-modules/nvim.nix deleted file mode 100644 index f62c7ff..0000000 --- a/flake-modules/nvim.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ inputs, ... }: -{ - perSystem = - { lib, system, ... }: - let - nixvimLib = inputs.nixvim.lib.${system}; - nixvim = inputs.nixvim.legacyPackages.${system}; - testNvimModule = nixvimLib.check.mkTestDerivationFromNixvimModule; - nvimModule = extraConfig: { - pkgs = inputs.unstable.legacyPackages.${system}; - module = { - imports = [ ../modules/nixvim/standalone.nix ]; - config = lib.mkMerge [ - { performance.combinePlugins.enable = true; } - extraConfig - ]; - }; - }; - moduleDev = nvimModule { }; - moduleHeadless = nvimModule { - jhome.nvim.dev.enable = false; - jhome.nvim.reduceSize = true; - }; - moduleNoLsp = nvimModule { jhome.nvim.dev.bundleLSPs = false; }; - moduleNoTSGrammars = nvimModule { jhome.nvim.dev.bundleGrammars = false; }; - moduleNoBundledBins = nvimModule { - jhome.nvim.dev = { - bundleLSPs = false; - bundleGrammars = false; - }; - }; - in - { - # Check standalone nvim build - checks = { - nvimDev = testNvimModule moduleDev; - nvimHeadless = testNvimModule moduleHeadless; - nvimNoLsp = testNvimModule moduleNoLsp; - nvimNoTSGrammars = testNvimModule moduleNoTSGrammars; - nvimNoBundledBins = testNvimModule moduleNoBundledBins; - }; - - # Nvim standalone module - packages = { - nvim = nixvim.makeNixvimWithModule moduleDev; - # Smaller derivations - nvim-headless = nixvim.makeNixvimWithModule moduleHeadless; - nvim-small = nixvim.makeNixvimWithModule moduleNoBundledBins; - nvim-no-ts = nixvim.makeNixvimWithModule moduleNoTSGrammars; - nvim-no-lsps = nixvim.makeNixvimWithModule moduleNoLsp; - }; - }; -} -- 2.48.1 From 981fa9ae78d0673ce54615826ae8647ad5546b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 17:24:56 +0100 Subject: [PATCH 3/4] refactor(home-manager): use flake-parts module This is only available in the unstable HM branch, so we are stuck with the non flake-parts version --- flake-modules/default.nix | 1 + flake-modules/home-modules.nix | 34 +++++++++++++ flake-modules/nixos-modules.nix | 85 +++++++++++---------------------- 3 files changed, 64 insertions(+), 56 deletions(-) create mode 100644 flake-modules/home-modules.nix diff --git a/flake-modules/default.nix b/flake-modules/default.nix index d7b79eb..ce3e3c5 100644 --- a/flake-modules/default.nix +++ b/flake-modules/default.nix @@ -10,6 +10,7 @@ in ./docs.nix ./example-vm.nix ./nixos-modules.nix + ./home-modules.nix ./nixvim-modules.nix ./overlays.nix ./scripts.nix diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix new file mode 100644 index 0000000..8d8ca71 --- /dev/null +++ b/flake-modules/home-modules.nix @@ -0,0 +1,34 @@ +{ self, inputs, ... }: +let + modules = ../modules; +in +{ + # FIXME(25.05): this version of HM should have the flake module + # imports = [ inputs.home-manager.flakeModules.home-manager ]; + + flake.homeModules = + let + defaultModules = [ + inputs.nixvim.homeManagerModules.nixvim + self.nixvimModules.homeManager + (modules + "/hm") + ]; + nixos = { + imports = defaultModules; + }; + standalone = { + imports = defaultModules ++ [ + inputs.stylix.homeManagerModules.stilyx + ( + { config, ... }: + { + stylix.image = config.jhome.sway.background; + } + ) + ]; + }; + in + { + inherit standalone nixos; + }; +} diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index c0acb54..41bd64f 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -8,63 +8,36 @@ let modules = ../modules; in { - flake = { - homeManagerModules = - let - defaultModules = [ - inputs.nixvim.homeManagerModules.nixvim - self.nixvimModules.homeManager - (modules + "/hm") - ]; - nixos = { - imports = defaultModules; + flake.nixosModules = + let + nixosModule = { + imports = [ + inputs.stylix.nixosModules.stylix + inputs.home-manager.nixosModules.home-manager + (modules + "/nixos") + ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + sharedModules = [ self.homeModules.nixos ]; }; - standalone = { - imports = defaultModules ++ [ - inputs.stylix.homeManagerModules.stilyx - ( - { config, ... }: - { - stylix.image = config.jhome.sway.background; - } - ) - ]; - }; - in - { - inherit standalone nixos; + # Pin nixpkgs + nix.registry.nixpkgs.flake = inputs.nixpkgs; }; - nixosModules = - let - nixosModule = { - imports = [ - inputs.stylix.nixosModules.stylix - inputs.home-manager.nixosModules.home-manager - (modules + "/nixos") - ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - sharedModules = [ self.homeManagerModules.nixos ]; - }; - # Pin nixpkgs - nix.registry.nixpkgs.flake = inputs.nixpkgs; - }; - machines = [ "vm" ]; - mkMachine = hostname: { - imports = [ - nixosModule - (import (../machines + "/${hostname}")) - ]; - home-manager.sharedModules = [ { jhome.hostName = hostname; } ]; - }; - machineModules = lib.genAttrs machines mkMachine; - in - { - default = nixosModule; - inherit nixosModule; - } - // machineModules; - }; + machines = [ "vm" ]; + mkMachine = hostname: { + imports = [ + nixosModule + (import (../machines + "/${hostname}")) + ]; + home-manager.sharedModules = [ { jhome.hostName = hostname; } ]; + }; + machineModules = lib.genAttrs machines mkMachine; + in + { + default = nixosModule; + inherit nixosModule; + } + // machineModules; } -- 2.48.1 From 78327cd9729dc60adccde825743ffd952a215c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 19:14:11 +0100 Subject: [PATCH 4/4] ci: use nix-fast-build to speedup checks This should provide a nice speedup over calling nix build sequentially --- .forgejo/workflows/check.yml | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index adddf31..2eb273b 100644 --- a/.forgejo/workflows/check.yml +++ b/.forgejo/workflows/check.yml @@ -3,22 +3,13 @@ on: jobs: check: runs-on: nixos - strategy: - matrix: - check: - - nvimDev - - nvimHeadless - - nvimNoBundledBins - - nvimNoLsp - - nvimNoTSGrammars - - treefmt steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - name: Run checks run: | nix --version - # shellcheck disable=SC2016 - nix build --print-build-logs '.#checks.x86_64-linux.${{ matrix.check }}' + nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \ + --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)" check-renovaterc: runs-on: nixos steps: @@ -27,24 +18,25 @@ jobs: run: | nix --version nix shell nixpkgs#renovate --command renovate-config-validator - build: + build-packages: runs-on: nixos needs: check - strategy: - matrix: - target: - - audiomenu - - docs - - jpassmenu - - nixosConfigurations.vm.config.system.build.toplevel - - nvim steps: - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 - name: Build target run: | nix --version - # shellcheck disable=SC2016 - nix build --print-build-logs '.#${{ matrix.target }}' + nix-fast-build --max-jobs 2 --no-nom --skip-cached --no-link \ + --flake ".#packages.$(nix eval --raw --impure --expr builtins.currentSystem)" + build-vm: + runs-on: nixos + needs: build-packages + steps: + - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4 + - name: Build VM configuration + run: | + nix --version + nix build --print-build-logs '.#nixosConfigurations.vm.config.system.build.toplevel' report-size: runs-on: nixos needs: build -- 2.48.1