chore(deps): routine update

.envrc

@@ -1 +1,12 @@
+# shellcheck shell=bash
+
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
+  source_url \
+    'https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc' \
+    'sha256-0EVQVNSRQWsln+rgPW3mXVmnF5sfcmKEYOmOSfLYxHg='
+fi
+
 use flake
+
+# list anything that requires re-generating .pre-commit-config.yaml
+watch_file nix/style.nix

.github/workflows/build.yaml

@@ -8,7 +8,7 @@ jobs:
   flake:
     strategy:
       matrix:
-        runners: [ubuntu-latest, macos-latest, macos-13]
+        runners: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.runners }}
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -1,3 +1,5 @@
+/.direnv
+/.pre-commit-config.yaml
 /result
 /result-*
 /update-git-commits.txt

ansible/.envrc

@@ -1,2 +1,3 @@
+# shellcheck shell=bash
 use flake '..#ansible'
 use vim

files/.config/Code/User/settings.json

@@ -1,21 +1,21 @@
 {
-    // Telemetry
-    "telemetry.enableTelemetry": false,
-    "telemetry.enableCrashReporter": false,
-    "update.channel": "none",
+  // Telemetry
+  "telemetry.enableTelemetry": false,
+  "telemetry.enableCrashReporter": false,
+  "update.channel": "none",
 
-    "editor.tabSize": 2,
-    "editor.insertSpaces": true,
-    "editor.detectIndentation": true,
-    "editor.minimap.enabled": true,
-    "editor.minimap.renderCharacters": false,
-    "editor.renderIndentGuides": true,
-    "workbench.colorTheme": "Monokai",
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "editor.detectIndentation": true,
+  "editor.minimap.enabled": true,
+  "editor.minimap.renderCharacters": false,
+  "editor.renderIndentGuides": true,
+  "workbench.colorTheme": "Monokai",
 
-    "[cpp]": {
-        "editor.quickSuggestions": false
-    },
-    "[c]": {
-        "editor.quickSuggestions": false
-    }
+  "[cpp]": {
+    "editor.quickSuggestions": false
+  },
+  "[c]": {
+    "editor.quickSuggestions": false
+  }
 }

files/.config/nixpkgs/config.nix

@@ -1,3 +1 @@
-{
-  allowUnfree = true;
-}
+{ allowUnfree = true; }

files/.config/ranger/scope.sh

@@ -22,15 +22,15 @@
 # Meaningful aliases for arguments:
 path="$1"            # Full path of the selected file
 width="$2"           # Width of the preview pane (number of fitting characters)
-height="$3"          # Height of the preview pane (number of fitting characters)
-cached="$4"          # Path that should be used to cache image previews
+# height="$3"          # Height of the preview pane (number of fitting characters)
+# cached="$4"          # Path that should be used to cache image previews
 preview_images="$5"  # "True" if image previews are enabled, "False" otherwise.
 
 maxln="${LINES:-200}" # Stop after $maxln lines.  Can be used like ls | head -n $maxln
 
 # Find out something about the file:
 mimetype="$(file --mime-type -Lb "$path")"
-extension="$(echo "${path##*.}")"
+extension="${path##*.}"
 extension="$(echo "$extension" | awk '{print tolower($0)}')"
 basename="${path##*/}"
 basename="${basename%.*}"
@@ -48,6 +48,7 @@ dump() { echo "$output"; }
 trim() { head -n "$maxln"; }
 
 # wraps highlight to treat exit code 141 (killed by SIGPIPE) as success
+# shellcheck disable=SC2317
 safepipe() { "$@"; test $? = 0 -o $? = 141; }
 
 # Image previews, if enabled in ranger.
@@ -84,7 +85,7 @@ case "$extension" in
     # PDF documents:
     pdf)
         try pdftotext -l 10 -nopgbrk -q "$path" - && \
-            { dump | trim | fmt -s -w $width; exit 0; } || exit 1;;
+            { dump | trim | fmt -s -w "$width"; exit 0; } || exit 1;;
     # BitTorrent Files
     torrent)
         try transmission-show "$path" && { dump | trim; exit 5; } || exit 1;;
@@ -93,9 +94,9 @@ case "$extension" in
         try odt2txt "$path" && { dump | trim; exit 5; } || exit 1;;
     # HTML Pages:
     htm|html|xhtml)
-        try w3m    -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
-        try lynx   -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
-        try elinks -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
+        try w3m    -dump "$path" && { dump | trim | fmt -s -w "$width"; exit 4; }
+        try lynx   -dump "$path" && { dump | trim | fmt -s -w "$width"; exit 4; }
+        try elinks -dump "$path" && { dump | trim | fmt -s -w "$width"; exit 4; }
         ;; # fall back to highlight/cat if the text browsers fail
     # TXT Files
     txt)

flake.nix

@@ -20,6 +20,13 @@
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    pre-commit-hooks = {
+      url = "github:cachix/pre-commit-hooks.nix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-compat.follows = "flake-compat";
+      };
+    };
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
@@ -33,7 +40,6 @@
       systems = [
         "aarch64-darwin"
         "aarch64-linux"
-        "x86_64-darwin"
         "x86_64-linux"
       ];
     };

nix/darwin/machines/default.nix

@@ -8,6 +8,5 @@ in
     # By default Nix-Darwin would look for a configuration whose name matches
     # its hostname.
     ci = importDarwin ./ci.nix { pkgs = pkgsFor "aarch64-darwin"; };
-    ci-amd64 = importDarwin ./ci.nix { pkgs = pkgsFor "x86_64-darwin"; };
   };
 }

nix/default.nix

@@ -13,14 +13,15 @@ let
       (importApply ./config.nix { inherit inputs; })
       (importApply ./nixpkgs.nix { inherit inputs; })
       (importApply ./lib/flake-module.nix { inherit inputs; })
+      (importApply ./packages/flake-modules.nix { inherit inputs; })
     ];
     checks = ./checks.nix;
+    style = ./style.nix;
   };
 in
 {
   imports = lib.attrValues flakeModules ++ [
     inputs.flake-parts.flakeModules.flakeModules
-    inputs.treefmt-nix.flakeModule
     ./apps
     ./darwin
     ./devshells
@@ -35,24 +36,4 @@ in
   flake = {
     inherit flakeModules;
   };
-
-  perSystem =
-    { pkgs, ... }:
-    {
-      treefmt = {
-        projectRootFile = "flake.nix";
-        programs = {
-          nixfmt-rfc-style.enable = true;
-          shellcheck.enable = true;
-          prettier = {
-            enable = true;
-            settings.proseWrap = "always";
-          };
-        };
-        settings.formatter.shellcheck.options = [
-          "--external-sources"
-          "--source-path=SCRIPTDIR"
-        ];
-      };
-    };
 }

nix/devshells/default.nix

@@ -9,9 +9,7 @@
     }:
     {
       devShells = {
-        default = pkgs.callPackage ./shell.nix {
-          formatters = [ self'.formatter ] ++ (lib.attrValues config.treefmt.build.programs);
-        };
+        default = pkgs.callPackage ./shell.nix { inherit config; };
 
         ansible = pkgs.callPackage ./ansible.nix { };
 

nix/devshells/shell.nix

@@ -1,3 +1,6 @@
-{ mkShellNoCC, formatters }:
+{ config, mkShellNoCC }:
 
-mkShellNoCC { nativeBuildInputs = formatters; }
+mkShellNoCC {
+  inherit (config.treefmt.build.devShell) nativeBuildInputs;
+  shellHook = config.pre-commit.installationScript;
+}