switch formatter to nixfmt

Author: mrnossiom

apps/default.nix

@@ -1,7 +1,8 @@
 { pkgs-per-system }:
 
-{ lib
-, ...
+{
+  lib,
+  ...
 }@pkgs:
 
 let
@@ -10,4 +11,7 @@ let
   };
 in
 
-lib.mapAttrs (_: program: { type = "app"; inherit program; }) apps
+lib.mapAttrs (_: program: {
+  type = "app";
+  inherit program;
+}) apps

apps/flash-installer.nix

@@ -1,10 +1,11 @@
 targetSystemPkgs:
 
-{ self
-, lib
+{
+  self,
+  lib,
 
-, writeShellApplication
-, ...
+  writeShellApplication,
+  ...
 }@pkgs:
 
 let
@@ -17,7 +18,10 @@ let
 in
 lib.getExe (writeShellApplication {
   name = "flash-installer";
-  runtimeInputs = with pkgs; [ pv fzf ];
+  runtimeInputs = with pkgs; [
+    pv
+    fzf
+  ];
 
   text = ''
     # Select disk to flash

configurations.nix

@@ -8,21 +8,42 @@ in
     # Desktops
     "neo-wiro-laptop" = createSystem pkgs [
       (system "neo-wiro-laptop" "laptop")
-      (managedDiskLayout "luks-btrfs" { device = "nvme0n1"; swapSize = 12; })
-      (user "milomoisson" { description = "Milo Moisson"; profile = "desktop"; keys = keys.users; elevated = true; })
+      (managedDiskLayout "luks-btrfs" {
+        device = "nvme0n1";
+        swapSize = 12;
+      })
+      (user "milomoisson" {
+        description = "Milo Moisson";
+        profile = "desktop";
+        keys = keys.users;
+        elevated = true;
+      })
     ];
 
     "archaic-wiro-laptop" = createSystem pkgs [
       (system "archaic-wiro-laptop" "laptop")
-      (user "milomoisson" { description = "Milo Moisson"; profile = "desktop"; keys = keys.users; elevated = true; })
+      (user "milomoisson" {
+        description = "Milo Moisson";
+        profile = "desktop";
+        keys = keys.users;
+        elevated = true;
+      })
     ];
 
     # Servers
     "weird-row-server" = createSystem pkgs [
       (host "weird-row-server")
-      (managedDiskLayout "ext4-hetzner" { device = "sda"; swapSize = 2; })
+      (managedDiskLayout "ext4-hetzner" {
+        device = "sda";
+        swapSize = 2;
+      })
       # TODO: should we keep a real user there?
-      (user "milomoisson" { description = "Milo Moisson"; profile = "server"; keys = keys.users; elevated = true; })
+      (user "milomoisson" {
+        description = "Milo Moisson";
+        profile = "server";
+        keys = keys.users;
+        elevated = true;
+      })
     ];
   };
 
@@ -37,7 +58,12 @@ in
   darwinConfigurations = with flake-lib.darwin; {
     "apple-wiro-laptop" = createSystem pkgs [
       (system "apple-wiro-laptop" "macintosh")
-      (user "milomoisson" { description = "Milo Moisson"; profile = "macintosh"; keys = keys.users; elevated = true; })
+      (user "milomoisson" {
+        description = "Milo Moisson";
+        profile = "macintosh";
+        keys = keys.users;
+        elevated = true;
+      })
     ];
   };
 }

flake.nix

@@ -53,24 +53,28 @@
     zen-browser.inputs.home-manager.follows = "home-manager";
   };
 
