Clean up module exports and add module to allow Nix to use an SSH agent

This commit is contained in:
notgne2 2022-12-27 03:06:01 -07:00
parent 526b6532a5
commit fa1a81c7f4
No known key found for this signature in database
7 changed files with 81 additions and 77 deletions

View file

@ -79,41 +79,54 @@
nixpkgs,
...
} @ inputs: {
nixosModules = {
ezpassthru = import ./modules/ezpassthru.nix;
ezwg = import ./modules/ezwg.nix;
kiosk = import ./modules/kiosk.nix;
fuckingprint = import ./modules/fuckingprint.nix;
workstation = import ./modules/workstation.nix;
ezpw = import ./modules/ezpw.nix;
de2 = import ./modules/de2.nix;
de3 = import ./modules/de3.nix;
ezpc = import ./modules/ezpc.nix;
all = import ./modules/default.nix;
};
nixosModules = let
m = {
ezpassthru = import ./modules/ezpassthru.nix;
ezwg = import ./modules/ezwg.nix;
kiosk = import ./modules/kiosk.nix;
fuckingprint = import ./modules/fuckingprint.nix;
workstation = import ./modules/workstation.nix;
ezpw = import ./modules/ezpw.nix;
de2 = import ./modules/de2.nix;
de3 = import ./modules/de3.nix;
ezpc = import ./modules/ezpc.nix;
nix-ssh-agent = import ./modules/nix-ssh-agent.nix;
};
in
m
// rec {
all = {...}: {
imports = builtins.attrValues m;
};
homeManagerModules = {
ezpcusr = import ./home-manager/modules/ezpcusr.nix inputs;
colors = import ./home-manager/modules/colors.nix inputs;
fonts = import ./home-manager/modules/fonts.nix;
gaming = import ./home-manager/modules/gaming.nix inputs;
kermit = import ./home-manager/modules/kermit.nix;
de2u = import ./home-manager/modules/de2u.nix inputs;
de3u = import ./home-manager/modules/de3u.nix inputs;
elvish = import ./home-manager/modules/elvish.nix inputs;
all = import ./home-manager/modules/default.nix inputs;
};
common = import ./common.nix all;
common-notgne2 = import ./users/notgne2.nix;
common-glooder = import ./users/glooder.nix;
common-chekkie = import ./users/chekkie.nix;
};
# Not really modules? but eh
nixosModules.common = import ./common.nix;
nixosModules.common-notgne2 = import ./users/notgne2.nix;
nixosModules.common-glooder = import ./users/glooder.nix;
nixosModules.common-chekkie = import ./users/chekkie.nix;
homeManagerModules = let
m = {
ezpcusr = import ./home-manager/modules/ezpcusr.nix inputs;
colors = import ./home-manager/modules/colors.nix inputs;
fonts = import ./home-manager/modules/fonts.nix;
gaming = import ./home-manager/modules/gaming.nix inputs;
kermit = import ./home-manager/modules/kermit.nix;
de2u = import ./home-manager/modules/de2u.nix inputs;
de3u = import ./home-manager/modules/de3u.nix inputs;
elvish = import ./home-manager/modules/elvish.nix inputs;
};
in
m
// rec {
all = {...}: {
imports = builtins.attrValues m;
};
homeManagerModules.common = import ./home-manager/common.nix inputs;
homeManagerModules.common-notgne2 =
import ./home-manager/users/notgne2.nix inputs;
homeManagerModules.common-glooder = import ./home-manager/users/glooder.nix;
homeManagerModules.common-chekkie = import ./home-manager/users/chekkie.nix;
common = import ./home-manager/common.nix inputs all;
common-notgne2 = import ./home-manager/users/notgne2.nix inputs;
common-glooder = import ./home-manager/users/glooder.nix;
common-chekkie = import ./home-manager/users/chekkie.nix;
};
};
}