dadada/nix-config
dadada/nix-config
1
0
Fork 0
Code Issues 2 Pull requests 5 Projects Releases Packages Wiki Activity Actions 1

use home-manager nixos module

Browse source
This commit is contained in:
Tim Schubert 2021-11-14 02:20:07 +01:00
parent bd1477f9f8
commit 68e8cac04e
Signed by: dadada
GPG key ID: EEB8D1CE62C4DFEA
3 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/configurations.nix
View file

@ -30,10 +30,6 @@ in
{ {
home = hmConfiguration { home = hmConfiguration {
extraModules = [ ./home ]; extraModules = [ ./home ];
overlays = [
(final: prev: { s = scripts; })
(final: prev: { n = nvd; })
];
stateVersion = "20.09"; stateVersion = "20.09";
}; };

23
nixos/configurations.nix
View file

@ -4,6 +4,8 @@
, home-manager , home-manager
, homePage , homePage
, nixos-hardware , nixos-hardware
, nvd
, scripts
}: }:
let adapterModule = system: { let adapterModule = system: {
nix.nixPath = [ nix.nixPath = [
@ -29,6 +31,8 @@ let adapterModule = system: {
nix.useSandbox = true; nix.useSandbox = true;
nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays) ++ [ nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays) ++ [
(final: prev: { homePage = homePage.defaultPackage.${system}; }) (final: prev: { homePage = homePage.defaultPackage.${system}; })
(final: prev: { s = scripts; })
(final: prev: { n = nvd; })
]; ];
}; };
in in
@ -38,12 +42,13 @@ in
modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
(adapterModule system) (adapterModule system)
nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1 nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
#home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
#{ {
# home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
# home-manager.useUserPackages = true; home-manager.useUserPackages = true;
# home-manager.users.dadada = self.hmConfigurations.home; home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules);
#} home-manager.users.dadada = import ../home/home;
}
./modules/profiles/laptop.nix ./modules/profiles/laptop.nix
./gorgon/configuration.nix ./gorgon/configuration.nix
]; ];
@ -63,6 +68,12 @@ in
(adapterModule system) (adapterModule system)
./modules/profiles/server.nix ./modules/profiles/server.nix
./surgat/configuration.nix ./surgat/configuration.nix
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules);
home-manager.users.dadada = import ../home/work;
}
]; ];
}; };
pruflas = nixosSystem rec { pruflas = nixosSystem rec {

2
outputs.nix
View file

@ -63,7 +63,7 @@
hmModules = import ./home/modules inputs; hmModules = import ./home/modules inputs;
nixosConfigurations = import ./nixos/configurations.nix { nixosConfigurations = import ./nixos/configurations.nix {
nixosSystem = nixpkgs.lib.nixosSystem; nixosSystem = nixpkgs.lib.nixosSystem;
inherit self nixpkgs home-manager nixos-hardware homePage; inherit self nixpkgs home-manager nixos-hardware nvd scripts homePage;
}; };
nixosModules = import ./nixos/modules inputs; nixosModules = import ./nixos/modules inputs;
overlays = import ./overlays; overlays = import ./overlays;