big cleanup

common/cli.nix

@@ -16,7 +16,6 @@
       fd
       ouch
       ;
-    inherit (localPkgs) hush;
   };
   user.packages = getPkgs {
     inherit (pkgs)

common/editor.nix

@@ -1,12 +1,12 @@
 {
   inputs,
-  pkgs,
   scope,
+  getFlakePkg,
   ...
 }:
 scope "user.programs.helix" {
   enable = true;
-  package = inputs.helix.packages.${pkgs.system}.helix;
+  # package = getFlakePkg inputs.helix;
   settings = {
     theme = "nix-rice";
     editor = {

common/nix/settings.nix

@@ -2,23 +2,23 @@
   pkgs,
   inputs,
   getFlakePkg',
-  mainUser,
   ...
 }:
 {
   nix = {
-    package = pkgs.lixPackageSets.git.lix;
+    package = pkgs.nixVersions.latest;
     settings = {
       experimental-features = [
         "nix-command"
         "flakes"
-        "pipe-operator"
+        "pipe-operators"
       ];
       substitute = true;
     };
     extraOptions = ''
       keep-outputs = true
       keep-derivations = true
+      allow-import-from-derivation = false
     '';
     optimise.automatic = true;
   };

common/nix/substituters.nix

@@ -4,21 +4,15 @@
 }:
 scope "nix.settings" {
   substituters = [
-    "https://cache.nixos.org"
     "https://nix-community.cachix.org"
-    "https://helix.cachix.org"
-    "https://walker-git.cachix.org"
     "https://anmonteiro.nix-cache.workers.dev"
     "https://cache.atagen.co"
-    "https://cache.privatevoid.net"
+    # "https://cache.privatevoid.net"
   ];
   trusted-public-keys = [
-    "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
     "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
-    "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
     "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="
     "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw="
-    "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg="
+    # "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg="
   ];
 }