config: various adjustments

This commit is contained in:
xeruf 2023-03-14 23:33:06 +01:00
parent d4f198a8c3
commit 6f70299efc
6 changed files with 15 additions and 6 deletions

View File

@ -939,6 +939,7 @@ Version 2019-11-04 2021-02-16"
:config (add-hook 'web-mode-hook 'rainbow-mode) :config (add-hook 'web-mode-hook 'rainbow-mode)
) )
; https://discourse.doomemacs.org/t/disabling-ruby-typeprof/3197/3
(after! lsp-mode (after! lsp-mode
(setq lsp-disabled-clients '(typeprof-ls))) (setq lsp-disabled-clients '(typeprof-ls)))
@ -1066,7 +1067,8 @@ Version 2019-11-04 2021-02-16"
(use-package! magit (use-package! magit
:defer t :defer t
:config :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-clone-default-directory (expand-file-name "1-projects" user-data-dir)
magit-blame--style (car magit-blame-styles)) magit-blame--style (car magit-blame-styles))
(setq magit-clone-name-alist (setq magit-clone-name-alist

View File

@ -86,7 +86,7 @@
;;ansible ;;ansible
;;debugger ; FIXME stepping through code, to help you add bugs ;;debugger ; FIXME stepping through code, to help you add bugs
direnv direnv
;;docker docker
editorconfig ; let someone else argue about tabs vs spaces editorconfig ; let someone else argue about tabs vs spaces
;;ein ; tame Jupyter notebooks with emacs ;;ein ; tame Jupyter notebooks with emacs
(eval +overlay) ; run code, run (also, repls) (eval +overlay) ; run code, run (also, repls)

View File

@ -17,8 +17,7 @@ print_info() {
info "Resolution" resolution info "Resolution" resolution
info "Packages" packages info "Packages" packages
prin "Terminal" "$(pinfo term) $(pinfo "with font" term_font) running $(pinfo shell)" prin "Terminal" "$(pinfo term) $(pinfo "with font" term_font) running $(pinfo shell)"
info "DE" de prin "Desktop" "$(pinfo de | sed 's|.$|\0 on|') $(pinfo wm) $(pinfo wm_theme)"
prin "WM" "$(pinfo wm) $(pinfo wm_theme)"
prin "Theme" "$(pinfo theme) $(pinfo "with icons" icons)" prin "Theme" "$(pinfo theme) $(pinfo "with icons" icons)"
info "CPU" cpu info "CPU" cpu
info "GPU" gpu info "GPU" gpu

View File

@ -45,6 +45,9 @@ ulimit -c unlimited # Enable core dumps
which lsb_release >/dev/null && which lsb_release >/dev/null &&
export DIST=$(lsb_release --id | cut -d' ' -f2) 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 unalias rd 2>/dev/null
# System help {{{1 # 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 syslog='less +F /var/log/syslog'
alias sc='sudo systemctl' alias sc='sudo systemctl'
alias sced="EDITOR=nvim sudo --preserve-env=EDITOR systemctl edit"
alias scd='sudo systemctl disable --now' alias scd='sudo systemctl disable --now'
unalias scs sce 2>/dev/null unalias scs sce 2>/dev/null
@ -320,7 +324,8 @@ sshl() {
! [[ "$1" =~ "pve.*" ]] && ! [[ "$1" =~ "pve.*" ]] &&
! [[ "$1" =~ "encee.*" ]] && ! [[ "$1" =~ "encee.*" ]] &&
! [[ "$1" =~ ".*fmh.de" ]] && ! [[ "$1" =~ ".*fmh.de" ]] &&
pass=pass ! [[ "$1" =~ "delta*" ]] &&
local pass=pass
test "$all" && test "$all" &&
$pass scp ~/.bash_aliases "$1:" && $pass scp ~/.bash_aliases "$1:" &&
$pass ssh "$1" 'grep -q ".bash_aliases" .bashrc || echo "source ~/.bash_aliases" >>.bashrc' $pass ssh "$1" 'grep -q ".bash_aliases" .bashrc || echo "source ~/.bash_aliases" >>.bashrc'

View File

@ -119,6 +119,7 @@ case "$(grep "^$USER" /etc/passwd | sed 's/.*://')" in (*zsh);; (*) chsh -s $(wh
highlight "Arch" highlight "Arch"
if test -f /etc/pacman.conf; then if test -f /etc/pacman.conf; then
# TODO adjust makepkg.conf to at least half of processor count
subhighlight "Pacman" subhighlight "Pacman"
sudo sed -i 's/#Parallel/Parallel/;s/#Color/Color/;s/#UseSyslog/UseSyslog/' /etc/pacman.conf 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 sudo sed -i "$(grep -n "\[multilib\]" /etc/pacman.conf | cut -d':' -f1),+1 s/# *//" /etc/pacman.conf

View File

@ -158,7 +158,9 @@ setopt hist_find_no_dups
setopt hist_save_no_dups setopt hist_save_no_dups
setopt hist_reduce_blanks setopt hist_reduce_blanks
unsetopt hist_ignore_space unsetopt hist_ignore_space
# TODO filter from history: netkeeper killm zshaddhistory() {
[[ $1 != netkeeper* ]] && [[ $1 != killm* ]]
}
setopt sh_word_split setopt sh_word_split
setopt extended_glob setopt extended_glob