From bc1f5c2ac505b33f704b2a1105c4c8521d46f19a Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 5 Jul 2022 22:07:40 +0200 Subject: [PATCH] Configs updates --- home_manager/modules/git.nix | 4 ++++ home_manager/modules/onedrive.nix | 2 +- home_manager/odin.nix | 1 + home_manager/thor.nix | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/home_manager/modules/git.nix b/home_manager/modules/git.nix index c65db70..5260296 100644 --- a/home_manager/modules/git.nix +++ b/home_manager/modules/git.nix @@ -96,12 +96,16 @@ in # signByDefault = true; # }; extraConfig = { + "add.interactive".useBuiltin = false; commit.gpgSign = true; # core.editor = kak; credential.helper = "cache --timeout=3600 "; delta.navigate = true; + delta.side-by-side = true; + diff.colorMoved = "default"; diff.guitool = "meld"; init.defaultBranch = "main"; + merge.conflictstyle = "diff3"; merge.guitool = "meld"; merge.tool = "meld"; pull.rebase = true; diff --git a/home_manager/modules/onedrive.nix b/home_manager/modules/onedrive.nix index ddfe45a..f8b9fa0 100644 --- a/home_manager/modules/onedrive.nix +++ b/home_manager/modules/onedrive.nix @@ -1,6 +1,6 @@ { pkgs, ... }: let - onedriveCmd = "${pkgs.onedrive}/bin/onedrive --monitor"; + onedriveCmd = "${pkgs.unstable.onedrive}/bin/onedrive --monitor"; in { systemd.user.services."onedrive" = { diff --git a/home_manager/odin.nix b/home_manager/odin.nix index 502a75b..fab49ac 100644 --- a/home_manager/odin.nix +++ b/home_manager/odin.nix @@ -27,6 +27,7 @@ freecad gallery-dl gnome.eog + gnome.evince gnome.file-roller gnome.geary gnome.gnome-calendar diff --git a/home_manager/thor.nix b/home_manager/thor.nix index 2441a9c..1ac3148 100644 --- a/home_manager/thor.nix +++ b/home_manager/thor.nix @@ -27,6 +27,8 @@ # firefox freecad gallery-dl + gnome.eog + gnome.evince gnome.file-roller gnome.gnome-font-viewer gnome.geary