/some/ things should work now

flake.lock

@@ -304,6 +304,26 @@
         "type": "github"
       }
     },
+    "haumea": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1708375098,
+        "narHash": "sha256-DaFJp3wDHgOqx98U0SF57bXaH2Orp106c+jSdPCVu1E=",
+        "owner": "nix-community",
+        "repo": "haumea",
+        "rev": "ec6350fd9353e7f27ce0e85d31f82e3ed73e4d70",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "haumea",
+        "type": "github"
+      }
+    },
     "hercules-ci-effects": {
       "inputs": {
         "flake-parts": "flake-parts_3",
@@ -549,6 +569,7 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "hardware": "hardware",
+        "haumea": "haumea",
         "home-manager": "home-manager",
         "microvm": "microvm",
         "nix-index-database": "nix-index-database",

flake.nix

@@ -58,6 +58,10 @@
       url = "github:Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    haumea = {
+      url = "github:nix-community/haumea";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     ## deduplication
     flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";

hosts/default.nix

@@ -4,6 +4,7 @@
   homeImports,
   lib,
   pkgs,
+  config,
   ...
 }: let
   specialArgs = {
@@ -13,7 +14,10 @@
   rootPaths = prependAll "${self}/";
   modulePaths = prependAll "${self}/system/";
 
-  inherit (import "${self}/system") desktop;
+  profiles = inputs.haumea.lib.load {
+    inputs = {inherit inputs lib;};
+    src = "${self}/profiles";
+  };
 in {
   flake.colmena = {
     meta = {
@@ -40,21 +44,21 @@ in {
       };
       imports = lib.flatten [
         ./kidney
-        (modulePaths [
+        (with profiles; [
-          "core/tools.nix"
+          core.tools
-          "core/users.nix"
+          core.users
-          "core/locale.nix"
+          core.locale
 
-          "programs/tools.nix"
+          programs.tools
-          "programs/zsh.nix"
+          programs.zsh
-          "programs/home-manager.nix"
+          programs.home-manager
-          "hardware/graphics.nix"
+          hardware.graphics
 
-          "services/flatpak.nix"
+          services.flatpak
-          "services/xdg-portals.nix"
+          services.xdg-portals
 
-          "nix"
+          nix.default
-          "nix/gc.nix"
+          nix.gc
         ])
         {
           home-manager = {
@@ -70,37 +74,67 @@ in {
         targetUser = "xun";
         targetHost = "nixdesk.local";
       };
-      imports =
+      imports = lib.flatten [
-        desktop
+        ./nixdesk
-        ++ lib.flatten [
-          ./nixdesk
 
-          (rootPaths [
+        (rootPaths [
-            "secrets"
+          "secrets"
-            "secrets/nixdesk"
+          "secrets/nixdesk"
-          ])
+        ])
 
-          (modulePaths [
+        (with profiles; [
-            "services/syncthing.nix"
+          core.default
-            "services/virt/waydroid.nix"
+          core.tools
-            #"services/virt/virt-manager.nix"
+          core.compat
-            #"network/wifi.nix"
+          core.boot
-            #"services/ollama.nix"
+          core.docs
-            "desktop/x11/nosleep.nix"
+          core.gvfs
 
-            # "programs/gamemode.nix" # TEMP: TODO
+          nix.gc
-            # "programs/gamescope.nix" # TEMP: TODO
-            # "programs/steam.nix" # TEMP: TODO
-            "programs/RE"
-          ])
 
-          {
+          hardware.graphics
-            home-manager = {
+          hardware.steam-hardware
-              users.xun.imports = homeImports."xun@nixdesk";
+          hardware.bluetooth
-              extraSpecialArgs = specialArgs;
+          hardware.qmk
-            };
+
-          }
+          network.networkd
-        ];
+          network.avahi
+          network.localsend
+          network.tailscale
+          network.goldberg
+
+          desktop.default
+          desktop.awesome
+          desktop.sway
+          #..desktop.hyprland
+
+          programs.default
+          programs.tools
+
+          services.default
+          services.pipewire
+          services.flatpak
+
+          services.syncthing
+          services.virt.waydroid
+          #services.virt.virt-manager
+          #network.wifi
+          #services.ollama
+          desktop.x11.nosleep
+
+          # programs.gamemode # TEMP: TODO
+          # programs.gamescope # TEMP: TODO
+          # programs.steam # TEMP: TODO
+          programs.RE.default
+        ])
+
+        {
+          home-manager = {
+            users.xun.imports = homeImports."xun@nixdesk";
+            extraSpecialArgs = specialArgs;
+          };
+        }
+      ];
     };
     hopper = {
       deployment = {

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
+    super.security
-    ./users.nix
+    super.users
-    ./ssh.nix
+    super.ssh
-    ./locale.nix
+    super.locale
-    ../nix
+    root.nix.default
-    ../programs/zsh.nix
+    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
+    super.nixpkgs
-    ./substituters.nix
+    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 = [
+  self,
-    ./fonts.nix
+  super,
-    ./home-manager.nix
+  root,
-    ./qt.nix
+}: {
-    ./adb.nix
+  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 = {
+      inherit 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;
-        };
-      };
       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; [