From cb7b847db6095e0e657fa30bedcb3d9e96d3bd9a Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Tue, 31 May 2022 17:34:19 +0200
Subject: [PATCH] Various fixes

---
 home_manager/modules/fonts.nix | 4 +++-
 home_manager/modules/git.nix   | 2 +-
 home_manager/odin.nix          | 5 +++--
 home_manager/thor.nix          | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/home_manager/modules/fonts.nix b/home_manager/modules/fonts.nix
index 9e7e5e8..c85dac8 100644
--- a/home_manager/modules/fonts.nix
+++ b/home_manager/modules/fonts.nix
@@ -7,7 +7,9 @@
     dejavu_fonts
     noto-fonts
     noto-fonts-extra
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     font-awesome
+    corefonts # Microsoft fonts
+    vistafonts
   ];
 }
diff --git a/home_manager/modules/git.nix b/home_manager/modules/git.nix
index 07db56e..a0cb5d7 100644
--- a/home_manager/modules/git.nix
+++ b/home_manager/modules/git.nix
@@ -99,7 +99,7 @@ in
     # };
     extraConfig = {
       commit.gpgSign = true;
-      core.editor = kak;
+      # core.editor = kak;
       credential.helper = "cache --timeout=3600 ";
       diff.guitool = meld;
       init.defaultBranch = "main";
diff --git a/home_manager/odin.nix b/home_manager/odin.nix
index 1f783e5..efe4e4d 100644
--- a/home_manager/odin.nix
+++ b/home_manager/odin.nix
@@ -89,8 +89,9 @@
       # wineFull
       wireguard-tools
       xclip
-      (xfce.thunar)
-      (xfce.tumbler)
+      xfce.thunar
+      xfce.tumbler
+      xfce.xfconf
       xournalpp
       yq
       zip
diff --git a/home_manager/thor.nix b/home_manager/thor.nix
index 5112597..f5302c0 100644
--- a/home_manager/thor.nix
+++ b/home_manager/thor.nix
@@ -72,8 +72,8 @@
       virt-manager
       # wineFull
       wireguard-tools
-      (xfce.thunar)
-      (xfce.tumbler)
+      xfce.thunar
+      xfce.tumbler
       xournalpp
       zoom-us
     ];