marc/samfelag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partial way to unifying nixos and home-manager modules

Browse Source
This commit is contained in:
marc
2022-11-16 20:28:32 +01:00
parent 5c609ddd42
commit 882c04a6bf
8 changed files with 121 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
flake.nix
View File

@@ -29,17 +29,24 @@
reykjavik = lib.nixosSystem {
inherit system;
inherit pkgs;
specialArgs = { inherit inputs; };
specialArgs = { inherit lib inputs system; };
modules = [
./system/modules
./system/profiles
./system/hosts/reykjavik
home-manager.nixosModules.home-manager {
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
{
imports =
[ inputs.home-manager.nixosModules.home-manager ]
# All my personal modules
++ (lib.my.mapModulesRec' (toString ./modules) import);
}
{
# home-manager.extraSpecialArgs = { inherit inputs; };
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
home-manager.users.marc = {
imports = [
./home/modules
@@ -53,29 +60,29 @@
};
# - Kopavogur ----------------------------
kopavogur = lib.nixosSystem {
inherit system;
inherit pkgs;
modules = [
# kopavogur = lib.nixosSystem {
# inherit system;
# inherit pkgs;
# modules = [
./system/modules
./system/profiles
./system/hosts/kopavogur
# ./system/modules
# ./system/profiles
# ./system/hosts/kopavogur
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.marc = {
imports = [
./home/modules
./home/profiles
./home/hosts/kopavogur.nix
];
};
}
# home-manager.nixosModules.home-manager {
# home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true;
# home-manager.users.marc = {
# imports = [
# ./home/modules
# ./home/profiles
# ./home/hosts/kopavogur.nix
# ];
# };
# }
];
};
# ];
# };
};
};