From 616b7af85820608efe796dabb2de014b050af87d Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sat, 13 Aug 2022 21:50:23 +0200
Subject: [PATCH] devos: include upstream commits

https://github.com/divnix/digga/commit/780620d8659fdcb04d4952a2607ce363e0d3a3be

https://github.com/divnix/digga/commit/e6b14d39d6d2e0a0544dbc50c7cc235acb2bc123

https://github.com/divnix/digga/commit/dd51f64bc5ff2a2127237805d9dcd6bd7ffebfed
---
 overlays/overrides.nix    |  1 +
 shell/devos.nix           | 28 +++++++++++++++++++---------
 shell/hooks/pre-commit.sh |  7 +++++--
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index df75736..6c9e8e7 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -8,6 +8,7 @@ channels: final: prev: {
     discord
     element-desktop
     rage
+    nix-index
     nixpkgs-fmt
     qutebrowser
     signal-desktop
diff --git a/shell/devos.nix b/shell/devos.nix
index f799ca0..b7c6f10 100644
--- a/shell/devos.nix
+++ b/shell/devos.nix
@@ -1,12 +1,22 @@
-{ pkgs, extraModulesPath, inputs, ... }:
+{ pkgs, extraModulesPath, inputs, lib, ... }:
 let
 
+  inherit (pkgs)
+    agenix
+    cachix
+    editorconfig-checker
+    mdbook
+    nixUnstable
+    nixpkgs-fmt
+    nvfetcher
+    ;
+
   hooks = import ./hooks;
 
   pkgWithCategory = category: package: { inherit package category; };
+  devos = pkgWithCategory "devos";
   linter = pkgWithCategory "linter";
   docs = pkgWithCategory "docs";
-  devos = pkgWithCategory "devos";
 
 in
 {
@@ -44,15 +54,15 @@ in
     }
     (linter nixpkgs-fmt)
     (linter editorconfig-checker)
-    # (docs python3Packages.grip) too many deps
+
     (docs mdbook)
+  ]
+  ++ lib.optionals (!pkgs.stdenv.buildPlatform.isi686) [
+    (devos cachix)
+  ]
+  ++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [
+    (devos inputs.nixos-generators.defaultPackage.${pkgs.system})
     (devos deploy-rs)
   ]
-  ++ lib.optional
-    (system != "i686-linux")
-    (devos cachix)
-  ++ lib.optional
-    (system != "aarch64-darwin")
-    (devos inputs.nixos-generators.defaultPackage.${pkgs.system})
   ;
 }
diff --git a/shell/hooks/pre-commit.sh b/shell/hooks/pre-commit.sh
index 985d3b4..a7fa908 100755
--- a/shell/hooks/pre-commit.sh
+++ b/shell/hooks/pre-commit.sh
@@ -14,13 +14,16 @@ nix_files=($($diff -- '*.nix'))
 all_files=($($diff))
 
 # Format staged nix files.
-if [[ -n "${nix_files[@]}" ]]; then
+if (( ${#nix_files[@]} != 0 )); then
   nixpkgs-fmt "${nix_files[@]}" \
   && git add "${nix_files[@]}"
 fi
 
 # check editorconfig
-editorconfig-checker -- "${all_files[@]}"
+if (( ${#all_files[@]} != 0 )); then
+  editorconfig-checker -- "${all_files[@]}"
+fi
+
 if [[ $? != '0' ]]; then
   printf "%b\n" \
     "\nCode is not aligned with .editorconfig" \