From b21ada7574d2981dc2cf002f451c7c2c72e8b61f Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Thu, 27 Apr 2023 09:31:29 -0400 Subject: [PATCH] Rename for clarity --- nix-darwin/default.nix | 4 ++-- nixos/default.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix index a359b68..df31797 100644 --- a/nix-darwin/default.nix +++ b/nix-darwin/default.nix @@ -3,7 +3,7 @@ # Configuration common to all macOS systems flake = { darwinModules = { - myself = { + my-home = { home-manager.users.${config.people.myself} = { pkgs, ... }: { imports = [ self.homeModules.common-darwin @@ -13,7 +13,7 @@ default.imports = [ self.darwinModules.home-manager - self.darwinModules.myself + self.darwinModules.my-home self.nixosModules.common ]; }; diff --git a/nixos/default.nix b/nixos/default.nix index a5a0d63..5c85faf 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -4,7 +4,13 @@ # Configuration common to all Linux systems flake = { nixosModules = { - myself = { + # Common to all platforms + common.imports = [ + ./nix.nix + ./caches + ]; + + my-home = { users.users.${config.people.myself}.isNormalUser = true; home-manager.users.${config.people.myself} = { imports = [ @@ -13,15 +19,9 @@ }; }; - # Common to all platforms - common.imports = [ - ./nix.nix - ./caches - ]; - default.imports = [ self.nixosModules.home-manager - self.nixosModules.myself + self.nixosModules.my-home self.nixosModules.common ./self-ide.nix ./ssh-authorize.nix