refactor: don't include the whole modules
Some checks failed
/ check (push) Successful in 9s
/ check-renovaterc (push) Successful in 3s
/ build-packages (push) Successful in 14s
/ build-vm (push) Failing after 2s
/ report-size (push) Has been skipped

Instead only import the nixos/hm/nixvim module.

This _should_ reduce rebuilds.
This commit is contained in:
Jalil David Salamé Messina 2025-03-21 16:21:13 +01:00
parent 5359f13621
commit 3903149393
Signed by: jalil
GPG key ID: F016B9E770737A0B
4 changed files with 15 additions and 29 deletions

View file

@ -8,9 +8,11 @@ in
{
# Example vm configuration
flake.nixosConfigurations.vm = lib.nixosSystem {
inherit system pkgs;
inherit pkgs;
modules = [
inputs.self.nixosModules.vm # import vm module
inputs.self.nixosModules.default
../machines/vm
# import vm module
{
time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8";

View file

@ -1,7 +1,4 @@
{ 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 ];
@ -11,7 +8,7 @@ in
defaultModules = [
inputs.nixvim.homeManagerModules.nixvim
self.nixvimModules.homeManager
(modules + "/hm")
../module/hm
];
nixos = {
imports = defaultModules;

View file

@ -4,9 +4,6 @@
lib,
...
}:
let
modules = ../modules;
in
{
flake.nixosModules =
let
@ -14,7 +11,7 @@ in
imports = [
inputs.stylix.nixosModules.stylix
inputs.home-manager.nixosModules.home-manager
(modules + "/nixos")
../modules/nixos
] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default;
home-manager = {
useGlobalPkgs = true;
@ -24,20 +21,9 @@ in
# 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;
};
}

View file

@ -1,7 +1,4 @@
{ self, inputs, ... }:
let
modules = ../modules;
in
{
imports = [ inputs.nixvim.flakeModules.default ];
@ -10,10 +7,14 @@ in
checks.enable = false; # FIXME: borked due to nix-community/nixvim#3074
};
flake.nixvimModules = {
standalone = modules + "/nixvim/standalone.nix";
homeManager = modules + "/nixvim";
};
flake.nixvimModules =
let
module = ../modules/nixvim;
in
{
standalone = "${module}/standalone.nix";
homeManager = module;
};
perSystem =
{ system, ... }: