opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Start refactoring pc and desktop configurations
All checks were successful
/ check (push) Successful in 1m45s
Details

Browse source
This commit is contained in:
Oliver Davies 2025-07-31 18:58:14 +01:00
parent a2e3cc96fb
commit 3bcf37f394
6 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules2/home-manager/nixos.nix
View file

@ -7,7 +7,7 @@
{ {
flake.modules.nixos = { flake.modules.nixos = {
workstation = { pc = {
imports = [ inputs.home-manager.nixosModules.home-manager ]; imports = [ inputs.home-manager.nixosModules.home-manager ];
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 config.flake.modules.homeManager.gui
]; ];
}; };

2
modules2/hosts/PW05CH3L/imports.nix
View file

@ -2,6 +2,6 @@
{ {
flake.modules.nixos."nixosConfigurations/PW05CH3L".imports = with config.flake.modules.nixos; [ flake.modules.nixos."nixosConfigurations/PW05CH3L".imports = with config.flake.modules.nixos; [
workstation pc
]; ];
} }

7
modules2/pc.nix
View file

@ -1,7 +0,0 @@
{ config, ... }:
{
flake.modules.nixos.pc.imports = with config.flake.modules.nixos; [
workstation
];
}

2
modules2/tailscale.nix
View file

@ -1,3 +1,3 @@
{ {
flake.modules.nixos.workstation.services.tailscale.enable = true; flake.modules.nixos.pc.services.tailscale.enable = true;
} }

2
modules2/unfree-packages.nix
View file

@ -12,7 +12,7 @@
predicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfreePackages; predicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfreePackages;
in in
{ {
nixos.workstation.nixpkgs.config.allowUnfreePredicate = predicate; nixos.pc.nixpkgs.config.allowUnfreePredicate = predicate;
homeManager.base = args: { homeManager.base = args: {
nixpkgs.config = lib.mkIf (!(args.hasGlobalPkgs or false)) { nixpkgs.config = lib.mkIf (!(args.hasGlobalPkgs or false)) {

3
modules2/workstation.nix
View file

@ -1,3 +0,0 @@
{
flake.modules.nixos.workstation = {};
}