move common imports

This commit is contained in:
2024-08-08 13:12:28 +05:30
parent 69486b7df4
commit fd92021844
10 changed files with 28 additions and 17 deletions

View File

@ -45,7 +45,6 @@
canopus = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;};
modules = [
./modules/nixos
./hosts/canopus
home-manager.nixosModules.home-manager
@ -55,7 +54,6 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = {
imports = [
./modules/home-manager
./hosts/canopus/home.nix
];
};
@ -66,7 +64,6 @@
controller = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;};
modules = [
./modules/nixos
./hosts/controller
home-manager.nixosModules.home-manager
@ -76,7 +73,7 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = {
imports = [
./modules/home-manager
./hosts/controller/home.nix
];
};
}
@ -86,7 +83,6 @@
wsl = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;};
modules = [
./modules/nixos
./hosts/wsl
home-manager.nixosModules.home-manager
@ -96,7 +92,7 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = {
imports = [
./modules/home-manager
./hosts/wsl/home.nix
];
};
}
@ -106,7 +102,6 @@
isoImage = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs username;};
modules = [
./modules/nixos
./hosts/isoImage
home-manager.nixosModules.home-manager
@ -116,7 +111,7 @@
home-manager.extraSpecialArgs = {inherit inputs outputs username;};
home-manager.users.${username} = {
imports = [
./modules/home-manager
./hosts/isoImage/home.nix
];
};
}

View File

@ -6,7 +6,7 @@
imports = [
inputs.nixos-hardware.nixosModules.asus-zephyrus-ga503
./hardware-configuration.nix
../../modules/nixos/default.nix
../common
../../modules/nixos/desktop
../../modules/nixos/desktop/awesome
../../modules/nixos/desktop/hyprland

View File

@ -1,5 +1,6 @@
{pkgs, ...}: {
imports = [
../common/home.nix
../../modules/home-manager/awesome
../../modules/home-manager/hyprland
../../modules/home-manager/waybar

View File

@ -4,12 +4,12 @@
...
}: {
imports = [
./shell
./git
./starship
./nvim
./tmux
./helix
../../modules/home-manager/shell
../../modules/home-manager/git
../../modules/home-manager/starship
../../modules/home-manager/nvim
../../modules/home-manager/tmux
../../modules/home-manager/helix
];
nixpkgs = {

View File

@ -8,7 +8,7 @@
imports = [
inputs.sops-nix.nixosModules.sops
./hardware-configuration.nix
../../modules/nixos/default.nix
../common
../../modules/nixos/headscale.nix
../../modules/nixos/vaultwarden.nix
../../modules/nixos/uptime-kuma.nix

View File

@ -0,0 +1,5 @@
{...}: {
imports = [
../common/home.nix
];
}

5
hosts/isoImage/home.nix Normal file
View File

@ -0,0 +1,5 @@
{...}: {
imports = [
../common/home.nix
];
}

View File

@ -7,7 +7,7 @@
}: {
imports = [
inputs.nixos-wsl.nixosModules.wsl
../../modules/nixos/default.nix
../common
../../modules/nixos/virtualisation/docker.nix
];

5
hosts/wsl/home.nix Normal file
View File

@ -0,0 +1,5 @@
{...}: {
imports = [
../common/home.nix
];
}