diff --git a/home-modules/git.nix b/home-modules/git.nix index 1e54806..33920f4 100644 --- a/home-modules/git.nix +++ b/home-modules/git.nix @@ -1,40 +1,13 @@ { pkgs, hyper, rice, ... }: { home.packages = with pkgs; [ - git delta - - (pkgs.writeShellScriptBin "git_monitor" '' - #!/bin/bash - - # List of directories to check - directories=( - "$HOME/nix-dots" - "$HOME/obsidian-vault" - "$HOME/Pictures/wallpapers" - ) - echo "" - for dir in "''${directories[@]}"; do - if [ -d "$dir" ]; then - cd "$dir" || { echo "Cannot change directory to $dir"; exit 1; } - echo "$(echo $dir | rev | cut -f 1 -d'/' | rev):" - if [[ $* == *--fetch* ]]; then - git fetch - fi - gst - echo "" - cd - > /dev/null || { echo "Cannot change back to the original directory"; exit 1; } - else - echo "Directory $dir does not exist." - fi - done - '') - (writeShellScriptBin "gst" "awk -vOFS='' 'NR==FNR {all[i++] = $0; difffiles[$1] = $0; next;} ! ($2 in difffiles) {print; next;} {gsub($2, difffiles[$2]); print;} END {if (NR != FNR) {exit;} for (i in all) {print all[i];}}' <(git diff --color --stat=$(($(tput cols) - 3)) HEAD | sed '$d; s/^ //') <(git -c color.status=always status -sb)") ]; programs.git = { enable = true; + package = pkgs.gitFull; userName = ''Lennart J. Kurzweg (Nx2)''; userEmail = "git@${hyper.domain}"; delta = { @@ -46,6 +19,14 @@ whitespace-error-style = "22 reverse"; }; }; + extraConfig = { + credential = { + "https://git.da.dicos.de".username = pkgs.lib.mkIf (hyper.host =="NxWSL") "lkurzweg"; + "https://git.da.dicos.de".password = pkgs.lib.mkIf (hyper.host =="NxWSL") "Test"; + }; + url."ssh://git@git.da.dicos.de/".insteadOf = pkgs.lib.mkIf (hyper.host =="NxWSL") "https://git.da.dicos.de/"; + pull.rebase = false; # true + }; }; programs.lazygit = { enable = true;