diff --git a/modules2/home-manager/nixos.nix b/modules2/home-manager/nixos.nix index 129c0a95..98a11d55 100644 --- a/modules2/home-manager/nixos.nix +++ b/modules2/home-manager/nixos.nix @@ -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 ]; }; diff --git a/modules2/hosts/PW05CH3L/imports.nix b/modules2/hosts/PW05CH3L/imports.nix index 00d11197..78425983 100644 --- a/modules2/hosts/PW05CH3L/imports.nix +++ b/modules2/hosts/PW05CH3L/imports.nix @@ -2,6 +2,6 @@ { flake.modules.nixos."nixosConfigurations/PW05CH3L".imports = with config.flake.modules.nixos; [ - workstation + pc ]; } diff --git a/modules2/pc.nix b/modules2/pc.nix deleted file mode 100644 index c68d24fb..00000000 --- a/modules2/pc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, ... }: - -{ - flake.modules.nixos.pc.imports = with config.flake.modules.nixos; [ - workstation - ]; -} diff --git a/modules2/tailscale.nix b/modules2/tailscale.nix index 25af676a..d239c83e 100644 --- a/modules2/tailscale.nix +++ b/modules2/tailscale.nix @@ -1,3 +1,3 @@ { - flake.modules.nixos.workstation.services.tailscale.enable = true; + flake.modules.nixos.pc.services.tailscale.enable = true; } diff --git a/modules2/unfree-packages.nix b/modules2/unfree-packages.nix index e634aa93..014f6055 100644 --- a/modules2/unfree-packages.nix +++ b/modules2/unfree-packages.nix @@ -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)) { diff --git a/modules2/workstation.nix b/modules2/workstation.nix deleted file mode 100644 index 0e4984a3..00000000 --- a/modules2/workstation.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - flake.modules.nixos.workstation = {}; -}