Add git configs and comment out yafti setup section

config/files/usr/share/ublue-os/firstboot/yafti.yml

@@ -150,30 +150,30 @@ screens:
             - Notesnook: com.notesnook.Notesnook
             - Slack: com.slack.Slack
 
-  configure-bluejay:
-    source: yafti.screen.package
-    values:
-      title: Configure Bluejay Developer Edition
-      show_terminal: true
-      package_manager: yafti.plugin.run
-      groups:
-        Nix:
-          description: Install the Nix package manager and related software
-          default: false
-          packages:
-            - Setup Nix: pkexec just --unstable nix
-        Shell:
-          description: Set up shell environment
-          default: false
-          packages:
-            - Set zsh as default shell: pkexec just --unstable zsh
-            - Set up docker: pkexec just --unstable docker
-            - Fetch dotfiles: just --unstable dotfiles
-        JetBrains:
-          description: Install JetBrains toolbox
-          default: false
-          packages:
-            - Install Toolbox: just --unstable jetbrains-toolbox
+  # configure-bluejay:
+  #   source: yafti.screen.package
+  #   values:
+  #     title: Configure Bluejay Developer Edition
+  #     show_terminal: true
+  #     package_manager: yafti.plugin.run
+  #     groups:
+  #       Nix:
+  #         description: Install the Nix package manager and related software
+  #         default: false
+  #         packages:
+  #           - Setup Nix: pkexec just --unstable nix
+  #       Shell:
+  #         description: Set up shell environment
+  #         default: false
+  #         packages:
+  #           - Set zsh as default shell: pkexec just --unstable zsh
+  #           - Set up docker: pkexec just --unstable docker
+  #           - Fetch dotfiles: just --unstable dotfiles
+  #       JetBrains:
+  #         description: Install JetBrains toolbox
+  #         default: false
+  #         packages:
+  #           - Install Toolbox: just --unstable jetbrains-toolbox
 
   final-screen:
     source: yafti.screen.title

config/files/usr/share/ublue-os/just/60-custom.just

@@ -47,8 +47,21 @@ devbox:
 zsh:
   chsh -s /usr/bin/zsh $USER
 
+git:
+  git config --global credential.helper libsecret
+  git config --global core.pager delta
+  git config --global interactive.diffFilter delta --color-only
+  git config --global delta.navigate true
+  git config --global delta.light false
+  git config --global merge.conflictstyle diff3
+  git config --global diff.colorMoved default
+  git config --global user.email [email protected]
+  git config --global user.name Benedikt Flöser
+
 dev-setup:
-  just --unstable zsh
+  sudo just --unstable zsh
+  sudo just --unstable docker
+  just --unstable git
   just --unstable nix
   just --unstable dotfiles
   just --unstable jetbrains-toolbox

config/recipe-dx.yml

@@ -50,6 +50,7 @@ modules:
       - util-linux-user
       - fzf
       - yt-dlp
+      - git-delta
       - guake
       # hasn't been built yet
       # - gnome-shell-extension-pano