style: switch to nixfmt-rfc-style

.gitignore

@@ -1,3 +1,6 @@
 .DS_Store
 
 result*
+
+.vscode/
+.idea/

flake.nix

@@ -84,13 +84,15 @@
     };
   };
 
-  outputs = {
+  outputs =
+    {
       self,
       nix-darwin,
       home-manager,
       darwin-custom-icons,
       ...
-  } @ inputs: {
+    }@inputs:
+    {
       darwinConfigurations.Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem {
         modules = [
           home-manager.darwinModules.home-manager

home/apps/ghostty.nix

@@ -1,3 +1,4 @@
-{config, ...}: {
+{ config, ... }:
+{
   home.file."${config.xdg.configHome}/ghostty/config".source = ./ghostty.conf;
 }

home/apps/vscode.nix

@@ -3,7 +3,8 @@
   lib,
   self,
   ...
-}: let
+}:
+let
   extensions = [
     # "antfu.icons-carbon"
     "antfu.unocss"
@@ -52,7 +53,8 @@
     # "xaver.clang-format"
     "yoavbls.pretty-ts-errors"
   ];
-in {
+in
+{
   programs.vscode = {
     enable = true;
     package = pkgs.stdenvNoCC.mkDerivation {
@@ -222,18 +224,14 @@ in {
         currentExtensions["$extension"]=1;
       done
 
-      ${builtins.concatStringsSep
+      ${builtins.concatStringsSep "\n" (
-        "\n"
+        builtins.map (ext: ''
-        (
-          builtins.map
-          (ext: ''
           if [[ -z "''${currentExtensions[${ext}]+unset}" ]]; then
             echo "installing ${ext}"
             $DRY_RUN_CMD "$code_bin" --install-extension ${ext} &> /dev/null
           fi
           unset 'currentExtensions[${ext}]'
-          '')
+        '') extensions
-          extensions
       )}
 
       for ext in "''${!currentExtensions[@]}"; do

home/default.nix

@@ -1,8 +1,5 @@
+{ config, inputs, ... }:
 {
-  config,
-  inputs,
-  ...
-}: {
   programs.home-manager.enable = true;
 
   imports = [

home/fonts.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [
     inter
     public-sans
@@ -16,8 +17,6 @@
       '';
     })
 
-    (nerdfonts.override {
+    (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
-      fonts = ["NerdFontsSymbolsOnly"];
-    })
   ];
 }

home/programs/fish.nix

@@ -1,8 +1,14 @@
-{lib, ...}: let
+{ lib, ... }:
+let
   aliases = import ./aliases.nix;
-  shellAbbrs = builtins.mapAttrs (_: a: a.command) (lib.filterAttrs (_: b: !(b.fishAlias or false)) aliases);
+  shellAbbrs = builtins.mapAttrs (_: a: a.command) (
-  shellAliases = builtins.mapAttrs (_: a: a.command) (lib.filterAttrs (_: b: builtins.hasAttr "fishAlias" b && b.fishAlias) aliases);
+    lib.filterAttrs (_: b: !(b.fishAlias or false)) aliases
-in {
+  );
+  shellAliases = builtins.mapAttrs (_: a: a.command) (
+    lib.filterAttrs (_: b: builtins.hasAttr "fishAlias" b && b.fishAlias) aliases
+  );
+in
+{
   programs.fish = {
     enable = true;
     catppuccin.enable = true;

home/programs/glamour.nix

@@ -1,3 +1 @@
-_: {
+_: { programs.glamour.catppuccin.enable = true; }
-  programs.glamour.catppuccin.enable = true;
-}

home/programs/rust.nix

@@ -3,18 +3,21 @@
   lib,
   config,
   ...
-}: let
+}:
+let
   toml = pkgs.formats.toml { };
-in {
+in
+{
   home.file."${config.xdg.dataHome}/cargo/config.toml".source = toml.generate "config.toml" {
     linker = "${lib.getExe pkgs.clang}";
-    rustflags = ["-C" "link-arg=-fuse-ld=${lib.getExe pkgs.mold}"];
+    rustflags = [
+      "-C"
+      "link-arg=-fuse-ld=${lib.getExe pkgs.mold}"
+    ];
   };
 
   home.packages = with pkgs; [
-    (rust-bin.stable.latest.default.override {
+    (rust-bin.stable.latest.default.override { extensions = [ "llvm-tools-preview" ]; })
-      extensions = ["llvm-tools-preview"];
-    })
 
     cargo-bloat
     cargo-cache

home/programs/zsh.nix

@@ -1,10 +1,8 @@
-{
+{ config, inputs, ... }:
-  config,
+let
-  inputs,
-  ...
-}: let
   shellAliases = builtins.mapAttrs (_: alias: alias.command) (import ./aliases.nix);
-in {
+in
+{
   programs.zsh = {
     enable = true;
     dotDir = ".config/zsh";

home/variables.nix

@@ -1,4 +1,5 @@
-{config, ...}: {
+{ config, ... }:
+{
   home.sessionVariables = {
     NEXT_TELEMETRY_DISABLED = "1";
     NUXT_TELEMETRY_DISABLED = "1";

modules/homebrew.nix

@@ -20,22 +20,22 @@ _: {
       "ttfautohint"
     ];
 
-    casks = let
+    casks =
+      let
         noQuarantine = name: {
           inherit name;
           args = {
             no_quarantine = true;
           };
         };
-    in [
+      in
+      [
         "blackhole-16ch"
         (noQuarantine "eloston-chromium")
         "sf-symbols"
         "1password/tap/1password-cli"
       ];
 
-    taps = [
+    taps = [ "1password/tap" ];
-      "1password/tap"
-    ];
   };
 }

modules/nix.nix

@@ -4,7 +4,8 @@
   inputs,
   config,
   ...
-}: {
+}:
+{
   services.nix-daemon.enable = true;
   nix.package = pkgs.nixVersions.latest;
 
@@ -12,27 +13,24 @@
     n.flake = inputs.nixpkgs;
   };
 
-  nix.nixPath = [
+  nix.nixPath = [ "nixpkgs=${inputs.nixpkgs.outPath}" ];
-    "nixpkgs=${inputs.nixpkgs.outPath}"
-  ];
 
   nix.settings = {
     experimental-features = "nix-command flakes";
     auto-optimise-store = true;
-    extra-platforms = ["x86_64-darwin" "aarch64-darwin"];
+    extra-platforms = [
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
 
     build-users-group = "nixbld";
     trusted-users = [ "ryanccn" ];
     sandbox = true;
     use-xdg-base-directories = true;
 
-    extra-substituters = [
+    extra-substituters = [ "https://cache.lix.systems" ];
-      "https://cache.lix.systems"
-    ];
 
-    extra-trusted-public-keys = [
+    extra-trusted-public-keys = [ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
-      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
-    ];
 
     nix-path = config.nix.nixPath;
   };

modules/packages.nix

@@ -1,13 +1,11 @@
+{ pkgs, inputs, ... }:
 {
-  pkgs,
-  inputs,
-  ...
-}: {
   environment.systemPackages = with pkgs; [
     inputs.home-manager.packages.${pkgs.system}.home-manager
 
     alejandra
     nixpkgs-fmt
+    nixfmt-rfc-style
     statix
     deadnix
 

overlays/ryan-mono-bin.nix

@@ -1,11 +1,11 @@
-_: prev: let
+_: prev:
+let
   version = "2024.05.26";
 
-  mkFontVariant = {
+  mkFontVariant =
-    variant,
+    { variant, hash }:
-    hash,
+    prev.callPackage (
-  }:
+      {
-    prev.callPackage ({
         lib,
         fetchzip,
         stdenvNoCC,
@@ -30,8 +30,10 @@ _: prev: let
           platforms = platforms.all;
           license = licenses.ofl;
         };
-      }) {};
+      }
-in {
+    ) { };
+in
+{
   ryan-mono-bin = prev.symlinkJoin {
     name = "ryan-mono-bin-${version}";
 

system.nix

@@ -3,7 +3,8 @@
   inputs,
   self,
   ...
-}: {
+}:
+{
   imports = [
     ./modules/nix.nix
     ./modules/packages.nix