trying to bring home-manager into single-file users

This commit is contained in:
Nicholas Young 2023-02-16 11:47:00 -08:00
parent 4349ad8a1f
commit 381c969931
4 changed files with 36 additions and 8 deletions

View file

@ -19,12 +19,13 @@
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
lib = nixpkgs.lib;
in { in {
nixosConfigurations = { nixosConfigurations = {
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit inputs nixpkgs home-manager user kmonad ; inherit inputs nixpkgs home-manager user kmonad ;
NicksNixLaptop = { NicksNixLaptop = lib.nixosSystem {
inherit system; inherit system;
specialArgs = inputs; specialArgs = inputs;
@ -36,9 +37,17 @@
./hosts/laptop ./hosts/laptop
./hosts/configuration.nix ./hosts/configuration.nix
./modules/kmonad.nix ./modules/kmonad.nix
./hosts/laptop/home.nix home-manager.nixosModules.home-manager {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = { inherit user; };
users.${user} = import ./users/${user}.nix;
users.nicholix = import ./users/nicholix.nix;
};
}
]; ];
} };
}; };
}; };
} }

View file

@ -1,8 +1,7 @@
{ config, lib, pkgs, user, home-manager, ... }: { lib, inputs, nixpkgs, home-manager, user, kmonad, ... }:
{ {
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager = {
home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit user; }; extraSpecialArgs = { inherit user; };
@ -30,6 +29,5 @@
../../modules/zsh.nix ../../modules/zsh.nix
]; ];
}; };
}; };
}
} }

View file

@ -12,6 +12,16 @@ let
user = "nicholix"; user = "nicholix";
in in
{ {
imports = [
../../modules/emacs.nix
../../modules/git.nix
../../modules/fusuma.nix
../../modules/vim.nix
../../modules/wezterm.nix
../../modules/xdg.nix
../../modules/zsh.nix
];
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;

View file

@ -10,6 +10,17 @@ let
); );
in in
{ {
imports = [
../../modules/emacs.nix
../../../modules/git.nix
../../modules/fusuma.nix
../../modules/vim.nix
../../modules/wezterm.nix
../../modules/xdg.nix
../../modules/zsh.nix
];
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;