move nix settings and users to common module
This commit is contained in:
parent
f7fd259f3d
commit
5dfe41fda2
6 changed files with 6 additions and 7 deletions
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -1 +1 @@
|
|||
users/user.nix filter=git-crypt diff=git-crypt
|
||||
common/users/user.nix filter=git-crypt diff=git-crypt
|
||||
|
|
3
common/default.nix
Normal file
3
common/default.nix
Normal file
|
@ -0,0 +1,3 @@
|
|||
{ ... }: {
|
||||
imports = [ ./nix.nix ./users ];
|
||||
}
|
|
@ -44,8 +44,6 @@
|
|||
system = "x86_64-linux";
|
||||
specialArgs = inputs;
|
||||
modules = [
|
||||
./nix.nix
|
||||
|
||||
{
|
||||
nixpkgs.overlays = [ (import ./packages) hyprland.overlays.default ];
|
||||
nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "x86_64-linux";
|
||||
|
@ -56,8 +54,8 @@
|
|||
impermanence.nixosModules.impermanence
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
|
||||
./common
|
||||
./hosts/skipper
|
||||
./users
|
||||
./home
|
||||
];
|
||||
};
|
||||
|
@ -65,15 +63,13 @@
|
|||
system = "aarch64-linux";
|
||||
specialArgs = inputs;
|
||||
modules = [
|
||||
./nix.nix
|
||||
|
||||
{
|
||||
nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "aarch64-linux";
|
||||
system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
|
||||
}
|
||||
|
||||
./common
|
||||
./hosts/rico
|
||||
./users
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue