treewide: decouple home-manager
This commit is contained in:
parent
e0ec7ceb2a
commit
41c4362136
7 changed files with 26 additions and 14 deletions
|
|
@ -53,7 +53,7 @@
|
||||||
zelk = { url = "github:schnensch0/zelk"; flake = false; };
|
zelk = { url = "github:schnensch0/zelk"; flake = false; };
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, agenix, nixpkgs, home-manager, ... } @ inputs:
|
outputs = { self, agenix, nixpkgs, ... } @ inputs:
|
||||||
let
|
let
|
||||||
overlays = (import ./overlays)
|
overlays = (import ./overlays)
|
||||||
++ [inputs.neovim-nightly.overlay]
|
++ [inputs.neovim-nightly.overlay]
|
||||||
|
|
@ -68,7 +68,6 @@
|
||||||
system = arch;
|
system = arch;
|
||||||
modules = [
|
modules = [
|
||||||
{ nixpkgs.overlays = overlays; }
|
{ nixpkgs.overlays = overlays; }
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
(./hosts + "/${name}")
|
(./hosts + "/${name}")
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, modules, overlays, pkgs, ... }: {
|
{ config, inputs, modules, overlays, pkgs, ... }: {
|
||||||
networking.hostName = "apricot";
|
networking.hostName = "apricot";
|
||||||
system.stateVersion = "21.05";
|
system.stateVersion = "21.05";
|
||||||
time.timeZone = "Asia/Phnom_Penh";
|
time.timeZone = "Asia/Phnom_Penh";
|
||||||
|
|
@ -9,6 +9,9 @@
|
||||||
wpa_conf.file = ../../secrets/wpa_conf.age;
|
wpa_conf.file = ../../secrets/wpa_conf.age;
|
||||||
};
|
};
|
||||||
imports = with modules.system; [
|
imports = with modules.system; [
|
||||||
|
inputs.home-manager.nixosModule
|
||||||
|
home-manager
|
||||||
|
|
||||||
base
|
base
|
||||||
input
|
input
|
||||||
kernel
|
kernel
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, modules, overlays, pkgs, ... }: {
|
{ config, inputs, modules, overlays, pkgs, ... }: {
|
||||||
networking.hostName = "blossom";
|
networking.hostName = "blossom";
|
||||||
system.stateVersion = "21.11";
|
system.stateVersion = "21.11";
|
||||||
time.timeZone = "Asia/Phnom_Penh";
|
time.timeZone = "Asia/Phnom_Penh";
|
||||||
|
|
@ -9,6 +9,9 @@
|
||||||
wpa_conf.file = ../../secrets/wpa_conf.age;
|
wpa_conf.file = ../../secrets/wpa_conf.age;
|
||||||
};
|
};
|
||||||
imports = with modules.system; [
|
imports = with modules.system; [
|
||||||
|
inputs.home-manager.nixosModule
|
||||||
|
home-manager
|
||||||
|
|
||||||
audio
|
audio
|
||||||
base
|
base
|
||||||
greetd
|
greetd
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, modules, modulesPath, overlays, pkgs, ... }: {
|
{ config, inputs, modules, modulesPath, overlays, pkgs, ... }: {
|
||||||
networking.hostName = "fondue";
|
networking.hostName = "fondue";
|
||||||
system.stateVersion = "21.05";
|
system.stateVersion = "21.05";
|
||||||
time.timeZone = "Australia/Melbourne";
|
time.timeZone = "Australia/Melbourne";
|
||||||
|
|
@ -9,6 +9,9 @@
|
||||||
};
|
};
|
||||||
imports = with modules.system; [
|
imports = with modules.system; [
|
||||||
(modulesPath + "/profiles/qemu-guest.nix")
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
|
inputs.home-manager.nixosModule
|
||||||
|
home-manager
|
||||||
|
|
||||||
base
|
base
|
||||||
input
|
input
|
||||||
kernel
|
kernel
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ in {
|
||||||
./system/base.nix
|
./system/base.nix
|
||||||
./system/greetd.nix
|
./system/greetd.nix
|
||||||
./system/gui.nix
|
./system/gui.nix
|
||||||
|
./system/home-manager.nix
|
||||||
./system/input.nix
|
./system/input.nix
|
||||||
./system/kernel.nix
|
./system/kernel.nix
|
||||||
./system/nix.nix
|
./system/nix.nix
|
||||||
|
|
|
||||||
|
|
@ -21,13 +21,4 @@
|
||||||
nix.registry.config.flake = inputs.self;
|
nix.registry.config.flake = inputs.self;
|
||||||
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
||||||
nix.registry.shells.flake = inputs.self;
|
nix.registry.shells.flake = inputs.self;
|
||||||
|
|
||||||
home-manager = {
|
|
||||||
useGlobalPkgs = true;
|
|
||||||
useUserPackages = true;
|
|
||||||
extraSpecialArgs = {
|
|
||||||
inherit enableGUI inputs modules;
|
|
||||||
sysConfig = config;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
12
modules/system/home-manager.nix
Normal file
12
modules/system/home-manager.nix
Normal 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; } ];
|
||||||
|
};
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue