6 files changed, 94 insertions, 71 deletions
diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix
index 64f52db9..d57680bd 100644
--- a/user/settings/development/base.nix
+++ b/user/settings/development/base.nix
@@ -1,31 +1,38 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs;
+    [
+      shellcheck
+      shfmt
+      editorconfig-core-c
+      python3Packages.yamllint
+      nodePackages.dockerfile-language-server-nodejs
+      nodePackages.yaml-language-server
 
-{ home.packages = with pkgs; [
-    shellcheck
-    shfmt
-    editorconfig-core-c
-    python3Packages.yamllint
-    nodePackages.dockerfile-language-server-nodejs
-    nodePackages.yaml-language-server
+      mosh
 
-    mosh
+      nix-prefetch-scripts
+      alejandra # nix formatter
 
-    nix-prefetch-scripts
-    alejandra # nix formatter
-
-    httpie
-    jq
-  ] ++ (
-    if !stdenv.isDarwin
-    then [
-      httping
-      (lib.lowPrio firefox-devedition-bin)
-    ] else [
+      httpie
+      jq
     ]
-  );
+    ++ (
+      if !stdenv.isDarwin
+      then [
+        httping
+        (lib.lowPrio firefox-devedition-bin)
+      ]
+      else [
+      ]
+    );
   nixpkgs.overlays = [
     (self: super: {
-      ripgrep = super.ripgrep.override { withPCRE2 = true; };
+      ripgrep = super.ripgrep.override {withPCRE2 = true;};
     })
   ];
 }
diff --git a/user/settings/development/clojure.nix b/user/settings/development/clojure.nix
index 0994ef19..7b06691a 100644
--- a/user/settings/development/clojure.nix
+++ b/user/settings/development/clojure.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [
     clojure
     node2nixPackages.node-cljfmt
diff --git a/user/settings/development/javascript.nix b/user/settings/development/javascript.nix
index 232ad4ce..9b8bdabf 100644
--- a/user/settings/development/javascript.nix
+++ b/user/settings/development/javascript.nix
@@ -1,9 +1,10 @@
-{ config, pkgs, ... }:
-
-let
-  nodejs = pkgs.nodejs-18_x;
-in
 {
+  config,
+  pkgs,
+  ...
+}: let
+  nodejs = pkgs.nodejs-18_x;
+in {
   nixpkgs.overlays = [
     (self: super: {
       node2nixPackages = super.callPackage ../../packages/node2nix {
@@ -11,37 +12,40 @@ in
       };
     })
   ];
-  home.packages = (with pkgs; [
-    nodejs
-  ] ++ (
-    if stdenv.isDarwin
-    then
-    [
-    ]
-    else
-    [
-      # npm install may use any of these
-      binutils
-      gnumake
-      gcc
-      python2
-    ]
-  )) ++ (with pkgs.nodePackages; [
-    node2nix
-    nodemon
-    javascript-typescript-langserver
-    typescript-language-server
-    eslint_d
-    typescript
+  home.packages =
+    (with pkgs;
+      [
+        nodejs
+      ]
+      ++ (
+        if stdenv.isDarwin
+        then [
+        ]
+        else [
+          # npm install may use any of these
+          binutils
+          gnumake
+          gcc
+          python2
+        ]
+      ))
+    ++ (with pkgs.nodePackages; [
+      node2nix
+      nodemon
+      javascript-typescript-langserver
+      typescript-language-server
+      eslint_d
+      typescript
 
-    node-gyp
-    node-gyp-build
-    node-pre-gyp
-  ]) ++ (with pkgs.node2nixPackages; [
-    pkgs.node2nixPackages."pnpm-7.12"
+      node-gyp
+      node-gyp-build
+      node-pre-gyp
+    ])
+    ++ (with pkgs.node2nixPackages; [
+      pkgs.node2nixPackages."pnpm-7.12"
 
-    pino-pretty
-  ]);
+      pino-pretty
+    ]);
 
   home.sessionVariables = {
     NO_UPDATE_NOTIFIER = "1"; # stop npm update-notifier
diff --git a/user/settings/development/lisp.nix b/user/settings/development/lisp.nix
index 9d591651..7a55c41c 100644
--- a/user/settings/development/lisp.nix
+++ b/user/settings/development/lisp.nix
@@ -1,6 +1,9 @@
-{ config, pkgs, ... }:
-
-{ home.packages = with pkgs; [
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs; [
     ccl
     sbcl
     lispPackages.quicklisp
diff --git a/user/settings/development/rust.nix b/user/settings/development/rust.nix
index d45b1a19..63d0db35 100644
--- a/user/settings/development/rust.nix
+++ b/user/settings/development/rust.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   home.packages = with pkgs; [
     cargo
     cargo-edit
diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix
index f8b74adc..f1f45878 100644
--- a/user/settings/development/web.nix
+++ b/user/settings/development/web.nix
@@ -1,10 +1,15 @@
-{ config, pkgs, ... }:
 {
-  home.packages = with pkgs.nodePackages; [
-    vscode-css-languageserver-bin
-    vscode-html-languageserver-bin
-    csslint
-  ] ++ [
-    pkgs.nodePackages.stylelint
-  ];
+  config,
+  pkgs,
+  ...
+}: {
+  home.packages = with pkgs.nodePackages;
+    [
+      vscode-css-languageserver-bin
+      vscode-html-languageserver-bin
+      csslint
+    ]
+    ++ [
+      pkgs.nodePackages.stylelint
+    ];
 }