chore: refactored input imports

This commit is contained in:
Nick 2025-12-05 17:56:47 -06:00
parent 8ecdaefa43
commit 38f7ba4d91
9 changed files with 42 additions and 36 deletions

View file

@ -111,12 +111,6 @@
config.nixosModules.core
config.nixosModules.mantle
config.nixosModules.crust
inputs.niri.nixosModules.niri
inputs.home-manager.nixosModules.home-manager
# inputs.lix-module.nixosModules.default
inputs.nur.modules.nixos.default
inputs.microvm.nixosModules.host
inputs.sops-nix.nixosModules.sops
];
deimos = inputs.self.lib.mkLinuxSystem [
./systems/deimos
@ -125,10 +119,6 @@
config.nixosModules.core
config.nixosModules.mantle
config.nixosModules.crust
inputs.home-manager.nixosModules.home-manager
# inputs.lix-module.nixosModules.default
inputs.nur.modules.nixos.default
inputs.sops-nix.nixosModules.sops
];
phobos = inputs.self.lib.mkLinuxSystem [
./systems/phobos
@ -137,10 +127,6 @@
config.nixosModules.core
config.nixosModules.mantle
config.nixosModules.crust
inputs.home-manager.nixosModules.home-manager
# inputs.lix-module.nixosModules.default
inputs.nur.modules.nixos.default
inputs.sops-nix.nixosModules.sops
];
ceres = inputs.self.lib.mkLinuxSystem [
./systems/ceres
@ -148,10 +134,6 @@
config.nixosModules.ceres
config.nixosModules.core
config.nixosModules.mantle
inputs.home-manager.nixosModules.home-manager
# inputs.lix-module.nixosModules.default
inputs.microvm.nixosModules.host
inputs.sops-nix.nixosModules.sops
];
eris = inputs.self.lib.mkLinuxSystem [
./systems/eris
@ -159,16 +141,11 @@
config.nixosModules.eris
config.nixosModules.core
config.nixosModules.mantle
inputs.home-manager.nixosModules.home-manager
# inputs.lix-module.nixosModules.default
inputs.sops-nix.nixosModules.sops
];
iso = inputs.self.lib.mkLinuxSystem [
./profiles/user0
config.nixosModules.iso
config.nixosModules.core
inputs.home-manager.nixosModules.home-manager
inputs.lix-module.nixosModules.default
];
};

View file

@ -1,5 +1,9 @@
{ flake, ... }:
{
imports = [
flake.inputs.home-manager.nixosModules.home-manager
];
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [
flake.inputs.nur.overlays.default

View file

@ -13,11 +13,6 @@ in
allowUnfree = true;
allowBroken = true;
permittedInsecurePackages = [
"electron-unwrapped-33.0.2"
"electron-31.7.7"
"electron-27.3.11"
"electron-33.4.11"
"olm-3.2.16"
];
};
};

View file

@ -9,12 +9,16 @@ in
inherit (modules)
flatpak
hypr
wayland
impermanence
lix
microvm
network
niri
nur
plymouth
tuios
wayland
wireguard
microvm
;
};
};
@ -22,13 +26,16 @@ in
deimos = {
imports = builtins.attrValues {
inherit (modules)
hypr
wayland
network
flatpak
plymouth
wireguard
hypr
lix
microvm
network
niri
nur
plymouth
wayland
wireguard
;
};
};
@ -37,6 +44,8 @@ in
imports = builtins.attrValues {
inherit (modules)
microvm
lix
nur
;
};
};
@ -51,6 +60,7 @@ in
forgejo
impermanence
jellyfin
lix
mastodon
microvm
minecraft
@ -71,6 +81,7 @@ in
imports = builtins.attrValues {
inherit (modules)
impermanence
lix
microvm
opencloud0
sambaEris
@ -82,6 +93,7 @@ in
imports = builtins.attrValues {
inherit (modules)
iso
lix
xserver
;
};

View file

@ -3,5 +3,8 @@ let
inherit (flake.config.aesthetics.themes.windowManager.enabled) niri;
in
{
imports = [
flake.inputs.niri.nixosModules.niri
];
programs.niri.enable = niri;
}

View file

@ -0,0 +1,6 @@
{ flake, ... }:
{
imports = [
flake.inputs.nur.modules.nixos.default
];
}

6
modules/nixos/lix/default.nix Executable file
View file

@ -0,0 +1,6 @@
{ flake, ... }:
{
imports = [
flake.inputs.lix-module.nixosModules.default
];
}

View file

@ -3,5 +3,4 @@
imports = [
flake.inputs.microvm.nixosModules.host
];
}

View file

@ -3,6 +3,10 @@ let
inherit (flake.config.people) user0;
in
{
imports = [
flake.inputs.sops-nix.nixosModules.sops
];
sops = {
defaultSopsFile = ../../../secrets/secrets.yaml;
validateSopsFiles = false;