style: reformat with nixpkgs-fmt

home-manager/apollo.nix

@@ -32,9 +32,7 @@
         glyph_offset.y = 6;
       };
 
-      shell = {
-        program = "zsh";
-      };
+      shell = { program = "zsh"; };
     };
   };
 }

home-manager/modules/common.nix

@@ -69,24 +69,23 @@ let
       sha256 = "n8jd6fy30XukZ9NFZX5qclSlMfziP/Ew9dXfkysRl4Y=";
     };
   };
-in {
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "intelephense"
-    "postman"
-  ];
+in
+{
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "intelephense" "postman" ];
 
   home.packages = (import ./packages.nix) { inherit pkgs; };
 
   home.file."nodemon.json".text = ''
-  {
-    "ignore": [
-      ".git"
-    ],
-    "verbose": true,
-    "events": {
-      "start": "clear"
+    {
+      "ignore": [
+        ".git"
+      ],
+      "verbose": true,
+      "events": {
+        "start": "clear"
+      }
     }
-  }
   '';
 
   programs.bat.enable = true;
@@ -213,18 +212,20 @@ in {
       nodePackages.vls
       nodePackages.vscode-langservers-extracted
       nodePackages.yaml-language-server
+      phpactor
       php81Packages.phpcbf
       php81Packages.phpcs
       php81Packages.phpstan
       proselint
       rnix-lsp
+      rstfmt
       shellcheck
     ];
   };
 
-  home.sessionPath = [
-    "$HOME/.config/bin"
-  ];
+  programs.nnn.enable = true;
+
+  home.sessionPath = [ "$HOME/.config/bin" ];
 
   xdg.configFile.bin = {
     source = ../../bin;

home-manager/modules/git.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, lib, libs, ... }:
-{
+{ config, pkgs, lib, libs, ... }: {
   programs.git = {
     enable = true;
     userName = "Oliver Davies";
@@ -19,10 +18,12 @@
       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 -";
       nah = "!git reset --hard && git clean -fd";
       no-ff = "merge --no-ff";
       pl = "pull";
@@ -35,10 +36,12 @@
       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";
@@ -61,9 +64,7 @@
       };
       checkout.defaultRemote = "origin";
       color.ui = true;
-      commit = {
-        template = "~/.gitmessage";
-      };
+      commit = { template = "~/.gitmessage"; };
       core = {
         editor = "nvim";
         excludesFile = "~/.gitignore-global";

home-manager/modules/home-manager.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, ... }:
-{
+{ config, pkgs, ... }: {
   home.username = "opdavies";
   home.homeDirectory = "/home/opdavies";
 

home-manager/modules/tmux.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, lib, libs, ... }:
-{
+{ config, pkgs, lib, libs, ... }: {
   programs.tmux = {
     enable = true;
     terminal = "tmux-256color";

home-manager/modules/zsh.nix

@@ -1,5 +1,4 @@
-{ config, pkgs, lib, libs, ... }:
-{
+{ config, pkgs, lib, libs, ... }: {
   programs.zsh = {
     enable = true;
     enableCompletion = false;
@@ -119,9 +118,18 @@
       enable = true;
 
       plugins = [
-        { name = "themes/robbyrussell"; tags = [from:oh-my-zsh as:theme]; }
-        { name = "plugin/git"; tags = [from:oh-my-zsh]; }
-        { name = "plugin/vi-mode"; tags = [from:oh-my-zsh]; }
+        {
+          name = "themes/robbyrussell";
+          tags = [ "from:oh-my-zsh" "as:theme" ];
+        }
+        {
+          name = "plugin/git";
+          tags = [ "from:oh-my-zsh" ];
+        }
+        {
+          name = "plugin/vi-mode";
+          tags = [ "from:oh-my-zsh" ];
+        }
         { name = "mollifier/cd-gitroot"; }
         { name = "zsh-users/zsh-autosuggestions"; }
         { name = "zsh-users/zsh-completions"; }

home-manager/nixedo.nix

@@ -26,25 +26,15 @@
       font = {
         size = 12.0;
 
-        normal.family = "Meslo LG M";
+        normal.family = "JetBrainsMono Nerd Font";
 
         offset.y = 12;
         glyph_offset.y = 6;
       };
 
-      shell = {
-        program = "zsh";
-      };
+      shell = { program = "zsh"; };
     };
   };
 
-  home.packages = with pkgs; [
-    discord
-    meslo-lg
-    slack
-    teams
-    vlc
-    xcape
-    zoom-us
-  ];
+  home.packages = with pkgs; [ discord meslo-lg slack teams vlc xcape zoom-us ];
 }