whole bunch of stuff

util/create.nix

@@ -0,0 +1,40 @@
+{
+  nixpkgs,
+  home-manager,
+  system,
+  inputs,
+  outputs,
+  sharedModules,
+  ...
+}: {
+  systems = definitions:
+    nixpkgs.lib.mapAttrs (name: info:
+      nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = {
+          inherit inputs outputs;
+          mainUser = info.user;
+        };
+        modules =
+          [
+            ../system/${name}.nix
+            home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                useGlobalPkgs = true;
+                extraSpecialArgs = {
+                  inherit inputs outputs;
+                  mainUser = info.user;
+                };
+                users.${info.user}.imports =
+                  [
+                    ../home/${info.user}.nix
+                  ]
+                  ++ info.hmImports or [];
+              };
+            }
+          ]
+          ++ info.imports or []
+          ++ sharedModules;
+      }) definitions;
+}

util/overlay.nix

@@ -1,5 +1,8 @@
-{inputs, ...}: {
-  additions = final: _prev: import ../.old/pkgs {pkgs = final;};
+{
+  inputs,
+  lib,
+  ...
+}: {
   rice = import ./rice.nix;
   murex-jump = inputs.murex-jump.overlays.murex-jump;
   murex-starship = inputs.murex-starship.overlays.murex-starship;
@@ -12,10 +15,35 @@
       vendorHash = "sha256-NIhg8D8snCNxpb3i2JG5tLcZteYBCGN4QbOowG/vgJE=";
     };
   };
-  sirula = final: prev: {
-    sirula = prev.sirula.overrideAttrs {
-      version = "1.0.0-${builtins.toString inputs.sirula.lastModifiedDate}";
-      src = inputs.sirula;
-    };
-  };
+  # sirula = let
+  #   src = inputs.sirula;
+  # in
+  #   final: prev: {
+  #     sirula =
+  #       (prev.sirula.override (old: {
+  #         rustPlatform =
+  #           old.rustPlatform
+  #           // {
+  #             buildRustPackage = args:
+  #               old.rustPlatform.buildRustPackage (args
+  #                 // {
+  #                   inherit src;
+  #                   cargoHash = prev.lib.fakeHash;
+  #                   cargoSha256 = prev.lib.fakeHash;
+  #                   cargoLock = {
+  #                     lockFile = "${inputs.sirula}" + /Cargo.lock;
+  #                   };
+  #                 });
+  #           };
+  #       }))
+  #       .overrideAttrs (oldAttrs: {
+  #         version = "1.0.0-${builtins.toString inputs.sirula.lastModifiedDate}";
+  #         inherit src;
+  #         cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
+  #           inherit src;
+  #           outputHash = prev.lib.fakeHash;
+  #           outputHashMode = "recursive";
+  #         });
+  #       });
+  #   };
 }

util/rice.nix

@@ -102,6 +102,14 @@ in {
       };
     };
 
+    cursor = {
+      package = prev.afterglow-cursors-recolored.override {
+        themeVariants = ["Dracula"];
+        draculaColorVariants = ["Orange"];
+      };
+      name = "Afterglow-Recolored-Dracula-Orange";
+    };
+
     plymouth = {
       # no easy way to automate filename sadly - could try stripping "real" font name of spaces?
       font = "${fonts.sans.package}/share/fonts/truetype/InriaSans-Regular.ttf";