-  outputs = { self, nixpkgs, ... }:
+  outputs =
+    { self, nixpkgs, ... }:
     let
       inherit (self) outputs;
       inherit (flake-lib) forAllSystems;
 
       flake-lib = import ./lib/flake (nixpkgs // { inherit self; });
 
       # This should be the only constructed nixpkgs instances in this flake
-      allPkgs = forAllSystems (system: (import nixpkgs {
-        inherit system;
-        config.allowUnfreePredicate = import ./lib/unfree.nix { lib = nixpkgs.lib; };
-        overlays = [ outputs.overlays.all ];
-      }));
+      allPkgs = forAllSystems (
+        system:
+        import nixpkgs {
+          inherit system;
+          config.allowUnfreePredicate = import ./lib/unfree.nix { lib = nixpkgs.lib; };
+          overlays = [ outputs.overlays.all ];
+        }
+      );
 
       forAllPkgs = func: forAllSystems (system: func allPkgs.${system});
     in
     {
-      formatter = forAllPkgs (pkgs: pkgs.nixpkgs-fmt);
+      formatter = forAllPkgs (pkgs: pkgs.nixfmt-tree);
 
       inherit flake-lib; # Nonstandard
       lib = forAllPkgs (import ./lib);

home-manager/fragments/agenix.nix

@@ -1,7 +1,8 @@
-{ self
-, config
-, lib
-, ...
+{
+  self,
+  config,
+  lib,
+  ...
 }:
 
 let

home-manager/fragments/aws.nix

@@ -1,6 +1,7 @@
-{ config
-, lib
-, ...
+{
+  config,
+  lib,
+  ...
 }:
 
 let

home-manager/fragments/chromium.nix

@@ -1,7 +1,8 @@
-{ config
-, lib
-, pkgs
-, ...
+{
+  config,
+  lib,
+  pkgs,
+  ...
 }:
 
 let
@@ -16,7 +17,10 @@ in
     programs.chromium = {
       enable = true;
 
-      dictionaries = with pkgs.hunspellDictsChromium; [ en_US fr_FR ];
+      dictionaries = with pkgs.hunspellDictsChromium; [
+        en_US
+        fr_FR
+      ];
 
       extensions = [
         # Language Tool
@@ -31,4 +35,3 @@ in
     };
   };
 }
-

home-manager/fragments/compose-key.nix

@@ -1,10 +1,10 @@
-{ self
-, config
-, lib
-, ...
+{
+  self,
+  config,
+  lib,
+  ...
 }:
 
-
 let
   inherit (self.outputs) homeManagerModules;
 

home-manager/fragments/default.nix

@@ -1,7 +1,7 @@
 {
   # Provides the NixOS configuration if HM was loaded through the NixOS module
-  osConfig ? null
-, ...
+  osConfig ? null,
+  ...
 }:
 
 {
@@ -38,10 +38,7 @@
   config = {
     programs.home-manager.enable = osConfig == null;
 
-    home.stateVersion =
-      if osConfig != null
-      then osConfig.system.stateVersion
-      else "24.05";
+    home.stateVersion = if osConfig != null then osConfig.system.stateVersion else "24.05";
 
     # Reload system units when switching config
     systemd.user.startServices = "sd-switch";

home-manager/fragments/epita.nix

@@ -1,7 +1,8 @@
-{ config
-, lib
-, pkgs
-, ...
+{
+  config,
+  lib,
+  pkgs,
+  ...
 }:
 
 let
@@ -11,7 +12,10 @@ let
 
   mount-epita-afs = pkgs.writeShellApplication {
     name = "mount-epita-afs";
-    runtimeInputs = with pkgs; [ krb5 sshfs ];
+    runtimeInputs = with pkgs; [
+      krb5
+      sshfs
+    ];
     text = ''
       USERNAME="${epita-forge-username}"
 
@@ -44,12 +48,14 @@ in
     };
 
     # The forge uses master as its default branch
-    programs.git.includes = [{
-      condition = "gitdir:~/Development/forge.epita.fr/";
-      contents = {
-        init.defaultBranch = "master";
-      };
-    }];
+    programs.git.includes = [
+      {
+        condition = "gitdir:~/Development/forge.epita.fr/";
+        contents = {
+          init.defaultBranch = "master";
+        };
+      }
+    ];
 
     home.packages = [
       # Useful to connect to EPITA related services