refactor: combine nix-settings and nixpkgs modules into one nix module

2025-10-22 17:26:30 +11:00 · 2025-10-22 17:26:30 +11:00 · 8f4defe84b
commit 8f4defe84b
parent a896a4a87f
3 changed files with 8 additions and 5 deletions
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@ -13,8 +13,7 @@
    "localisation"
    "network"
    "nh"
-    "nix-settings"
-    "nixpkgs"
+    "nix"
    "nixvim"
    "syncthing"
    "systemd-boot"
--- a/modules/nixos/features/nix-settings.nix
+++ b/modules/nixos/features/nix-settings.nix
@ -1,4 +1,11 @@
 {
+  lib,
+  ...
+}:
+{
+  # allow packages with non-free licenses
+  nixpkgs.config.allowUnfree = true;
+
  nix = {
    gc = {
      automatic = true;
--- a/modules/nixos/features/nixpkgs.nix
+++ b/modules/nixos/features/nixpkgs.nix
@ -1,3 +0,0 @@
-{
-  nixpkgs.config.allowUnfree = true;
-}