From d0caa47c9d9d102cdf69d05012f9ae4312233733 Mon Sep 17 00:00:00 2001 From: Riley Apeldoorn Date: Mon, 22 May 2023 18:35:54 +0200 Subject: [PATCH] Minor refactor --- flake.nix | 13 ++++++------- shared/core/default.nix | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index cab68bf..43cb480 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ imports = [ home-manager.nixosModules.home-manager ]; config = { home-manager.users."riley" = a: lib.pipe a [ - (import path) + (import "${path}/home.nix") (x: x // { imports = [ ./shared/home ]; }) ]; }; @@ -27,7 +27,7 @@ "thor" = lib.nixosSystem { system = "x86_64-linux"; modules = [ - (mkUserConfig ./system/thor/home.nix) + (mkUserConfig ./system/thor) ./system/thor/core.nix ./shared/core ]; @@ -38,7 +38,7 @@ "odin" = lib.nixosSystem { system = "aarch64-linux"; modules = [ - (mkUserConfig ./system/odin/home.nix) + (mkUserConfig ./system/odin) ./system/odin/core.nix ./shared/core ]; @@ -48,13 +48,12 @@ }; # 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"; modules = [ - ./system/dev-lt-63/home.nix - ./shared/home + (mkUserConfig ./system/dev-lt-63) ]; }; diff --git a/shared/core/default.nix b/shared/core/default.nix index c6f7136..e153500 100644 --- a/shared/core/default.nix +++ b/shared/core/default.nix @@ -19,6 +19,7 @@ }; + time.timeZone = "Europe/Amsterdam"; environment.systemPackages = (import ../env.nix pkgs); services.earlyoom.enable = true;