refactor: dynamically manage most imports

This commit is contained in:
Leon Schwarzäugl 2025-02-26 00:32:05 +01:00
parent 6279713ab5
commit c8089780d7
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
17 changed files with 171 additions and 225 deletions

View file

@ -1,28 +1,13 @@
{ self, inputs, outputs, pkgs, lib, ... }:
{ self, pkgs, lib, ... }:
let
profilesPath = "${self}/profiles";
in
{
imports = outputs.nixModules ++ [
imports = [
./hardware-configuration.nix
"${profilesPath}/nixos/optional/autologin.nix"
inputs.home-manager.nixosModules.home-manager
{
home-manager.users.swarsel.imports = outputs.mixedModules ++ (builtins.attrValues outputs.homeManagerModules);
}
] ++ (builtins.attrValues outputs.nixosModules) ++ (builtins.attrValues outputs.homeManagerModules);
nixpkgs = {
overlays = [ outputs.overlays.default ];
config = {
allowUnfree = true;
};
};
];
environment.variables = {
WLR_RENDERER_ALLOW_SOFTWARE = 1;

View file

@ -5,11 +5,6 @@ in
{
imports = [
inputs.lanzaboote.nixosModules.lanzaboote
inputs.disko.nixosModules.disko
inputs.impermanence.nixosModules.impermanence
inputs.sops-nix.nixosModules.sops
"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
"${modulesPath}/installer/cd-dvd/channel.nix"

View file

@ -1,4 +1,4 @@
{ self, inputs, outputs, pkgs, lib, ... }:
{ self, inputs, pkgs, lib, ... }:
let
profilesPath = "${self}/profiles";
sharedOptions = {
@ -8,12 +8,12 @@ let
in
{
imports = outputs.nixModules ++ [
imports = [
inputs.nixos-hardware.nixosModules.framework-16-7040-amd
inputs.fw-fanctrl.nixosModules.default
./hardware-configuration.nix
./disk-config.nix
./hardware-configuration.nix
"${profilesPath}/nixos/optional/virtualbox.nix"
# "${profilesPath}/nixos/optional/vmware.nix"
@ -24,12 +24,12 @@ in
inputs.home-manager.nixosModules.home-manager
{
home-manager.users.swarsel.imports = outputs.mixedModules ++ [
home-manager.users.swarsel.imports = [
"${profilesPath}/home/optional/gaming.nix"
"${profilesPath}/home/optional/work.nix"
] ++ (builtins.attrValues outputs.homeManagerModules);
];
}
] ++ (builtins.attrValues outputs.nixosModules) ++ (builtins.attrValues outputs.homeManagerModules);
];

View file

@ -1,10 +1,9 @@
{ self, inputs, outputs, lib, ... }:
{ self, inputs, lib, ... }:
let
profilesPath = "${self}/profiles";
in
{
imports = [
inputs.sops-nix.nixosModules.sops
"${profilesPath}/nixos/server"
./hardware-configuration.nix
@ -13,16 +12,14 @@ in
{
home-manager.users.swarsel.imports = [
"${profilesPath}/home/server"
] ++ (builtins.attrValues outputs.homeManagerModules);
];
}
] ++ (builtins.attrValues outputs.nixosModules) ++ (builtins.attrValues outputs.homeManagerModules);
];
sops = {
defaultSopsFile = lib.mkForce "/root/.dotfiles/secrets/sync/secrets.yaml";
};
services.nginx = {
virtualHosts = {
"sync.swarsel.win" = {

View file

@ -9,14 +9,9 @@ in
{
imports = [
inputs.disko.nixosModules.disko
"${self}/hosts/nixos/toto/disk-config.nix"
./hardware-configuration.nix
inputs.sops-nix.nixosModules.sops
inputs.impermanence.nixosModules.impermanence
inputs.lanzaboote.nixosModules.lanzaboote
"${profilesPath}/nixos/optional/autologin.nix"
"${profilesPath}/nixos/common/settings.nix"
"${profilesPath}/nixos/common/home-manager.nix"
@ -34,7 +29,6 @@ in
"${profilesPath}/home/common/settings.nix"
"${profilesPath}/home/common/sops.nix"
"${profilesPath}/home/common/ssh.nix"
] ++ (builtins.attrValues outputs.homeManagerModules);
}
] ++ (builtins.attrValues outputs.nixosModules) ++ (builtins.attrValues outputs.homeManagerModules);

View file

@ -1,12 +1,10 @@
{ self, inputs, outputs, ... }:
{ self, inputs, ... }:
let
profilesPath = "${self}/profiles";
in
{
imports = [
inputs.sops-nix.nixosModules.sops
./hardware-configuration.nix
"${profilesPath}/nixos/optional/autologin.nix"
@ -16,10 +14,9 @@ in
{
home-manager.users.swarsel.imports = [
"${profilesPath}/home/server"
] ++ (builtins.attrValues outputs.homeManagerModules);
];
}
] ++ (builtins.attrValues outputs.nixosModules) ++ (builtins.attrValues outputs.homeManagerModules);
];
boot = {
loader.systemd-boot.enable = true;