From 5cd9d526dfaa0107613959f81c7e15b34900b875 Mon Sep 17 00:00:00 2001
From: Fabian Hauser <fabian@fh2.ch>
Date: Mon, 14 Mar 2022 19:32:15 +0100
Subject: [PATCH] Update mime and git config

---
 defaults/user-configuration/fhauser/applications/git.nix | 2 +-
 defaults/user-configuration/fhauser/mimetypes.nix        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/defaults/user-configuration/fhauser/applications/git.nix b/defaults/user-configuration/fhauser/applications/git.nix
index e8686fa..25a0dea 100644
--- a/defaults/user-configuration/fhauser/applications/git.nix
+++ b/defaults/user-configuration/fhauser/applications/git.nix
@@ -49,7 +49,7 @@
         status = "auto";
       };
       submodule.recurse = true;
-      push.default = "simple";
+      push.default = "current";
       pull.rebase = "true";
       branch.autosetuprebase = "always";
       log.follow = true;
diff --git a/defaults/user-configuration/fhauser/mimetypes.nix b/defaults/user-configuration/fhauser/mimetypes.nix
index 92a6fbb..f31df1c 100644
--- a/defaults/user-configuration/fhauser/mimetypes.nix
+++ b/defaults/user-configuration/fhauser/mimetypes.nix
@@ -10,11 +10,12 @@
       sheet-editor = [ "calc.desktop" ];
       presentation-editor = [ "impress.desktop" ];
       pdf = [ "org.gnome.Evince.desktop" ];
-      image = [ "org.gnome.eog.desktop" ];
+      image = [ "org.gnome.eog.desktop" "gimp.desktop" ];
       image-vector = [ "org.inkscape.Inkscape.desktop" ];
       ebooks = [ "calibre-ebook-viewer.desktop" ];
       code-general = [ "codium.desktop" ];
       video = [ "vlc.desktop" ];
+      compression = [ "org.gnome.Nautilus.desktop" ];
     in {
       "text/html" = browser;
       "x-scheme-handler/http" = browser;
@@ -51,9 +52,12 @@
       "image/x-tga" = image;
       "image/tiff" = image;
       "image/x-canon-cr2" = image;
+      "application/x-ptoptimizer-script" = [ "hugin.desktop" ];
       "image/svg+xml" = image-vector;
 
       "video/mp4" = video;
+
+      "application/zip" = compression;
     };
   };
 }