refactor: reorganized

This commit is contained in:
2025-01-26 07:45:20 +00:00
parent 458c829ca4
commit 9b8bf921fe
6 changed files with 14 additions and 18 deletions

View File

@@ -43,20 +43,17 @@
}; };
}; };
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules = [
[ ./hosts/${host.name}/configuration.nix
./hosts/${host.name}/configuration.nix ./modules/default.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
} }
] ] ++ (if builtins.hasAttr "isWSL" host then [ nixos-wsl.nixosModules.default ] else [ ]);
++ (
if builtins.hasAttr "isWSL" host && host.isWSL then [ nixos-wsl.nixosModules.default ] else [ ]
);
}; };
}) hosts }) hosts
); );

View File

@@ -16,7 +16,6 @@
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/default.nix
]; ];
boot.loader.grub = { boot.loader.grub = {

View File

@@ -11,7 +11,7 @@
}: }:
{ {
imports = [ ../../modules/default.nix ]; imports = [ ];
wsl.enable = true; wsl.enable = true;
wsl.defaultUser = "luca"; wsl.defaultUser = "luca";

View File

@@ -11,7 +11,7 @@
}: }:
{ {
imports = [ ../../modules/default.nix ]; imports = [ ];
wsl.enable = true; wsl.enable = true;
wsl.defaultUser = "luca"; wsl.defaultUser = "luca";

View File

@@ -24,6 +24,7 @@
asciiquarium asciiquarium
]; ];
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.zsh.enable = true;
programs.neovim = { programs.neovim = {
enable = true; enable = true;

View File

@@ -13,6 +13,5 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.luca = import ../users/luca/home.nix; home-manager.users.luca = import ../users/luca/home.nix;
programs.zsh.enable = true;
}; };
} }