flake.nix

@@ -30,7 +30,7 @@
       ];
 
       outputs-builder = channels: {
-        formatter = channels.nixpkgs.alejandra;
+        formatter = channels.nixpkgs.nixfmt-rfc-style;
       };
 
       alias = {

homes/x86_64-linux/marley@nyx/default.nix

@@ -16,7 +16,7 @@ in
 
   # FIXME: Remove this once nvim is set up
   home.packages = with pkgs; [
-    alejandra
+    nixfmt-rfc-style
     nil
     statix
     manix

modules/home/base/nix/default.nix

@@ -4,34 +4,16 @@
     nix = {
       package = pkgs.lix;
 
-      settings = {
+      # Enable flakes.
-        trusted-users = [
+      settings.experimental-features = [
-          "root"
+        "nix-command"
-          config.marleyos.my.name
+        "flakes"
-        ];
+      ];
 
-        # Enable flakes.
+      # Disable that annoying "git tree is dirty" warning.
-        experimental-features = [
+      extraOptions = ''
-          "nix-command"
+        warn-dirty = false
-          "flakes"
+      '';
-        ];
-
-        # Set up caches.
-        extra-substituters = [
-          "https://marleyos.cachix.org"
-          "https://nix-community.cachix.org"
-        ];
-
-        trusted-public-keys = [
-          "marleyos.cachix.org-1:q2kEtqvS5CoQ8BmKlWOfOnN+fi4gUoSuL6HRKy37eCA="
-          "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        ];
-
-        # Disable that annoying "git tree is dirty" warning.
-        warn-dirty = false;
-
-        auto-optimise-store = true;
-      };
 
       # Garbage collection.
       gc.automatic = true;