Do not assign values to config.

README.md

@@ -159,7 +159,7 @@ The following instructions are for a fresh NixOS installation.
     _:
 
     {
-      config.machine = {
+      machine = {
         allowUnfree = true;
         hostName = "<hostname>";
         users = [

machines/Lilim/options.nix

@@ -2,7 +2,7 @@
   ...
 }:
 {
-  config.machine = {
+  machine = {
     allowUnfree = true;
     hostName = "Lilim";
     networkD = {

machines/Marid/options.nix

@@ -3,7 +3,7 @@
 }:
 
 {
-  config.machine = {
+  machine = {
     allowUnfree = true;
     hostName = "Marid";
     users = [

machines/Ophanim/options.nix

@@ -1,7 +1,7 @@
 _:
 
 {
-  config.machine = rec {
+  machine = rec {
     hostName = "Ophanim";
     domain = "ophanim.de";
     users = [

machines/Sheol/options.nix

@@ -3,7 +3,7 @@
   imports = [
     ../../options/copySysConf.nix
   ];
-  config.machine = {
+  machine = {
     allowUnfree = true;
     hostName = "Sheol";
     networkD = {

pkgsets/ansible.nix

@@ -4,7 +4,7 @@
 }:
 
 {
-  config.machine.pkgsets.ansible.pkgs = with pkgs; [
+  machine.pkgsets.ansible.pkgs = with pkgs; [
     ansible
     ansible-builder
     ansible-language-server

pkgsets/base.nix

@@ -1,11 +1,11 @@
 # Programms I'm likely to want on every machine and/or may execute as root
 {
-  config,
   pkgs,
   ...
 }:
+
 {
-  config.machine.pkgsets.base.pkgs = with pkgs; [
+  machine.pkgsets.base.pkgs = with pkgs; [
     age
     sops
     bat

pkgsets/cpp.nix

@@ -3,7 +3,7 @@
   ...
 }:
 {
-  config.machine.pkgsets.cpp.pkgs = with pkgs; [
+  machine.pkgsets.cpp.pkgs = with pkgs; [
     bear
     clang
     cmake

pkgsets/dict.nix

@@ -4,7 +4,7 @@
   ...
 }:
 {
-  config.machine.pkgsets.dict.pkgs = with pkgs; [
+  machine.pkgsets.dict.pkgs = with pkgs; [
     translate-shell
     (hunspellWithDicts (
       with pkgs.hunspellDicts;

pkgsets/extra.nix

@@ -4,7 +4,7 @@
   ...
 }:
 {
-  config.machine.pkgsets.extra.pkgs = with pkgs; [
+  machine.pkgsets.extra.pkgs = with pkgs; [
     alsa-utils
     binutils-unwrapped
     git-lfs

pkgsets/haskell-tools.nix

@@ -4,7 +4,7 @@
   ...
 }:
 {
-  config.machine.pkgsets.haskell-tools.pkgs = with pkgs; [
+  machine.pkgsets.haskell-tools.pkgs = with pkgs; [
     cabal-install
     hlint
   ]; # ghcid

pkgsets/latex.nix

@@ -6,7 +6,7 @@
 }:
 with lib;
 {
-  config.machine.pkgsets.latex.pkgs = with pkgs; [
+  machine.pkgsets.latex.pkgs = with pkgs; [
     texlive.combined.scheme-full
     texlab
   ];

pkgsets/mail_utils.nix

@@ -3,7 +3,7 @@
   ...
 }:
 {
-  config.machine.pkgsets.mail_utils.pkgs = with pkgs; [
+  machine.pkgsets.mail_utils.pkgs = with pkgs; [
     aerc
     abook
     pizauth

pkgsets/nodejs.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }:
 {
-  config.machine.pkgsets.nodejs.pkgs =
+  machine.pkgsets.nodejs.pkgs =
     (with pkgs; [
       nodejs
       yarn

pkgsets/php.nix

@@ -6,10 +6,12 @@
   ...
 }:
 {
-  config.machine.pkgsets.php.pkgwrap = fn.pkgFilter config.machine.pkgsets.php.pkgs;
-  config.machine.pkgsets.php.pkgs =
-    (with pkgs.php82Packages; [
-      composer
-    ])
-    ++ (with pkgs; [ php82 ]);
+  machine.pkgsets.php = {
+    pkgwrap = fn.pkgFilter config.machine.pkgsets.php.pkgs;
+    pkgs =
+      (with pkgs.php82Packages; [
+        composer
+      ])
+      ++ (with pkgs; [ php82 ]);
+  };
 }

pkgsets/python3.nix

@@ -1,16 +1,15 @@
 {
   config,
   lib,
-  fn,
   pkgs,
   ...
 }:
 with lib;
 {
-  config.machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages (
+  machine.pkgsets.python3.pkgwrap = pkgs.python3.withPackages (
     ps: (fn.pkgFilter config.machine.pkgsets.python3.pkgs)
   );
-  config.machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
+  machine.pkgsets.python3.pkgs = with pkgs.python3Packages; [
     bpython
     flake8
     genanki

pkgsets/server.nix

@@ -4,7 +4,7 @@
   ...
 }:
 {
-  config.machine.pkgsets.server.pkgs = with pkgs; [
+  machine.pkgsets.server.pkgs = with pkgs; [
     audit
     certbot
     php

pkgsets/tracking.nix

@@ -6,7 +6,7 @@
 }:
 with lib;
 {
-  config.machine.pkgsets.tracking.pkgs = with pkgs; [
+  machine.pkgsets.tracking.pkgs = with pkgs; [
     aw-qt
     aw-server-rust
     aw-watcher-afk

pkgsets/xpkgs.nix

@@ -4,7 +4,7 @@
 }:
 
 {
-  config.machine.pkgsets.xpkgs.pkgs = with pkgs; [
+  machine.pkgsets.xpkgs.pkgs = with pkgs; [
     acpilight
     dconf
     ghostty