Merge pull request #1385 from Mic92/merge-when-green-joerg

rg: restore old defaults

darwin/modules/nix-daemon.nix

@@ -16,6 +16,8 @@
       keep-derivations = true;
 
       substituters = [
+        "https://nixos.tvix.store"
+
         "https://nix-community.cachix.org"
         "https://cache.thalheim.io"
       ];

home/.zshrc

@@ -283,7 +283,7 @@ rg() {
   fi
 
   if [[ -n ${commands[rg]} ]]; then
-    ( command rg --json -C 2 "$@"; command rg --files | command rg --no-line-number --json -C 2 "$@" ) | $pager
+    ( command rg --sort path --smart-case --fixed-strings --json -C 2 "$@"; command rg --files | command rg --no-line-number --json -C 2 "$@" ) | $pager
   elif [[ -n ${commands[ag]} ]]; then
     command ag -C2 --smart-case --literal --pager="$pager" "$@"
   else
@@ -467,11 +467,16 @@ nix-call-package() {
 }
 nixos-build() {
     if [ $# -lt 1 ]; then
-        echo "USAGE: $0 machineName" >&2
-        return 1
+        if [ $OSTYPE = linux* ]; then
+          name=$(</proc/sys/kernel/hostname)
+        else
+          echo "USAGE: $0 name" >&2
+          return 1
+        fi
+    else
+        name=$1
+        shift
     fi
-    name=$1
-    shift
 
     command nixos-rebuild build --flake ".#$name" "$@"
 }

machines/modules/nix-daemon.nix

@@ -23,18 +23,17 @@
         !config.boot.isContainer or config.fileSystems."/".fsType != "zfs"
       );
       substituters = [
+        "https://nixos.tvix.store"
+
         "https://nix-community.cachix.org"
-        #"https://mic92.cachix.org"
         "https://cache.thalheim.io"
       ];
       trusted-substituters = [
         "https://nix-community.cachix.org"
-        #"https://mic92.cachix.org"
         "https://cache.thalheim.io"
       ];
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        #"mic92.cachix.org-1:gi8IhgiT3CYZnJsaW7fxznzTkMUOn1RY4GmXdT/nXYQ="
         "cache.thalheim.io-1:R7msbosLEZKrxk/lKxf9BTjOOH7Ax3H0Qj0/6wiHOgc="
       ];