lgmrszd/nix-cfg
1
0
Fork 0
mirror of https://git.lgmrszd.xyz/Lgmrszd/nix-cfg.git synced 2024-11-25 12:28:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rearrange things and move home-manager to mkHostConfig function

Browse source
This commit is contained in:
Lgmrszd 2024-05-31 16:06:16 +03:00
parent ee29846e7a
commit 9f4c4b396a
No known key found for this signature in database
GPG key ID: 9396B8BA6FBB14DE
3 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -224,11 +224,11 @@
}, },
"nix-cfg-extra": { "nix-cfg-extra": {
"locked": { "locked": {
"lastModified": 1716069899, "lastModified": 1717158370,
"narHash": "sha256-p4v5ngjHIJ6iyTN01iw3ubWDUVSYIAVA3NP95a58eYs=", "narHash": "sha256-bt6F3uxoBYblNtipr/xLV6os/elzXAymyHxNXdaXFQQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c4247e50ed0fb24f4f9676fc8d90064f103f5cb0", "rev": "c4c90137dc25f5d4f2b03322b472de8f919fc3d9",
"revCount": 2, "revCount": 4,
"type": "git", "type": "git",
"url": "file:///home/lgm/nix-cfg-extra" "url": "file:///home/lgm/nix-cfg-extra"
}, },

36
flake.nix
View file

@ -62,10 +62,15 @@
overlay-vaapiIntel overlay-vaapiIntel
]; ];
inherit (inputs.nix-cfg-extra.lib) extra-data; inherit (inputs.nix-cfg-extra.lib) extra-data;
inherit (inputs.nix-cfg-extra.lib) extra-host-modules;
inherit (inputs.nix-cfg-extra.lib) extra-host-home-modules;
mkHostConfig = ({ host, extraModules ? [] }: mkHostConfig = ({ host, extraModules ? [], useHome ? false }:
let let
data = import ./hosts/${host}/data // (if extra-data ? host then extra-data.host else {}); # TODO: rename some of those
data = import ./hosts/${host}/data // (if extra-data ? ${host} then extra-data.${host} else {});
extra-modules = (if extra-host-modules ? ${host} then extra-host-modules.${host} else []);
extra-home-modules = (if extra-host-home-modules ? ${host} then extra-host-home-modules.${host} else []);
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system; inherit system;
@ -75,21 +80,28 @@
./hosts/${host}/configuration.nix ./hosts/${host}/configuration.nix
./hosts/${host}/hardware-configuration.nix ./hosts/${host}/hardware-configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
] ++ extraModules; ]
++ extra-modules
++ extraModules
++ (if !useHome then [] else [
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.lgm = {
imports = [
./hosts/${host}/home.nix
] ++ extra-home-modules;
};
}
])
;
}); });
in in
{ {
nixosConfigurations.lgm-nixos = mkHostConfig { nixosConfigurations.lgm-nixos = mkHostConfig {
host = "laptop"; host = "laptop";
extraModules = [ useHome = true;
./hosts/laptop/mounts.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.lgm = import ./hosts/laptop/home.nix;
}
];
}; };
nixosConfigurations.lgm-vps1 = mkHostConfig { nixosConfigurations.lgm-vps1 = mkHostConfig {
host = "vps1"; host = "vps1";

1
hosts/laptop/configuration.nix
View file

@ -10,6 +10,7 @@ in
{ {
imports = [ imports = [
./mounts.nix
./akkotest.nix ./akkotest.nix
]; ];
# boot.kernelPackages = pkgs.linuxPackages_zen; # boot.kernelPackages = pkgs.linuxPackages_zen;