starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-04-19 15:31:22 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: home modules

Browse Source
This commit is contained in:
Ryan Yin
2024-03-13 13:32:13 +08:00
parent 5234fd7279
commit 093866a2aa
8 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/macosSystem.nix
View File

@@ -1,7 +1,8 @@
{ {
lib,
inputs, inputs,
darwin-modules, darwin-modules,
home-module ? null, home-modules ? [],
myvars, myvars,
system, system,
genSpecialArgs, genSpecialArgs,
@@ -25,14 +26,18 @@ in
# discard all the default paths, and only use the one from this flake. # discard all the default paths, and only use the one from this flake.
nix.nixPath = lib.mkForce ["/etc/nix/inputs"]; nix.nixPath = lib.mkForce ["/etc/nix/inputs"];
}) })
]
++ (
lib.optionals ((lib.lists.length home-modules) > 0)
[
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.darwinModules.home-manager home-manager.extraSpecialArgs = specialArgs;
{ home-manager.users."${myvars.username}".imports = home-modules;
home-manager.useGlobalPkgs = true; }
home-manager.useUserPackages = true; ]
);
home-manager.extraSpecialArgs = specialArgs;
home-manager.users."${myvars.username}" = home-module;
}
];
} }

6
lib/nixosSystem.nix
View File

@@ -4,7 +4,7 @@
system, system,
genSpecialArgs, genSpecialArgs,
nixos-modules, nixos-modules,
home-module ? null, home-modules ? [],
myvars, myvars,
... ...
}: let }: let
@@ -26,7 +26,7 @@ in
} }
] ]
++ ( ++ (
lib.optionals (home-module != null) lib.optionals ((lib.lists.length home-modules) > 0)
[ [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
@@ -34,7 +34,7 @@ in
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = specialArgs; home-manager.extraSpecialArgs = specialArgs;
home-manager.users."${myvars.username}" = home-module; home-manager.users."${myvars.username}".imports = home-modules;
} }
] ]
); );

2
outputs/aarch64-darwin/src/fern.nix
View File

@@ -22,7 +22,7 @@
"hosts/darwin-${name}" "hosts/darwin-${name}"
]) ])
++ []; ++ [];
home-module.imports = map mylib.relativeToRoot [ home-modules = map mylib.relativeToRoot [
"hosts/darwin-${name}/home.nix" "hosts/darwin-${name}/home.nix"
"home/darwin" "home/darwin"
]; ];

2
outputs/x86_64-darwin/src/harnomica.nix
View File

@@ -23,7 +23,7 @@
]) ])
++ []; ++ [];
home-module.imports = map mylib.relativeToRoot [ home-modules = map mylib.relativeToRoot [
"hosts/darwin-${name}/home.nix" "hosts/darwin-${name}/home.nix"
"home/darwin" "home/darwin"
]; ];

10
outputs/x86_64-linux/src/12kingdoms-shoukei.nix
View File

@@ -20,7 +20,7 @@
# host specific # host specific
"hosts/12kingdoms-${name}" "hosts/12kingdoms-${name}"
]; ];
home-module.imports = map mylib.relativeToRoot [ home-modules = map mylib.relativeToRoot [
# common # common
"home/linux/desktop.nix" "home/linux/desktop.nix"
# host specific # host specific
@@ -38,11 +38,11 @@
} }
] ]
++ base-modules.nixos-modules; ++ base-modules.nixos-modules;
home-module.imports = home-modules =
[ [
{modules.desktop.i3.enable = true;} {modules.desktop.i3.enable = true;}
] ]
++ base-modules.home-module.imports; ++ base-modules.home-modules;
}; };
modules-hyprland = { modules-hyprland = {
@@ -55,11 +55,11 @@
} }
] ]
++ base-modules.nixos-modules; ++ base-modules.nixos-modules;
home-module.imports = home-modules =
[ [
{modules.desktop.hyprland.enable = true;} {modules.desktop.hyprland.enable = true;}
] ]
++ base-modules.home-module.imports; ++ base-modules.home-modules;
}; };
in { in {
nixosConfigurations = { nixosConfigurations = {

10
outputs/x86_64-linux/src/idols-ai.nix
View File

@@ -20,7 +20,7 @@
# host specific # host specific
"hosts/idols-${name}" "hosts/idols-${name}"
]; ];
home-module.imports = map mylib.relativeToRoot [ home-modules = map mylib.relativeToRoot [
# common # common
"home/linux/desktop.nix" "home/linux/desktop.nix"
# host specific # host specific
@@ -38,11 +38,11 @@
} }
] ]
++ base-modules.nixos-modules; ++ base-modules.nixos-modules;
home-module.imports = home-modules =
[ [
{modules.desktop.i3.enable = true;} {modules.desktop.i3.enable = true;}
] ]
++ base-modules.home-module.imports; ++ base-modules.home-modules;
}; };
modules-hyprland = { modules-hyprland = {
@@ -55,11 +55,11 @@
} }
] ]
++ base-modules.nixos-modules; ++ base-modules.nixos-modules;
home-module.imports = home-modules =
[ [
{modules.desktop.hyprland.enable = true;} {modules.desktop.hyprland.enable = true;}
] ]
++ base-modules.home-module.imports; ++ base-modules.home-modules;
}; };
in { in {
nixosConfigurations = { nixosConfigurations = {

2
outputs/x86_64-linux/src/idols-ruby.nix
View File

@@ -28,7 +28,7 @@
++ [ ++ [
{modules.secrets.server.operation.enable = true;} {modules.secrets.server.operation.enable = true;}
]; ];
home-module.imports = map mylib.relativeToRoot [ home-modules = map mylib.relativeToRoot [
"home/linux/server.nix" "home/linux/server.nix"
]; ];
}; };

2
outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
View File

@@ -27,7 +27,7 @@
++ [ ++ [
{modules.secrets.server.kubernetes.enable = true;} {modules.secrets.server.kubernetes.enable = true;}
]; ];
home-module.imports = map mylib.relativeToRoot [ home-modules = map mylib.relativeToRoot [
"home/linux/server.nix" "home/linux/server.nix"
]; ];
}; };