/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";

system/default.nix

@@ -1,37 +0,0 @@
-let
-  desktop = [
-    ./core
-    ./core/tools.nix
-    ./core/compat.nix
-    ./core/boot.nix
-    ./core/docs.nix
-    ./core/gvfs.nix
-
-    ./nix/gc.nix
-
-    ./hardware/graphics.nix
-    ./hardware/steam-hardware.nix
-    ./hardware/bluetooth.nix
-    ./hardware/qmk.nix
-
-    ./network/networkd.nix
-    ./network/avahi.nix
-    ./network/localsend.nix
-    ./network/tailscale.nix
-    ./network/goldberg.nix
-
-    ./desktop
-    ./desktop/awesome.nix
-    ./desktop/sway.nix
-    #./desktop/hyprland.nix
-
-    ./programs
-    ./programs/tools.nix
-
-    ./services
-    ./services/pipewire.nix
-    ./services/flatpak.nix
-  ];
-in {
-  inherit desktop;
-}

system/network/localsend.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  self,
+  super,
+  root,
+}: {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     localsend
   ];

system/nix/default.nix

@@ -1,4 +1,8 @@
 {
+  self,
+  super,
+  root,
+}: {
   config,
   pkgs,
   inputs,
@@ -6,8 +10,8 @@
   ...
 }: {
   imports = [
-    ./nixpkgs.nix
-    ./substituters.nix
+    super.nixpkgs
+    super.substituters
   ];
 
   # git is needed for flakes

system/nix/nixpkgs.nix

@@ -1,4 +1,8 @@
 {
+  self,
+  super,
+  root,
+}: {
   nixpkgs = {
     config.allowUnfree = true;
     config.permittedInsecurePackages = [];

system/nix/substituters.nix

@@ -1,4 +1,8 @@
 {
+  self,
+  super,
+  root,
+}: {
   nix.settings = {
     substituters = [
       # high priority since it's almost always used

system/programs/RE/default.nix

@@ -1,5 +1,9 @@
 # patchelf --replace-needed libbinaryninjacore.so.1 ${symlinkJoin} $out/opt/binaryninja
 {
+  self,
+  super,
+  root,
+}: {
   pkgs,
   self,
   ...

system/programs/default.nix

@@ -1,9 +1,13 @@
 {
-  imports = [
-    ./fonts.nix
-    ./home-manager.nix
-    ./qt.nix
-    ./adb.nix
+  self,
+  super,
+  root,
+}: {
+  imports = with super; [
+    fonts
+    home-manager
+    qt
+    adb
   ];
 
   programs = {

system/programs/fonts.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  self,
+  super,
+  root,
+}: {pkgs, ...}: {
   fonts = {
     packages = with pkgs; [
       powerline-fonts

system/programs/home-manager.nix

@@ -1,4 +1,4 @@
-{inputs, ...}: {
+{...}: {inputs, ...}: {
   imports = [
     inputs.home-manager.nixosModules.default
   ];

system/programs/tools.nix

@@ -1,4 +1,4 @@
-{
+{...}: {
   pkgs,
   config,
   ...

system/services/syncthing.nix

@@ -1,4 +1,27 @@
-{config, ...}: {
+{
+  self,
+  super,
+  root,
+}: {config, ...}: let
+  devices = {
+    "nixdesk" = {
+      id = "XXABQZC-CO6OM2E-EMB3QIJ-NF5I3WU-CCQPPRY-7BX4ZSS-WIU4WW2-WXFWVQR";
+      autoAcceptFolders = true;
+    };
+    "redmi-note-10-pro" = {
+      id = "WJPE56U-56LPOYB-IAENGSW-IFQ4A6J-66JX73I-ONXX4PY-QXJK6IF-UZHVWA7";
+      autoAcceptFolders = true;
+    };
+    "hopper" = {
+      id = "DK3RPET-ACMULD2-TLQS6YM-XWUMS3N-JRNDNME-YTM3H4X-P7QVUKB-N3PL5QF";
+      autoAcceptFolders = true;
+    };
+    "school-probook" = {
+      id = "ZYNRRWE-SIJLPMQ-5LJDWCY-BF5VMRM-FQRFEW4-L7PKA23-HVJADTV-FZYRSQM";
+      autoAcceptFolders = true;
+    };
+  };
+in {
   services.syncthing = {
     enable = true;
     openDefaultPorts = true;
@@ -9,27 +32,10 @@
 
     overrideDevices = true;
     settings = {
-      devices = {
-        "nixdesk" = {
-          id = "XXABQZC-CO6OM2E-EMB3QIJ-NF5I3WU-CCQPPRY-7BX4ZSS-WIU4WW2-WXFWVQR";
-          autoAcceptFolders = true;
-        };
-        "redmi-note-10-pro" = {
-          id = "WJPE56U-56LPOYB-IAENGSW-IFQ4A6J-66JX73I-ONXX4PY-QXJK6IF-UZHVWA7";
-          autoAcceptFolders = true;
-        };
-        "hopper" = {
-          id = "DK3RPET-ACMULD2-TLQS6YM-XWUMS3N-JRNDNME-YTM3H4X-P7QVUKB-N3PL5QF";
-          autoAcceptFolders = true;
-        };
-        "school-probook" = {
-          id = "ZYNRRWE-SIJLPMQ-5LJDWCY-BF5VMRM-FQRFEW4-L7PKA23-HVJADTV-FZYRSQM";
-          autoAcceptFolders = true;
-        };
-      };
+      inherit devices;
       folders = {
         "~/secrets" = {
-          devices = builtins.attrNames config.services.syncthing.settings.devices;
+          devices = builtins.attrNames devices;
           versioning = {
             type = "trashcan";
             params.cleanoutDays = "180";
@@ -37,7 +43,7 @@
           id = "sfw9y-yusup";
         };
         "~/docs/xun-megavault" = {
-          devices = builtins.attrNames config.services.syncthing.settings.devices;
+          devices = builtins.attrNames devices;
           id = "1zkf-wf5r";
           versioning = {
             type = "simple";

system/services/xdg-portals.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {pkgs, ...}: {
   xdg.portal = {
     enable = true;
     extraPortals = with pkgs; [