move nix settings and users to common module

This commit is contained in:
Adithya 2023-04-19 22:18:11 +05:30
parent f7fd259f3d
commit 5dfe41fda2
Signed by: adtya
GPG key ID: 48FC9915FFD326D0
6 changed files with 6 additions and 7 deletions

2
.gitattributes vendored
View file

@ -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
View file

@ -0,0 +1,3 @@
{ ... }: {
imports = [ ./nix.nix ./users ];
}

View file

@ -44,8 +44,6 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = inputs; specialArgs = inputs;
modules = [ modules = [
./nix.nix
{ {
nixpkgs.overlays = [ (import ./packages) hyprland.overlays.default ]; nixpkgs.overlays = [ (import ./packages) hyprland.overlays.default ];
nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "x86_64-linux";
@ -56,8 +54,8 @@
impermanence.nixosModules.impermanence impermanence.nixosModules.impermanence
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
./common
./hosts/skipper ./hosts/skipper
./users
./home ./home
]; ];
}; };
@ -65,15 +63,13 @@
system = "aarch64-linux"; system = "aarch64-linux";
specialArgs = inputs; specialArgs = inputs;
modules = [ modules = [
./nix.nix
{ {
nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "aarch64-linux"; nixpkgs.hostPlatform = nixpkgs.lib.mkDefault "aarch64-linux";
system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
} }
./common
./hosts/rico ./hosts/rico
./users
]; ];
}; };
}; };