From 6db9eaad8e78f882ae44a28edcc4d11d2ffd5e28 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 14 Mar 2023 21:43:19 +0100 Subject: Re-format with nixpkgs-fmt --- user/settings/development/base.nix | 11 ++++----- user/settings/development/clojure.nix | 7 +++--- user/settings/development/javascript.nix | 41 ++++++++++++++++---------------- user/settings/development/lisp.nix | 7 +++--- user/settings/development/rust.nix | 7 +++--- user/settings/development/web.nix | 7 +++--- user/settings/development/zig.nix | 7 +++--- 7 files changed, 41 insertions(+), 46 deletions(-) (limited to 'user/settings/development') diff --git a/user/settings/development/base.nix b/user/settings/development/base.nix index 96429c1d..97658768 100644 --- a/user/settings/development/base.nix +++ b/user/settings/development/base.nix @@ -1,8 +1,7 @@ -{ - config, - lib, - pkgs, - ... +{ config +, lib +, pkgs +, ... }: { home.packages = with pkgs; [ @@ -29,7 +28,7 @@ ); 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 a5d6ceae..0358e8da 100644 --- a/user/settings/development/clojure.nix +++ b/user/settings/development/clojure.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { home.packages = with pkgs; [ clojure diff --git a/user/settings/development/javascript.nix b/user/settings/development/javascript.nix index 692995e7..6421c8b3 100644 --- a/user/settings/development/javascript.nix +++ b/user/settings/development/javascript.nix @@ -1,10 +1,11 @@ -{ - config, - pkgs, - ... -}: let +{ config +, pkgs +, ... +}: +let nodejs = pkgs.nodejs-18_x; -in { +in +{ nixpkgs.overlays = [ (self: super: { node2nixPackages = super.callPackage ../../packages/node2nix { @@ -14,21 +15,21 @@ in { ]; home.packages = (with pkgs; - [ - nodejs + [ + nodejs + ] + ++ ( + if stdenv.isDarwin + then [ + ] + else [ + # npm install may use any of these + binutils + gnumake + gcc + python2 ] - ++ ( - if stdenv.isDarwin - then [ - ] - else [ - # npm install may use any of these - binutils - gnumake - gcc - python2 - ] - )) + )) ++ (with pkgs.nodePackages; [ node2nix nodemon diff --git a/user/settings/development/lisp.nix b/user/settings/development/lisp.nix index 7a55c41c..9ad918d2 100644 --- a/user/settings/development/lisp.nix +++ b/user/settings/development/lisp.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { home.packages = with pkgs; [ ccl diff --git a/user/settings/development/rust.nix b/user/settings/development/rust.nix index 16a50b41..46f3f4f1 100644 --- a/user/settings/development/rust.nix +++ b/user/settings/development/rust.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { home.packages = with pkgs; [ cargo diff --git a/user/settings/development/web.nix b/user/settings/development/web.nix index 64502198..4bd6630f 100644 --- a/user/settings/development/web.nix +++ b/user/settings/development/web.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { home.packages = with pkgs.nodePackages; [ diff --git a/user/settings/development/zig.nix b/user/settings/development/zig.nix index 69c2ea80..e5fab030 100644 --- a/user/settings/development/zig.nix +++ b/user/settings/development/zig.nix @@ -1,7 +1,6 @@ -{ - config, - pkgs, - ... +{ config +, pkgs +, ... }: { programs.emacs.extraPackages = epkgs: (with epkgs; [ zig-mode -- cgit 1.4.1