From 594ec7a49f914ef7c7aad54ed5991b104fd04fd4 Mon Sep 17 00:00:00 2001 From: iFargle Date: Tue, 19 Sep 2023 09:57:43 +0900 Subject: [PATCH] test --- home-manager/default.nix | 2 +- lib/default.nix | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index 04d514e7..618990b9 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, inputs, hostname, username, desktop, theme, hmStateVersion, ... }: { +{ lib, config, pkgs, inputs, hostname, platform, username, desktop, theme, hmStateVersion, ... }: { home = { inherit username; diff --git a/lib/default.nix b/lib/default.nix index 30bce591..4c804d4b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -44,21 +44,22 @@ theme ? "default" }: inputs.nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs desktop hostname username stateVersion gpu platform theme; }; + system = "$platform"; modules = [ ../nixos installer inputs.sops-nix.nixosModules.sops inputs.lanzaboote.nixosModules.lanzaboote - # inputs.home-manager.nixosModules.home-manager { - # extraSpecialArgs = { inherit inputs outputs desktop hostname platform username hmStateVersion theme; }; -# - # home-manager.useGlobalPkgs = true; - # home-manager.useUserPackages = true; - # users.users."$username" = import ../home-manager; - # # imports = [ - # # inputs.doom-emacs.hmModule - # # ]; - # } + inputs.home-manager.nixosModules.home-manager { + extraSpecialArgs = { inherit inputs outputs desktop hostname platform username hmStateVersion theme; }; + + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + users.users."$username" = import ../home-manager; + imports = [ + inputs.doom-emacs.hmModule + ]; + } ]; };