From f4c10a0a0bf3676c564cd436c8283ac8d64d0335 Mon Sep 17 00:00:00 2001
From: wi11-holdsworth <83637728+wi11-holdsworth@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:26:30 +1100
Subject: [PATCH] refactor: combine nix-settings and nixpkgs modules into one
 nix module

---
 modules/nixos/default.nix                            | 3 +--
 modules/nixos/features/{nix-settings.nix => nix.nix} | 7 +++++++
 modules/nixos/features/nixpkgs.nix                   | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename modules/nixos/features/{nix-settings.nix => nix.nix} (80%)
 delete mode 100644 modules/nixos/features/nixpkgs.nix

diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 804f01d..e980470 100644
--- 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"
diff --git a/modules/nixos/features/nix-settings.nix b/modules/nixos/features/nix.nix
similarity index 80%
rename from modules/nixos/features/nix-settings.nix
rename to modules/nixos/features/nix.nix
index eda2992..498861b 100644
--- a/modules/nixos/features/nix-settings.nix
+++ b/modules/nixos/features/nix.nix
@@ -1,4 +1,11 @@
 {
+  lib,
+  ...
+}:
+{
+  # allow packages with non-free licenses
+  nixpkgs.config.allowUnfree = true;
+
   nix = {
     gc = {
       automatic = true;
diff --git a/modules/nixos/features/nixpkgs.nix b/modules/nixos/features/nixpkgs.nix
deleted file mode 100644
index e95ec3c..0000000
--- a/modules/nixos/features/nixpkgs.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  nixpkgs.config.allowUnfree = true;
-}