Run nix fmt

Format using `nixfmt-rfc-style`.

lib/shared/home-manager-packages.nix

@@ -2,7 +2,9 @@
 let
   php = pkgs.php82;
   phpPackages = pkgs.php82Packages;
-in with pkgs; [
+in
+with pkgs;
+[
   inputs.build-configs.packages.${pkgs.system}.default
 
   awscli2

lib/shared/home-manager.nix

@@ -1,4 +1,10 @@
-{ inputs, pkgs, username, self, }: {
+{
+  inputs,
+  pkgs,
+  username,
+  self,
+}:
+{
   home.username = "${username}";
   home.homeDirectory = "/home/${username}";
 

lib/shared/modules/bin.nix

@@ -1,4 +1,5 @@
-{ self, ... }: {
+{ self, ... }:
+{
   home.sessionPath = [ "$HOME/.local/bin" ];
 
   home.file.".local/bin" = {

lib/shared/modules/git.nix

@@ -34,10 +34,12 @@
       userName = "Oliver Davies";
       userEmail = "oliver@oliverdavies.dev";
 
-      includes = [{
-        condition = "gitdir:~/Code/bitbucket.org/transportforwales/";
-        contents.user.email = "oliver.davies@tfw.wales";
-      }];
+      includes = [
+        {
+          condition = "gitdir:~/Code/bitbucket.org/transportforwales/";
+          contents.user.email = "oliver.davies@tfw.wales";
+        }
+      ];
 
       aliases = {
         aa = "add --all";
@@ -54,12 +56,10 @@
         current-branch = "rev-parse --abbrev-ref HEAD";
         dc = "diff --color --word-diff --cached";
         df = "diff --color --word-diff";
-        dup =
-          "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
+        dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
         fixup = "commit --fixup";
         issues = "!gh issue list --web";
-        mup =
-          "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
+        mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
         no-ff = "merge --no-ff";
         pl = "pull";
         prune = "remote prune origin";
@@ -71,12 +71,10 @@
         repush = "!git pull --rebase && git push";
         ri = "rebase --interactive";
         rid = "!git rebase -i $(git merge-base develop HEAD)";
-        rim =
-          "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
+        rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
         rip = "!git rebase -i $(git merge-base production HEAD)";
         ris = "!git rebase -i $(git merge-base staging HEAD)";
-        riu =
-          "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
+        riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
         rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
         sl = "log --oneline --decorate -20";
         sla = "log --oneline --decorate --graph --all -20";
@@ -87,8 +85,7 @@
         unassume = "update-index --no-assume-unchanged";
         uncommit = "reset --soft HEAD^";
         unstage = "reset";
-        update =
-          "!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
+        update = "!git fetch --all --jobs=4 --prune --progress && git rebase --autostash --stat";
         upstream = "rev-parse --abbrev-ref --symbolic-full-name @{u}";
         ureset = "!git reset --hard $(git upstream)";
         worktrees = "worktree list";
@@ -103,7 +100,9 @@
         checkout.defaultRemote = "origin";
         color.ui = true;
         column.ui = "auto";
-        commit = { template = "~/.gitmessage"; };
+        commit = {
+          template = "~/.gitmessage";
+        };
         core = {
           editor = "nvim";
           excludesFile = "~/.config/git/ignore";

lib/shared/modules/neovim.nix

@@ -1,7 +1,9 @@
 { inputs }:
 { pkgs, ... }:
-let system = pkgs.system;
-in {
+let
+  system = pkgs.system;
+in
+{
   programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager { inherit system; };
 
   home.file.".markdownlint.yaml".text = ''

lib/shared/modules/phpactor.nix

@@ -1,4 +1,5 @@
-{ self, ... }: {
+{ self, ... }:
+{
   xdg.configFile.phpactor = {
     source = "${self}/config/phpactor";
     recursive = true;

lib/shared/modules/ripgrep.nix

@@ -1,4 +1,5 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   home.packages = with pkgs; [ ripgrep ];
 
   xdg.configFile."ripgrep/config".text = ''

lib/shared/modules/tmux.nix

@@ -1,6 +1,8 @@
 { pkgs, ... }:
-let inherit (pkgs) tmuxPlugins;
-in {
+let
+  inherit (pkgs) tmuxPlugins;
+in
+{
   programs.tmux = {
     enable = true;
 
@@ -106,7 +108,10 @@ in {
       if-shell "[ -f ~/.tmux.conf.local ]" 'source ~/.tmux.conf.local'
     '';
 
-    plugins =
-      [ tmuxPlugins.resurrect tmuxPlugins.vim-tmux-navigator tmuxPlugins.yank ];
+    plugins = [
+      tmuxPlugins.resurrect
+      tmuxPlugins.vim-tmux-navigator
+      tmuxPlugins.yank
+    ];
   };
 }

lib/shared/modules/wezterm.nix

@@ -1,7 +1,8 @@
 { pkgs, self, ... }:
 let
   theme = import "${self}/lib/theme" { inherit pkgs; };
-in {
+in
+{
   programs.wezterm = {
     enable = true;
     enableZshIntegration = true;

lib/shared/modules/zsh.nix

@@ -15,7 +15,7 @@
       ls = "lsd";
       run = "./run";
       s = "secrets";
-      secrets = "doppler --project \"$(whoami)\" run";
+      secrets = ''doppler --project "$(whoami)" run'';
       switch = "run nixos nixedo switch";
       sz = "source ~/.config/zsh/.zshrc";
       tag = "tag-release";
@@ -62,7 +62,7 @@
     };
 
     shellGlobalAliases = {
-      A1 = "| awk '{print \$1}'";
+      A1 = "| awk '{print $1}'";
       Fj = "| jq .";
       Fy = "| yq .";
       G = "| grep";
@@ -175,7 +175,10 @@
       plugins = [
         {
           name = "themes/robbyrussell";
-          tags = [ "from:oh-my-zsh" "as:theme" ];
+          tags = [
+            "from:oh-my-zsh"
+            "as:theme"
+          ];
         }
         {
           name = "plugin/git";