primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 14:49:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nixos: move shared modules to common

Browse source
This commit is contained in:
Primrose 2024-12-21 12:02:54 +01:00
parent 6a5e526566
commit fcf6ed1dff
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
6 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nix/nixosModules/default.nix
View file

@ -7,9 +7,6 @@
}:
let
# shared between nixos and nix-darwin
shared = modulesFromDir ./shared;
# generic modules that can be enabled on all devices
common = modulesFromDir ./common;
@ -23,7 +20,6 @@ let
inputs.agenix.nixosModules.default
inputs.url-eater.nixosModules.default
self.nixosModules.sharedModules
self.nixosModules.commonModules
self.nixosModules.fish-vendor-completions
@ -49,12 +45,7 @@ in
{
flake.nixosModules = lib.mergeAttrsList [
{
# Fuse some module sets together
sharedModules.imports = lib.attrValues shared;
commonModules.imports = lib.attrValues common;
}
shared
{ commonModules.imports = lib.attrValues common; }
common
extra
named