change many thing

common/nix/gc.nix

@@ -1,7 +1,5 @@
 {
   inputs,
-  getFlakePkg,
-  getFlakePkg',
   ...
 }:
 {
@@ -18,10 +16,7 @@
 
   services.angrr = {
     enable = true;
-    enableNixGcIntegration = true;
-    period = "2weeks";
-    package = getFlakePkg inputs.angrr;
+    period = "7d";
   };
-  programs.direnv.angrr.package = getFlakePkg' inputs.angrr "angrr-direnv";
 
 }

common/nix/settings.nix

@@ -6,7 +6,6 @@
 }:
 {
   nix = {
-    package = pkgs.nixVersions.latest;
     settings = {
       experimental-features = [
         "nix-command"

common/nix/substituters.nix

@@ -6,13 +6,19 @@ scope "nix.settings" {
   substituters = [
     "https://nix-community.cachix.org"
     "https://anmonteiro.nix-cache.workers.dev"
-    "https://cache.atagen.co"
+    "https://cache.lobotomise.me"
+    # "https://cache.atagen.co"
     # "https://cache.privatevoid.net"
+    "https://cache.flox.dev"
+    "https://cache.amaanq.com"
   ];
   trusted-public-keys = [
     "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     "ocaml.nix-cache.com-1:/xI2h2+56rwFfKyyFVbkJSeGqSIYMC/Je+7XXqGKDIY="
-    "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw="
+    "cache.lobotomise.me:oF5s/f/RDfVuMH7hl0q/Cby4V/KbPCrZJn8SjKOf/bk="
+    # "cache.atagen.co:SOUkNQxuu/eQ7FcI8nlUe7FpV27e7YjQlDQdn8HTUnw="
     # "cache.privatevoid.net:SErQ8bvNWANeAvtsOESUwVYr2VJynfuc9JRwlzTTkVg="
+    "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
+    "cache.amaanq.com:3qm0ZOxlHr7UQqj0G3MKlAn1votV9/3KjHGU2GQ9rEM="
   ];
 }

common/nix/tools.nix

@@ -2,15 +2,18 @@
   pkgs,
   inputs,
   getPkgs,
+  getFlakePkg,
   ...
 }:
 {
-  environment.systemPackages = getPkgs {
-    inherit (pkgs)
-      nixfmt-rfc-style
-      nil
-      ;
-  };
+  environment.systemPackages =
+    getPkgs {
+      inherit (pkgs)
+        nixfmt
+        nil
+        ;
+    }
+    ++ [ (getFlakePkg inputs.yoke) ];
   imports = [
     inputs.nix-index-database.nixosModules.nix-index
   ];