promote nix content to top-level dir

This commit is contained in:
John Bowdre 2023-08-04 08:53:54 -05:00
parent fbc57affc2
commit 95f11fc8d0
23 changed files with 8 additions and 8 deletions

View file

@ -38,19 +38,19 @@
in in
{ {
inherit lib; inherit lib;
nixosModules = import ./nix/modules/nixos; nixosModules = import ./modules/nixos;
homeManagerModules = import ./nix/modules/home-manager; homeManagerModules = import ./modules/home-manager;
overlays = import ./nix/overlays { inherit inputs outputs; }; overlays = import ./overlays { inherit inputs outputs; };
packages = forEachSystem (pkgs: import ./nix/pkgs { inherit pkgs; }); packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; });
devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; }); devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; });
formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt); formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt);
nixosConfigurations = { nixosConfigurations = {
# Pixelbook converted to NixOS # Pixelbook converted to NixOS
pixnix = lib.nixosSystem { pixnix = lib.nixosSystem {
modules = [ ./nix/hosts/pixnix ]; modules = [ ./hosts/pixnix ];
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
}; };
}; };
@ -59,17 +59,17 @@
# Available through 'home-manager --flake .#your-username@your-hostname' # Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = { homeConfigurations = {
"john@penguin-fw" = lib.homeManagerConfiguration { "john@penguin-fw" = lib.homeManagerConfiguration {
modules = [ ./nix/home/penguin-fw.nix ]; modules = [ ./home/penguin-fw.nix ];
pkgs = pkgsFor.x86_64-linux; pkgs = pkgsFor.x86_64-linux;
extraSpecialArgs = { inherit inputs outputs; }; extraSpecialArgs = { inherit inputs outputs; };
}; };
"john@penguin-duet" = lib.homeManagerConfiguration { "john@penguin-duet" = lib.homeManagerConfiguration {
modules = [ ./nix/home/penguin-duet.nix ]; modules = [ ./home/penguin-duet.nix ];
pkgs = pkgsFor.aarch64-linux; pkgs = pkgsFor.aarch64-linux;
extraSpecialArgs = { inherit inputs outputs; }; extraSpecialArgs = { inherit inputs outputs; };
}; };
"john@pixnix" = lib.homeManagerConfiguration { "john@pixnix" = lib.homeManagerConfiguration {
modules = [ ./nix/home/pixnix.nix ]; modules = [ ./home/pixnix.nix ];
pkgs = pkgsFor.x86_64-linux; pkgs = pkgsFor.x86_64-linux;
extraSpecialArgs = { inherit inputs outputs; }; extraSpecialArgs = { inherit inputs outputs; };
}; };