Start refactoring pc and desktop configurations
All checks were successful
/ check (push) Successful in 1m45s
All checks were successful
/ check (push) Successful in 1m45s
This commit is contained in:
parent
a2e3cc96fb
commit
3bcf37f394
6 changed files with 5 additions and 15 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
{
|
||||
flake.modules.nixos = {
|
||||
workstation = {
|
||||
pc = {
|
||||
imports = [ inputs.home-manager.nixosModules.home-manager ];
|
||||
|
||||
home-manager = {
|
||||
|
@ -31,7 +31,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
pc.home-manager.users.${config.flake.meta.owner.username}.imports = [
|
||||
desktop.home-manager.users.${config.flake.meta.owner.username}.imports = [
|
||||
config.flake.modules.homeManager.gui
|
||||
];
|
||||
};
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
{
|
||||
flake.modules.nixos."nixosConfigurations/PW05CH3L".imports = with config.flake.modules.nixos; [
|
||||
workstation
|
||||
pc
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
{ config, ... }:
|
||||
|
||||
{
|
||||
flake.modules.nixos.pc.imports = with config.flake.modules.nixos; [
|
||||
workstation
|
||||
];
|
||||
}
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
flake.modules.nixos.workstation.services.tailscale.enable = true;
|
||||
flake.modules.nixos.pc.services.tailscale.enable = true;
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
predicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfreePackages;
|
||||
in
|
||||
{
|
||||
nixos.workstation.nixpkgs.config.allowUnfreePredicate = predicate;
|
||||
nixos.pc.nixpkgs.config.allowUnfreePredicate = predicate;
|
||||
|
||||
homeManager.base = args: {
|
||||
nixpkgs.config = lib.mkIf (!(args.hasGlobalPkgs or false)) {
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
flake.modules.nixos.workstation = {};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue