Minor refactor

This commit is contained in:
Riley Apeldoorn 2023-05-22 18:35:54 +02:00
parent e4a14d6c24
commit d0caa47c9d
2 changed files with 7 additions and 7 deletions

View file

@ -17,7 +17,7 @@
imports = [ home-manager.nixosModules.home-manager ]; imports = [ home-manager.nixosModules.home-manager ];
config = { config = {
home-manager.users."riley" = a: lib.pipe a [ home-manager.users."riley" = a: lib.pipe a [
(import path) (import "${path}/home.nix")
(x: x // { imports = [ ./shared/home ]; }) (x: x // { imports = [ ./shared/home ]; })
]; ];
}; };
@ -27,7 +27,7 @@
"thor" = lib.nixosSystem { "thor" = lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
(mkUserConfig ./system/thor/home.nix) (mkUserConfig ./system/thor)
./system/thor/core.nix ./system/thor/core.nix
./shared/core ./shared/core
]; ];
@ -38,7 +38,7 @@
"odin" = lib.nixosSystem { "odin" = lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
(mkUserConfig ./system/odin/home.nix) (mkUserConfig ./system/odin)
./system/odin/core.nix ./system/odin/core.nix
./shared/core ./shared/core
]; ];
@ -48,13 +48,12 @@
}; };
# Configurations for non-NixOS machines. # Configurations for non-NixOS machines.
homeConfigurations = { homeConfigurations = with home-manager.lib; {
"dev-lt-63" = home-manager.lib.homeManagerConfiguration { "dev-lt-63" = homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages."x86_64-linux"; pkgs = nixpkgs.legacyPackages."x86_64-linux";
modules = [ modules = [
./system/dev-lt-63/home.nix (mkUserConfig ./system/dev-lt-63)
./shared/home
]; ];
}; };

View file

@ -19,6 +19,7 @@
}; };
time.timeZone = "Europe/Amsterdam";
environment.systemPackages = (import ../env.nix pkgs); environment.systemPackages = (import ../env.nix pkgs);
services.earlyoom.enable = true; services.earlyoom.enable = true;