From 7e3954506d6ebc49605fc43707a2d2d1e8fa9f49 Mon Sep 17 00:00:00 2001 From: materus Date: Wed, 7 Jun 2023 01:22:51 +0200 Subject: [PATCH] materusPC: use home-manager as NixOS module --- configurations/host/default.nix | 22 ++++++++++++++++++--- configurations/host/materusPC/extraHome.nix | 2 +- configurations/host/materusPC/tmp.nix | 2 -- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/configurations/host/default.nix b/configurations/host/default.nix index 689c403..1ed8b8c 100644 --- a/configurations/host/default.nix +++ b/configurations/host/default.nix @@ -1,7 +1,7 @@ { inputs, materusFlake }: let - profles = import ../profile; + profiles = import ../profile; in { materusPC = inputs.nixpkgs.lib.nixosSystem rec { @@ -10,7 +10,23 @@ in modules = [ ./materusPC inputs.private.systemModule - profles.osProfile + profiles.osProfile + + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.materus = { config ,... }: { + imports = [ + ../home/materus + materusPC/extraHome.nix + profiles.homeProfile + inputs.private.homeModule + ]; + materus.profile.nixpkgs.enable = false; + }; + home-manager.extraSpecialArgs = { inherit inputs; inherit materusFlake; }; + } ]; }; valkyrie = inputs.nixpkgs.lib.nixosSystem rec { @@ -19,7 +35,7 @@ in modules = [ ./valkyrie inputs.private.systemModule - profles.osProfile + profiles.osProfile ]; }; diff --git a/configurations/host/materusPC/extraHome.nix b/configurations/host/materusPC/extraHome.nix index aa6ba6d..633ea43 100644 --- a/configurations/host/materusPC/extraHome.nix +++ b/configurations/host/materusPC/extraHome.nix @@ -7,7 +7,7 @@ materus.profile = { fonts.enable = lib.mkDefault true; - nixpkgs.enable = lib.mkDefault true; + nixpkgs.enable = lib.mkDefault false; enableDesktop = lib.mkDefault true; enableTerminal = lib.mkDefault true; enableTerminalExtra = lib.mkDefault true; diff --git a/configurations/host/materusPC/tmp.nix b/configurations/host/materusPC/tmp.nix index 7657588..7550907 100644 --- a/configurations/host/materusPC/tmp.nix +++ b/configurations/host/materusPC/tmp.nix @@ -343,8 +343,6 @@ in gnomeExtensions.dash-to-panel gnomeExtensions.dash-to-dock */ - - config.materus.profile.packages.home-manager ];