From 543cb31a2090bb0ab62a2e6263da68636aa09631 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Tue, 19 Dec 2023 18:00:22 +0800
Subject: [PATCH] users/foo-dogsquared: fix config errors

---
 .../foo-dogsquared/modules/programs/vs-code.nix           | 2 +-
 .../foo-dogsquared/modules/setups/development.nix         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/users/home-manager/foo-dogsquared/modules/programs/vs-code.nix b/users/home-manager/foo-dogsquared/modules/programs/vs-code.nix
index 6f5a7655..8a831c3a 100644
--- a/users/home-manager/foo-dogsquared/modules/programs/vs-code.nix
+++ b/users/home-manager/foo-dogsquared/modules/programs/vs-code.nix
@@ -28,7 +28,7 @@ in
         editorconfig.editorconfig
       ];
 
-      settings = {
+      userSettings = {
         "extensions.ignoreRecommendations" = true;
       };
     };
diff --git a/users/home-manager/foo-dogsquared/modules/setups/development.nix b/users/home-manager/foo-dogsquared/modules/setups/development.nix
index c7f727fe..7209b5ba 100644
--- a/users/home-manager/foo-dogsquared/modules/setups/development.nix
+++ b/users/home-manager/foo-dogsquared/modules/setups/development.nix
@@ -38,17 +38,17 @@ in
           diffoscope
         ];
 
-        programs.git.settings = {
-          config.difftool.prompt = false;
+        programs.git.extraConfig = {
+          difftool.prompt = false;
 
           # Yeah, let's use this oversized diff tool, shall we?
           # Also, this config is based from this tip.
           # https://lists.reproducible-builds.org/pipermail/diffoscope/2016-April/000193.html
-          config.difftool."diffoscope".cmd = ''
+          difftool."diffoscope".cmd = ''
             "if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE; else diffoscope $LOCAL $REMOTE; fi"
           '';
 
-          config.difftool."diffoscope-html".cmd = ''
+          difftool."diffoscope-html".cmd = ''
             "if [ $LOCAL = /dev/null ]; then diffoscope --new-file $REMOTE --html - | cat; else diffoscope $LOCAL $REMOTE --html - | cat; fi"
           '';
         };