From c5002c3e283a6d7e2bb50dca002092a3085b6c6a Mon Sep 17 00:00:00 2001 From: Katherina Walshe-Grey Date: Tue, 17 Sep 2024 18:52:12 +0100 Subject: [PATCH] export homeManagerModules."qenya@shaw" --- flake.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 4680f54..f8d024b 100644 --- a/flake.nix +++ b/flake.nix @@ -27,17 +27,31 @@ }; outputs = inputs@{ self, nixpkgs, home-manager, plasma-manager, nur, agenix, birdsong, ... }: { + # nixosConfigurations.kalessin = nixpkgs.lib.nixosSystem { + # system = "aarch64-linux"; + # modules = [ + # # Import the previous configuration.nix we used, + # # so the old configuration file still takes effect + # ./configuration.nix + # ]; + # }; + # The name of this output type is not standardised. I have picked # "homeManagerModules" as the discussion here suggests it's the most common: # https://github.com/nix-community/home-manager/issues/1783 # # However, note CppNix >= 2.22.3, >= 2.24 has blessed "homeModules": # https://github.com/NixOS/nix/pull/10858 - homeManagerModules."qenya" = { config, lib, pkgs, ... }: { - imports = [ + homeManagerModules = { + "qenya".imports = [ plasma-manager.homeManagerModules.plasma-manager ./home/qenya ]; + + "qenya@shaw".imports = [ + self.homeManagerModules."qenya" + ./hosts/shaw/home.nix + ]; }; colmena = { @@ -56,7 +70,7 @@ nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [ nur.overlay ]; - + # TODO: make this or something like it work without infinite recursion # home-manager.users."qenya" = lib.mkIf (config.users.users ? "qenya") self.homeManagerModules."qenya"; home-manager.users."qenya" = self.homeManagerModules."qenya";