From 6f70299efc35d7d0c66943e5f4e52b6f44c184ac Mon Sep 17 00:00:00 2001
From: xeruf <27jf@pm.me>
Date: Tue, 14 Mar 2023 23:33:06 +0100
Subject: [PATCH] config: various adjustments

---
 .config/doom/config.el       | 4 +++-
 .config/doom/init.el         | 2 +-
 .config/neofetch/config.conf | 3 +--
 .config/shell/functions      | 7 ++++++-
 .config/yadm/bootstrap       | 1 +
 .config/zsh/.zshrc           | 4 +++-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.config/doom/config.el b/.config/doom/config.el
index 193c968..e4565e0 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -939,6 +939,7 @@ Version 2019-11-04 2021-02-16"
   :config (add-hook 'web-mode-hook 'rainbow-mode)
   )
 
+; https://discourse.doomemacs.org/t/disabling-ruby-typeprof/3197/3
 (after! lsp-mode
   (setq lsp-disabled-clients '(typeprof-ls)))
 
@@ -1066,7 +1067,8 @@ Version 2019-11-04 2021-02-16"
 (use-package! magit
   :defer t
   :config
-    (setq magit-clone-set-remote.pushDefault 't
+    (setq git-commit-summary-max-length 60
+          magit-clone-set-remote.pushDefault 't
           magit-clone-default-directory (expand-file-name "1-projects" user-data-dir)
           magit-blame--style (car magit-blame-styles))
     (setq magit-clone-name-alist
diff --git a/.config/doom/init.el b/.config/doom/init.el
index cf5b118..135d9c5 100644
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@@ -86,7 +86,7 @@
        ;;ansible
        ;;debugger          ; FIXME stepping through code, to help you add bugs
        direnv
-       ;;docker
+       docker
        editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein             ; tame Jupyter notebooks with emacs
        (eval +overlay)   ; run code, run (also, repls)
diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf
index 13ffbf8..7a1957e 100644
--- a/.config/neofetch/config.conf
+++ b/.config/neofetch/config.conf
@@ -17,8 +17,7 @@ print_info() {
     info "Resolution" resolution
     info "Packages" packages
     prin "Terminal" "$(pinfo term) $(pinfo "with font" term_font) running $(pinfo shell)"
-    info "DE" de
-    prin "WM" "$(pinfo wm) $(pinfo wm_theme)"
+    prin "Desktop" "$(pinfo de | sed 's|.$|\0 on|') $(pinfo wm) $(pinfo wm_theme)"
     prin "Theme" "$(pinfo theme) $(pinfo "with icons" icons)"
     info "CPU" cpu
     info "GPU" gpu
diff --git a/.config/shell/functions b/.config/shell/functions
index 4678c7d..5607883 100644
--- a/.config/shell/functions
+++ b/.config/shell/functions
@@ -45,6 +45,9 @@ ulimit -c unlimited # Enable core dumps
 which lsb_release >/dev/null &&
 	export DIST=$(lsb_release --id | cut -d'	' -f2)
 
+# Weird alias to broken color-diff
+unalias diff 2>/dev/null
+# Alias on some systems?
 unalias rd 2>/dev/null
 
 # System help {{{1
@@ -174,6 +177,7 @@ alias twtest='( cp -r "$TIMEWARRIORDB" /tmp/tw-bak && TIMEWARRIORDB=/tmp/timewar
 alias syslog='less +F /var/log/syslog'
 
 alias sc='sudo systemctl'
+alias sced="EDITOR=nvim sudo --preserve-env=EDITOR systemctl edit"
 alias scd='sudo systemctl disable --now'
 
 unalias scs sce 2>/dev/null
@@ -320,7 +324,8 @@ sshl() {
         ! [[ "$1" =~ "pve.*" ]] &&
         ! [[ "$1" =~ "encee.*" ]] &&
         ! [[ "$1" =~ ".*fmh.de" ]] &&
-        pass=pass
+        ! [[ "$1" =~ "delta*" ]] &&
+        local pass=pass
 	test "$all" &&
 		$pass scp ~/.bash_aliases "$1:" &&
 		$pass ssh "$1" 'grep -q ".bash_aliases" .bashrc || echo "source ~/.bash_aliases" >>.bashrc'
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index e027118..ea4a38e 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -119,6 +119,7 @@ case "$(grep "^$USER" /etc/passwd | sed 's/.*://')" in (*zsh);; (*) chsh -s $(wh
 
 highlight "Arch"
 if test -f /etc/pacman.conf; then
+# TODO adjust makepkg.conf to at least half of processor count
 	subhighlight "Pacman"
 	sudo sed -i 's/#Parallel/Parallel/;s/#Color/Color/;s/#UseSyslog/UseSyslog/' /etc/pacman.conf
 	sudo sed -i "$(grep -n "\[multilib\]" /etc/pacman.conf | cut -d':' -f1),+1 s/# *//" /etc/pacman.conf
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 9b0ed4d..22414fa 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -158,7 +158,9 @@ setopt hist_find_no_dups
 setopt hist_save_no_dups
 setopt hist_reduce_blanks
 unsetopt hist_ignore_space
-# TODO filter from history: netkeeper killm
+zshaddhistory() {
+  [[ $1 != netkeeper* ]] && [[ $1 != killm* ]]
+}
 
 setopt sh_word_split
 setopt extended_glob