modules/profiles/desktop.nix

@@ -90,19 +90,6 @@ in
       stable.texlive.combined.scheme-full # NOTE breaks often
       thunderbird
       vlc
-      (symlinkJoin {
-        name = "obsidian-wayland";
-        paths = [ obsidian ];
-        nativeBuildInputs = [ makeWrapper ];
-        postBuild = ''
-          wrapProgram $out/bin/obsidian \
-            --add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland"
-        '';
-      })
-    ];
-
-    nixpkgs.config.permittedInsecurePackages = [
-      "electron-25.9.0" # obsidian
     ];
 
     programs.nix-ld.enable = true;

modules/programs/git.nix

@@ -1,5 +1,6 @@
 { config
 , lib
+, pkgs
 , ...
 }:
 
@@ -49,23 +50,21 @@ in
         userName = cfg.identity.name;
         userEmail = cfg.identity.email;
         extraConfig = {
-          commit.verbose = true;
-          diff.algorithm = "histogram";
-          fetch.fsckobjects = true;
           init.defaultBranch = "main";
           merge.conflictstyle = "zdiff3";
+          diff.external = getExe pkgs.difftastic;
           push.autoSetupRemote = true;
-          receive.fsckObjects = true;
-          transfer.fsckobjects = true;
         };
         signing = mkIf cfg.signing {
           key = "0x970C6E89EB0547A9";
           signByDefault = true;
         };
         lfs.enable = true;
-        delta.enable = true;
       };
     };
-    programs.git.enable = true;
+    programs.git = {
+      enable = true;
+      config.safe.directory = "/home/moritz/.dotfiles";
+    };
   };
 }