treewide: decouple home-manager

This commit is contained in:
LavaDesu 2022-02-02 00:27:17 +07:00
parent e0ec7ceb2a
commit 41c4362136
Signed by: cilly
GPG key ID: 6500251E087653C9
7 changed files with 26 additions and 14 deletions

View file

@ -53,7 +53,7 @@
zelk = { url = "github:schnensch0/zelk"; flake = false; };
};
outputs = { self, agenix, nixpkgs, home-manager, ... } @ inputs:
outputs = { self, agenix, nixpkgs, ... } @ inputs:
let
overlays = (import ./overlays)
++ [inputs.neovim-nightly.overlay]
@ -68,7 +68,6 @@
system = arch;
modules = [
{ nixpkgs.overlays = overlays; }
home-manager.nixosModules.home-manager
agenix.nixosModules.age
(./hosts + "/${name}")
];

View file

@ -1,4 +1,4 @@
{ config, modules, overlays, pkgs, ... }: {
{ config, inputs, modules, overlays, pkgs, ... }: {
networking.hostName = "apricot";
system.stateVersion = "21.05";
time.timeZone = "Asia/Phnom_Penh";
@ -9,6 +9,9 @@
wpa_conf.file = ../../secrets/wpa_conf.age;
};
imports = with modules.system; [
inputs.home-manager.nixosModule
home-manager
base
input
kernel

View file

@ -1,4 +1,4 @@
{ config, modules, overlays, pkgs, ... }: {
{ config, inputs, modules, overlays, pkgs, ... }: {
networking.hostName = "blossom";
system.stateVersion = "21.11";
time.timeZone = "Asia/Phnom_Penh";
@ -9,6 +9,9 @@
wpa_conf.file = ../../secrets/wpa_conf.age;
};
imports = with modules.system; [
inputs.home-manager.nixosModule
home-manager
audio
base
greetd

View file

@ -1,4 +1,4 @@
{ config, modules, modulesPath, overlays, pkgs, ... }: {
{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: {
networking.hostName = "fondue";
system.stateVersion = "21.05";
time.timeZone = "Australia/Melbourne";
@ -9,6 +9,9 @@
};
imports = with modules.system; [
(modulesPath + "/profiles/qemu-guest.nix")
inputs.home-manager.nixosModule
home-manager
base
input
kernel

View file

@ -19,6 +19,7 @@ in {
./system/base.nix
./system/greetd.nix
./system/gui.nix
./system/home-manager.nix
./system/input.nix
./system/kernel.nix
./system/nix.nix

View file

@ -21,13 +21,4 @@
nix.registry.config.flake = inputs.self;
nix.registry.nixpkgs.flake = inputs.nixpkgs;
nix.registry.shells.flake = inputs.self;
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
inherit enableGUI inputs modules;
sysConfig = config;
};
};
}

View file

@ -0,0 +1,12 @@
{ config, enableGUI, inputs, modules, ... }: {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
inherit enableGUI inputs modules;
sysConfig = config;
};
# uncomment to prevent nmd IFD
# sharedModules = [ { manual.manpages.enable = false; } ];
};
}