Add nixpkgs-fmt pre-commit hook

default.nix

@@ -1,12 +1,13 @@
 let
   nix-pre-commit-hooks = import (builtins.fetchTarball
     "https://github.com/cachix/pre-commit-hooks.nix/tarball/master");
-in {
+in
+{
   pre-commit-check = nix-pre-commit-hooks.run {
     src = ./.;
     hooks = {
       shellcheck.enable = true;
-      nixfmt.enable = true;
+      nixpkgs-fmt.enable = true;
     };
   };
 }

flake.nix

@@ -13,7 +13,8 @@
   };
 
   outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware }: {
-    nixosConfigurations = let
+    nixosConfigurations =
+      let
         defaultModules = [
           home-manager.nixosModules.home-manager
           ./main/desktop.nix
@@ -52,7 +53,8 @@
             };
           })
         ];
-    in {
+      in
+      {
         hephaestus = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [

home/default.nix

@@ -11,9 +11,8 @@ let
     };
   };
   inherit (pkgs) stdenv;
-in {
+in
-
+{
-  home = { sessionVariables = { EDITOR = "vim"; }; };
 
   services = {
     gpg-agent = {
@@ -115,6 +114,7 @@ in {
         export PATH=$PATH:~/.local/bin
         export PATH=$PATH:~/go/bin
         export PAGER=less
+        export EDITOR=vim
 
         eval "$(direnv hook zsh)"
         eval "$(_RFD_COMPLETE=source_zsh rfd)"

machines/hephaestus/configuration.nix

@@ -15,6 +15,7 @@
       address = "192.168.0.1";
       interface = "enp34s0";
     };
+    firewall = { allowedTCPPorts = [ 8001 ]; };
   };
 
   # Enable the OpenSSH server.

main/netdata/default.nix

@@ -3,7 +3,8 @@ let
   netdata = pkgs.netdata;
   netdataConf = ./netdata.conf;
   netdataDir = "/var/lib/netdata";
-in {
+in
+{
   users.extraGroups.netdata.gid = 220008;
   users.extraUsers.netdata = {
     description = "Netdata server user";

main/packages.nix

@@ -1,7 +1,8 @@
 { config, lib, pkgs, ... }:
 
 let inherit (pkgs) stdenv;
-in {
+in
+{
   # System-wide packages to install.
   environment.systemPackages = with pkgs;
     let
@@ -58,7 +59,7 @@ in {
         netdata
         procs
 
-        # databases
+        # data tools
         postgresql
 
         # password managers
@@ -100,7 +101,7 @@ in {
         nmap
         openssl
         openvpn
-        sshfs
+        sshfs # mac requires https://osxfuse.github.io/
         vpngate
         whois
         wireshark
@@ -179,6 +180,7 @@ in {
         # Unsupported on darwin but likely should be:
         bandwhich
         brave
+        datasette
         deluge
         discord
         firefox
@@ -192,7 +194,8 @@ in {
         yuzu
         zoom-us
       ]);
-    in common;
+    in
+    common;
 
   # Install GnuPG agent.
   programs.gnupg.agent.enable = true;

overlays/changedetection.io/default.nix

@@ -22,7 +22,8 @@ let
       };
     };
   };
-in with py.pkgs;
+in
+with py.pkgs;
 buildPythonApplication rec {
   pname = "changedetection.io";
   version = "0.30";

overlays/lastpass/default.nix

@@ -1,5 +1,16 @@
-{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig
+{ stdenv
-, bash-completion, curl, openssl, libxml2, libxslt }:
+, lib
+, fetchFromGitHub
+, asciidoc
+, cmake
+, docbook_xsl
+, pkgconfig
+, bash-completion
+, curl
+, openssl
+, libxml2
+, libxslt
+}:
 
 stdenv.mkDerivation rec {
   pname = "lpass";

overlays/rfd/default.nix

@@ -2,7 +2,8 @@
 
 let py = python3.override { };
 
-in with py.pkgs;
+in
+with py.pkgs;
 buildPythonApplication rec {
   pname = "rfd";
   version = "v0.7.1";