treewide: config/nixos/nix -> modules/nix/core/nix.nix

config/nixos/default.nix

@@ -1,6 +1,5 @@
 {
   imports = [
-    ./nix
     ./programs
     ./services
   ];

config/nixos/nix/default.nix

@@ -1,17 +0,0 @@
-{pkgs, ...}: {
-  imports = [./nixpkgs.nix ./nh.nix];
-  environment.systemPackages = [pkgs.git];
-  nix = {
-    package = pkgs.lix;
-    settings = {
-      accept-flake-config = true;
-      warn-dirty = false;
-      auto-optimise-store = true;
-      trusted-users = ["root" "@wheel"];
-      experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
-    };
-  };
-}

config/nixos/nix/nh.nix

@@ -1,9 +0,0 @@
-{
-  programs.nh = {
-    enable = true;
-    clean = {
-      enable = true;
-      extraArgs = "--keep-since 30d --keep 3";
-    };
-  };
-}

config/nixos/nix/nixpkgs.nix

@@ -1,13 +0,0 @@
-{
-  nixpkgs = {
-    config = {
-      allowUnfree = true;
-      permittedInsecurePackages = [
-        "cinny-4.2.3"
-        "cinny-unwrapped-4.2.3"
-        "segger-jlink-qt4-810"
-      ];
-      segger-jlink.acceptLicense = true;
-    };
-  };
-}

modules/nix/core/default.nix

@@ -6,6 +6,7 @@
     ./home-manager.nix
     ./locales.nix
     ./networking.nix
+    ./nix.nix
     ./users.nix
     ./security.nix
   ];

modules/nix/core/nix.nix

@@ -0,0 +1,35 @@
+{pkgs, ...}: {
+  nix = {
+    package = pkgs.lix;
+    settings = {
+      accept-flake-config = true;
+      warn-dirty = false;
+      auto-optimise-store = true;
+      trusted-users = ["root" "@wheel"];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+    };
+  };
+
+  programs.nh = {
+    enable = true;
+    clean = {
+      enable = true;
+      extraArgs = "--keep-since 30d --keep 3";
+    };
+  };
+
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+      permittedInsecurePackages = [
+        "cinny-4.2.3"
+        "cinny-unwrapped-4.2.3"
+        "segger-jlink-qt4-810"
+      ];
+      segger-jlink.acceptLicense = true;
+    };
+  };
+}