From 4788fb6541b37a3aace4dfec20d6b704416ce842 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Tue, 9 Apr 2024 01:35:23 +1000 Subject: [PATCH] maybe fixed an eval error --- core/configuration.nix | 2 +- home/users/default.nix | 16 ++++++++++++++++ home/users/{-coffee.nix => u-coffee.nix} | 2 +- home/users/{-serenity.nix => u-serenity.nix} | 4 ++-- home/users/{-template.nix => u-template.nix} | 2 +- home/users/users.nix | 6 +++--- 6 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 home/users/default.nix rename home/users/{-coffee.nix => u-coffee.nix} (77%) rename home/users/{-serenity.nix => u-serenity.nix} (73%) rename home/users/{-template.nix => u-template.nix} (77%) diff --git a/core/configuration.nix b/core/configuration.nix index 448adde..6bae715 100644 --- a/core/configuration.nix +++ b/core/configuration.nix @@ -14,7 +14,7 @@ inputs.home-manager.nixosModules.home-manager # also split up configuration.nix and import pieces: - ../home/users/users.nix + ../home/users ./packages.nix ]; diff --git a/home/users/default.nix b/home/users/default.nix new file mode 100644 index 0000000..180798b --- /dev/null +++ b/home/users/default.nix @@ -0,0 +1,16 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: + +{ + + imports = [ + ./users.nix + ]; + +} diff --git a/home/users/-coffee.nix b/home/users/u-coffee.nix similarity index 77% rename from home/users/-coffee.nix rename to home/users/u-coffee.nix index 1f2db0b..5a504f4 100644 --- a/home/users/-coffee.nix +++ b/home/users/u-coffee.nix @@ -8,6 +8,7 @@ }: { imports = [ + inputs.home-manager.nixosModules.default ../home.nix ]; @@ -16,7 +17,6 @@ packages = with pkgs; [ ]; - }; } diff --git a/home/users/-serenity.nix b/home/users/u-serenity.nix similarity index 73% rename from home/users/-serenity.nix rename to home/users/u-serenity.nix index 05aea91..4d5b48b 100644 --- a/home/users/-serenity.nix +++ b/home/users/u-serenity.nix @@ -8,6 +8,7 @@ }: { imports = [ + inputs.home-manager.nixosModules.default ../home.nix ]; @@ -15,8 +16,7 @@ packages = with pkgs; [ - ]; - + ]; }; } diff --git a/home/users/-template.nix b/home/users/u-template.nix similarity index 77% rename from home/users/-template.nix rename to home/users/u-template.nix index a38b344..acc412c 100644 --- a/home/users/-template.nix +++ b/home/users/u-template.nix @@ -10,6 +10,7 @@ { imports = [ + inputs.home-manager.nixosModules.default ../home.nix ]; @@ -18,7 +19,6 @@ packages = with pkgs; [ ]; - }; } diff --git a/home/users/users.nix b/home/users/users.nix index 1b9c113..8ae7cd6 100644 --- a/home/users/users.nix +++ b/home/users/users.nix @@ -60,7 +60,7 @@ users = { # TEMPLATE = { - # imports = [ ./-template.nix ]; + # imports = [ ./u-template.nix ]; # home = { # username = "TEMPLATE"; # homeDirectory = "/home/TEMPLATE"; @@ -68,7 +68,7 @@ # }; coffee = { - imports = [ ./-coffee.nix ]; + imports = [ ./u-coffee.nix ]; home = { username = "coffee"; homeDirectory = "/home/coffee"; @@ -76,7 +76,7 @@ }; serenity = { - imports = [ ./-serenity.nix ]; + imports = [ ./u-serenity.nix ]; home = { username = "serenity"; homeDirectory = "/home/serenity";