/some/ things should work now

system/core/compat.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  self,
+  super,
+  root,
+}: {pkgs, ...}: let
   list-of-libraries = with pkgs; [
     alsa-lib
     at-spi2-atk

system/core/default.nix

@@ -1,10 +1,14 @@
-{lib, ...}: {
+{
+  self,
+  super,
+  root,
+}: {
   imports = [
-    ./security.nix
-    ./users.nix
-    ./ssh.nix
-    ./locale.nix
-    ../nix
-    ../programs/zsh.nix
+    super.security
+    super.users
+    super.ssh
+    super.locale
+    root.nix.default
+    root.programs.zsh
   ];
 }

system/core/docs.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  self,
+  super,
+  root,
+}: {pkgs, ...}: {
   documentation = {
     dev.enable = true;
     # man.generateCaches = true; # this does slow down builds by quite a lot

system/core/locale.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+{...}: {lib, ...}: {
   i18n = {
     defaultLocale = "en_US.UTF-8";
     supportedLocales = [

system/core/tools.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     htop
     btop

system/core/users.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {pkgs, ...}: {
   users.users.xun = {
     isNormalUser = true;
     initialPassword = "nixos";