From e6f37e50ad5b05efa6e7c7cedb4d2545ac7027c5 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@gwairfelin.com>
Date: Mon, 2 Dec 2024 14:31:02 +0000
Subject: [PATCH] Play around with starship and git deltas and shit

---
 home/dot_config/git/config    |  18 +++-
 home/dot_config/starship.toml | 172 +++++++++++++++++++++++++++++++++-
 home/dot_shell_aliases        |  12 +--
 home/dot_zshenv               |   2 +
 4 files changed, 187 insertions(+), 17 deletions(-)

diff --git a/home/dot_config/git/config b/home/dot_config/git/config
index 46ea44b..5e2c85d 100644
--- a/home/dot_config/git/config
+++ b/home/dot_config/git/config
@@ -1,3 +1,15 @@
+[core]
+    pager = delta
+[delta]
+    # https://dandavison.github.io/delta/configuration.html
+    hyperlinks = true
+    line-numbers = true
+    navigate = true
+    syntax-theme = Solarized (dark)
+[diff]
+    colorMoved = default
+[interactive]
+    diffFilter = delta --color-only
 [color]
     ui = true
     branch = always
@@ -26,10 +38,8 @@
     email = "max@gwairfelin.com"
 [includeIf "gitdir:~/src/esl/"]
     path = ~/.config/git/config-esl
-[diff]
-    tool = vimdiff
 [merge]
-    tool = vimdiff
+    conflictStyle = zdiff3
     ff = true
 [push]
     default = simple
@@ -56,7 +66,5 @@
     smtpuser = max
     smtpencryption = tls
     smtpserverport = 587
-[mergetool "vimdiff"]
-    cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c "$wincmd w" -c "wincmd J"
 [help]
     autoCorrect = immediate
diff --git a/home/dot_config/starship.toml b/home/dot_config/starship.toml
index 82866be..65c0b74 100644
--- a/home/dot_config/starship.toml
+++ b/home/dot_config/starship.toml
@@ -1,2 +1,170 @@
-[status]
-disabled = false
+[aws]
+symbol = "  "
+
+[buf]
+symbol = " "
+
+[c]
+symbol = " "
+
+[conda]
+symbol = " "
+
+[crystal]
+symbol = " "
+
+[dart]
+symbol = " "
+
+[directory]
+read_only = " 󰌾"
+
+[docker_context]
+symbol = " "
+
+[elixir]
+symbol = " "
+
+[elm]
+symbol = " "
+
+[fennel]
+symbol = " "
+
+[fossil_branch]
+symbol = " "
+
+[git_branch]
+symbol = " "
+
+[git_commit]
+tag_symbol = '  '
+
+[golang]
+symbol = " "
+
+[guix_shell]
+symbol = " "
+
+[haskell]
+symbol = " "
+
+[haxe]
+symbol = " "
+
+[hg_branch]
+symbol = " "
+
+[hostname]
+ssh_symbol = " "
+
+[java]
+symbol = " "
+
+[julia]
+symbol = " "
+
+[kotlin]
+symbol = " "
+
+[lua]
+symbol = " "
+
+[memory_usage]
+symbol = "󰍛 "
+
+[meson]
+symbol = "󰔷 "
+
+[nim]
+symbol = "󰆥 "
+
+[nix_shell]
+symbol = " "
+
+[nodejs]
+symbol = " "
+
+[ocaml]
+symbol = " "
+
+[os.symbols]
+Alpaquita = " "
+Alpine = " "
+AlmaLinux = " "
+Amazon = " "
+Android = " "
+Arch = " "
+Artix = " "
+CentOS = " "
+Debian = " "
+DragonFly = " "
+Emscripten = " "
+EndeavourOS = " "
+Fedora = " "
+FreeBSD = " "
+Garuda = "󰛓 "
+Gentoo = " "
+HardenedBSD = "󰞌 "
+Illumos = "󰈸 "
+Kali = " "
+Linux = " "
+Mabox = " "
+Macos = " "
+Manjaro = " "
+Mariner = " "
+MidnightBSD = " "
+Mint = " "
+NetBSD = " "
+NixOS = " "
+OpenBSD = "󰈺 "
+openSUSE = " "
+OracleLinux = "󰌷 "
+Pop = " "
+Raspbian = " "
+Redhat = " "
+RedHatEnterprise = " "
+RockyLinux = " "
+Redox = "󰀘 "
+Solus = "󰠳 "
+SUSE = " "
+Ubuntu = " "
+Unknown = " "
+Void = " "
+Windows = "󰍲 "
+
+[package]
+symbol = "󰏗 "
+
+[perl]
+symbol = " "
+
+[php]
+symbol = " "
+
+[pijul_channel]
+symbol = " "
+
+[python]
+symbol = " "
+
+[rlang]
+symbol = "󰟔 "
+
+[ruby]
+symbol = " "
+
+[rust]
+symbol = "󱘗 "
+
+[scala]
+symbol = " "
+
+[swift]
+symbol = " "
+
+[zig]
+symbol = " "
+
+[gradle]
+symbol = " "
diff --git a/home/dot_shell_aliases b/home/dot_shell_aliases
index e8be3e1..c36c4e4 100644
--- a/home/dot_shell_aliases
+++ b/home/dot_shell_aliases
@@ -7,16 +7,6 @@ if [ -x /usr/bin/dircolors ]; then
     alias egrep='egrep --color=auto'
 fi
 
-function la {
-    ls_out=$(\ls -lah --color=always "$@")
-    let "allowed_lines = $(tput lines) - 3"
-    if [ $(echo "$ls_out" | wc -l) -le $allowed_lines ]; then
-	echo "$ls_out"
-    else
-	echo "$ls_out" | less -r
-    fi
-}
-
 function search() {
         quoted=$(python -c "import urllib.parse, sys; print(urllib.parse.quote_plus(' '.join(sys.argv[1:])))" "${@}")
         w3m "https://duckduckgo.com/?q=${quoted}"
@@ -26,4 +16,6 @@ alias black='black --line-length 99'
 
 alias cdtmp='cd $(mktemp -d)'
 
+alias la="ls -lah --color=always | less"
+
 alias g='git'
diff --git a/home/dot_zshenv b/home/dot_zshenv
index 242842d..db46860 100644
--- a/home/dot_zshenv
+++ b/home/dot_zshenv
@@ -27,3 +27,5 @@ export _JAVA_AWT_WM_NONREPARENTING=1
 export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
 
 export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
+
+export LESS='--chop-long-lines --HILITE-UNREAD --ignore-case --incsearch --jump-target=4 --LONG-PROMPT --no-init --quit-if-one-screen --RAW-CONTROL-CHARS --use-color --window=-4'