From 43df5bcd083b60d690459c67a70e20076c49265a Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 31 Aug 2025 21:47:12 +0100 Subject: [PATCH] Add nixos.base --- modules/home-manager/nixos.nix | 2 +- modules/owner.nix | 2 +- modules/pc.nix | 5 +++++ modules/unfree-packages.nix | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 modules/pc.nix diff --git a/modules/home-manager/nixos.nix b/modules/home-manager/nixos.nix index 98a11d55..f3a55dc4 100644 --- a/modules/home-manager/nixos.nix +++ b/modules/home-manager/nixos.nix @@ -7,7 +7,7 @@ { flake.modules.nixos = { - pc = { + base = { imports = [ inputs.home-manager.nixosModules.home-manager ]; home-manager = { diff --git a/modules/owner.nix b/modules/owner.nix index c024a7eb..5634a0c8 100644 --- a/modules/owner.nix +++ b/modules/owner.nix @@ -9,7 +9,7 @@ }; modules = { - nixos.pc = { + nixos.base = { users.users.${config.flake.meta.owner.username} = { isNormalUser = true; initialPassword = lib.mkForce ""; diff --git a/modules/pc.nix b/modules/pc.nix new file mode 100644 index 00000000..6df7746c --- /dev/null +++ b/modules/pc.nix @@ -0,0 +1,5 @@ +{ config, ... }: + +{ + flake.modules.nixos.pc.imports = with config.flake.modules.nixos; [ base ]; +} diff --git a/modules/unfree-packages.nix b/modules/unfree-packages.nix index 014f6055..40f0f8a2 100644 --- a/modules/unfree-packages.nix +++ b/modules/unfree-packages.nix @@ -12,7 +12,7 @@ predicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfreePackages; in { - nixos.pc.nixpkgs.config.allowUnfreePredicate = predicate; + nixos.base.nixpkgs.config.allowUnfreePredicate = predicate; homeManager.base = args: { nixpkgs.config = lib.mkIf (!(args.hasGlobalPkgs or false)) {