move git into own file again

home-manager/fish.nix

@@ -2,15 +2,21 @@
 
 {
   enable = true;
-  interactiveShellInit = ''
-    starship init fish | source
-    set fish_greeting # Disable greeting
-    set -gx GPG_TTY (tty)
-    set -gx LD_LIBRARY_PATH $NIX_LD_LIBRARY_PATH
-  '' + (if pkgs.stdenv.isDarwin then
+  interactiveShellInit =
     ''
-    fish_add_path /opt/homebrew/bin
-  '' else "");
+      starship init fish | source
+      set fish_greeting # Disable greeting
+      set -gx GPG_TTY (tty)
+      set -gx LD_LIBRARY_PATH $NIX_LD_LIBRARY_PATH
+    ''
+    + (
+      if pkgs.stdenv.isDarwin then
+        ''
+          fish_add_path /opt/homebrew/bin
+        ''
+      else
+        ""
+    );
   shellAliases = {
     vim = "nvim";
     hm = "home-manager";

home-manager/git.nix

@@ -0,0 +1,23 @@
+{ pkgs, ... }:
+
+{
+  enable = true;
+  userName = "Peter Stolz";
+  userEmail = "[email protected]";
+  lfs.enable = true;
+  aliases = {
+    graph = "log --all --decorate --oneline --graph";
+  };
+  extraConfig = {
+    user.signingkey = "1D68343249781AD9";
+    gpg.program = "gpg";
+    push.autoSetupRemote = true;
+    commit.gpgsign = true;
+    core.editor = "nvim";
+    core.autocrlf = "input";
+    init.defaultBranch = "main";
+    safe.directory = "/etc/nixos";
+    stash.showPatch = true;
+    pull.rebase = true;
+  };
+}

home-manager/home.nix

@@ -19,6 +19,7 @@ let
     file
     gh
     gnupg
+    graphviz
     hadolint
     hcloud
     htop
@@ -42,6 +43,7 @@ let
     python312Full
     redis
     s3cmd
+    sshfs
     tilt
     unzip
     yarn
@@ -84,28 +86,7 @@ in
         settings = pkgs.lib.importTOML ./dotfiles/starship.toml;
       };
 
-      git = {
-        enable = true;
-        userName = "Peter Stolz";
-        userEmail = "[email protected]";
-        lfs.enable = true;
-        aliases = {
-          graph = "log --all --decorate --oneline --graph";
-        };
-        extraConfig = {
-          user.signingkey = "1D68343249781AD9";
-          gpg.program = "gpg";
-          push.autoSetupRemote = true;
-          commit.gpgsign = true;
-          core.editor = "nvim";
-          core.autocrlf = "input";
-          init.defaultBranch = "main";
-          safe.directory = "/etc/nixos";
-          stash.showPatch = true;
-          pull.rebase = true;
-        };
-      };
-
+      git = import ./git.nix { inherit pkgs; };
       yt-dlp.enable = true;
 
       kitty = {

home-manager/vscode.nix

@@ -25,6 +25,7 @@
     oderwat.indent-rainbow
   ];
   userSettings = {
+    "explorer.confirmDelete" = false;
     "javascript.updateImportsOnFileMove.enabled" = "always";
     "[python]" = {
       "editor.defaultFormatter" = "ms-python.black-formatter";