refactor(home-manager): try to not repeating myself
This commit is contained in:
parent
b0d455217f
commit
e862d4b35c
3 changed files with 21 additions and 24 deletions
13
home-manager/base.nix
Normal file
13
home-manager/base.nix
Normal file
|
@ -0,0 +1,13 @@
|
|||
{ lib, hostname, ...}:
|
||||
{
|
||||
programs.home-manager.enable = true;
|
||||
home.sessionPath = [
|
||||
"$HOME/.local/bin"
|
||||
];
|
||||
imports = [
|
||||
../hosts/${hostname}/home-config.nix
|
||||
../modules/home-manager/default.nix
|
||||
] ++ lib.optional (
|
||||
builtins.pathExists ../hosts/${hostname}/includes/home-manager.nix
|
||||
) ../hosts/${hostname}/includes/home-manager.nix;
|
||||
}
|
|
@ -1,18 +1,11 @@
|
|||
{ lib, stateVersion, username, hostname, ... }:
|
||||
{ stateVersion, username, ... }:
|
||||
{
|
||||
home.stateVersion = stateVersion;
|
||||
home.username = "${username}";
|
||||
home.homeDirectory = "/home/${username}";
|
||||
home.stateVersion = stateVersion;
|
||||
programs.home-manager.enable = true;
|
||||
fonts.fontconfig.enable = true;
|
||||
home.sessionPath = [
|
||||
"$HOME/.local/bin"
|
||||
];
|
||||
fonts.fontconfig.enable = true;
|
||||
imports = [
|
||||
./base.nix
|
||||
../nixos/includes/system/overlay.nix
|
||||
../hosts/${hostname}/home-config.nix
|
||||
../modules/home-manager/default.nix
|
||||
]++ lib.optional (
|
||||
builtins.pathExists ../hosts/${hostname}/includes/home-manager.nix
|
||||
) ../hosts/${hostname}/includes/home-manager.nix;
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ inputs, pkgs, lib, stateVersion, hostname, username, hostConfig, config, ... }:
|
||||
{ inputs, pkgs, stateVersion, hostname, username, hostConfig, ... }:
|
||||
{
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
../hosts/${hostname}/hardware-configuration.nix
|
||||
|
@ -51,18 +51,9 @@
|
|||
|
||||
users.${username} = {
|
||||
home.stateVersion = stateVersion;
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
home.sessionPath = [
|
||||
"$HOME/.local/bin"
|
||||
];
|
||||
|
||||
imports = [
|
||||
../hosts/${hostname}/home-config.nix
|
||||
../modules/home-manager/default.nix
|
||||
] ++ lib.optional (
|
||||
builtins.pathExists ../hosts/${hostname}/includes/home-manager.nix
|
||||
) ../hosts/${hostname}/includes/home-manager.nix;
|
||||
../home-manager/base.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue