From 55f2304223f40537bab8efde52c6f6789121a4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Thu, 23 Nov 2023 13:24:59 +0100
Subject: [PATCH] nix: Various fixes

So that explains why quick-scope didn't work so far... but not why it
built without it.
---
 config/nix/hm/common.nix | 2 +-
 config/nix/hm/vim.nix    | 3 +--
 config/nix/os/common.nix | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/nix/hm/common.nix b/config/nix/hm/common.nix
index a355330..da49d73 100644
--- a/config/nix/hm/common.nix
+++ b/config/nix/hm/common.nix
@@ -381,7 +381,7 @@ in
     stateVersion = "23.05";
     language = {
       base = "en_US.UTF-8";
-      time = "en_DK.UTF-8";
+      # time = "en_DK.UTF-8"; # FIXME Disabled because complaints during nixos-rebuild switch
     };
     packages = with pkgs; [
       # dotfiles dependencies
diff --git a/config/nix/hm/vim.nix b/config/nix/hm/vim.nix
index fee2740..bcad6fc 100644
--- a/config/nix/hm/vim.nix
+++ b/config/nix/hm/vim.nix
@@ -22,7 +22,7 @@ let
       owner = "unblevable";
       repo = "quick-scope";
       rev = "v${version}";
-      sha256 = "iAPvIs/lhW+w5kFTZKaY97D/kfCGtqKrJVFvZ8cHu+c=";
+      sha256 = "TcA4jZIdnQd06V+JrXGiCMr0Yhm9gB6OMiTSdzMt/Qw=";
     };
     meta.homepage = "https://github.com/unblevable/quick-scope";
   };
@@ -255,7 +255,6 @@ in
       # f/F mode
       vim-shot-f # Highlight relevant characters for f/F/t/T modes
       quick-scope # Highlight relevant characters for f/F modes one per word but always
-      # FIXME Doesn't work here, :QuickScopeToggle doesn't even work
 
       # Registers
       registers-nvim # Show register content when pressing "
diff --git a/config/nix/os/common.nix b/config/nix/os/common.nix
index 6bdf5be..11d480e 100644
--- a/config/nix/os/common.nix
+++ b/config/nix/os/common.nix
@@ -28,6 +28,9 @@
 
     # android tools
     android-udev-rules
+
+    # Needed for all the fetchFromGit in this repo on nixos-rebuild
+    git
   ];
 
   nixpkgs.config.allowUnfree = true;