diff options
| -rw-r--r-- | dot.emacs.d/init.el | 52 | ||||
| -rw-r--r-- | dot.gitconfig | 9 | ||||
| -rw-r--r-- | dot.zshenv | 2 |
3 files changed, 55 insertions, 8 deletions
diff --git a/dot.emacs.d/init.el b/dot.emacs.d/init.el index 9ff2309..41508c6 100644 --- a/dot.emacs.d/init.el +++ b/dot.emacs.d/init.el @@ -262,7 +262,8 @@ helm-buffers-fuzzy-matching t helm-recentf-fuzzy-match t helm-ff-file-name-history-use-recentf t - helm-echo-input-in-header-line t)) + helm-echo-input-in-header-line t + completion-styles '(flex))) (use-package helm-rg :after helm) @@ -326,7 +327,11 @@ :bind (:map emacs-lisp-mode-map ("C-c e" . macrostep-expand))) -(use-package dockerfile-mode) +(use-package k8s-mode + :hook (k8s-mode . yas-minor-mode)) + +(use-package dockerfile-mode + :mode "/Containerfile\\(?:\\.[^/\\]*\\)?\\'") (defun qsx-dont-show-line-numbers-hook () (setq display-line-numbers nil)) @@ -421,6 +426,31 @@ (setq c-default-style "linux") +;; Taken from LLVM source tree +;; https://github.com/llvm/llvm-project/blob/c719a8596d01cef9b54f0585bd2d68d657d8659a/llvm/utils/emacs/emacs.el +(defun llvm-lineup-statement (langelem) + (let ((in-assign (c-lineup-assignments langelem))) + (if (not in-assign) + '++ + (aset in-assign 0 + (+ (aref in-assign 0) + (* 2 c-basic-offset))) + in-assign))) + +;; Add a cc-mode style for editing LLVM C and C++ code +(c-add-style "llvm.org" + '("gnu" + (fill-column . 80) + (c++-indent-level . 2) + (c-basic-offset . 2) + (indent-tabs-mode . nil) + (c-offsets-alist . ((arglist-intro . ++) + (innamespace . 0) + (member-init-intro . ++) + (statement-cont . llvm-lineup-statement))))) +;; End LLVM block +(require 'llvm-mode) + (setq tramp-default-method "ssh" tramp-terminal-type "tramp") @@ -488,7 +518,12 @@ ;; Use keypad comma as decimal separator (use-package calc :config - (define-key calc-digit-map (kbd "<kp-separator>") ".")) + (define-key calc-digit-map (kbd "<kp-separator>") ".") + + ;; Necessary for calc-digit-map kp-separator shenanigans below + ;; cf. https://debbugs.gnu.org/cgi/bugreport.cgi?bug=56117 + (if (eq window-system 'pgtk) + (pgtk-use-im-context nil))) (use-package gnuplot :mode ("\\.gp\\'" . gnuplot-mode) @@ -534,11 +569,12 @@ message-confirm-send t mail-user-agent 'gnus-user-agent read-mail-command 'gnus - gnus-gcc-mark-as-read t - gnus-user-date-format-alist `((,(gnus-seconds-today) . " T%H:%M:%S") - (,(gnus-seconds-month) . " %dT%H:%M:%S") - (,(gnus-seconds-year) . " %m-%dT%H:%M:%S") - (t . "%Y-%m-%dT%H:%M:%S")) + gnus-gcc-mark-as-read t) + (setq gnus-user-date-format-alist '(((gnus-seconds-today) . " %H:%M:%S") + ((gnus-seconds-month) . "%a %e %H:%M:%S") + ((gnus-seconds-year) . "%a %m-%d %H:%M:%S") + (t . "%a %Y-%m-%d %H:%M:%S"))) + (setq gnus-summary-line-format "%U%R %&user-date; %(%[%5k: %-23,23f%]%)%B%s\n" gnus-sum-thread-tree-single-indent " " gnus-sorted-header-list '("^From:" "^Organization:" "^Sender:" "^To:" "^Newsgroups:" "^.?Cc:" "^Subject:" "^Date:" "^Resent-.*:" "^Reply-To:" "^Followup-To:" "^X-Clacks-Overhead:" "Openpgp:" "^Authentication-Results:" "^Message-ID:") diff --git a/dot.gitconfig b/dot.gitconfig index df036b4..303ba93 100644 --- a/dot.gitconfig +++ b/dot.gitconfig @@ -11,6 +11,8 @@ lol = log --oneline --graph --decorate --all colorlog = log --date=relative --format=\"%Cblue%h%Creset %C(yellow)%an%Creset %Cgreen%ad%Creset%C(auto)%d%Creset %s\" --topo-order push-all = !git remote | xargs -L1 git push + praise = blame + rofl = log --all --graph --format='%C(green)%h%Creset %C(yellow)%an%Creset %C(blue bold)%ad%Creset %C(red bold)%d%Creset%s' --date=relative --abbrev-commit --decorate [push] default = current [pull] @@ -26,3 +28,10 @@ colorMoved = default [credential] helper = libsecret +[core] + quotePath = false + commitGraph = true +[receive] + advertisePushOptions = true +[gc] + writeCommitGraph = true @@ -11,6 +11,7 @@ path=( ~/.gem/ruby/*/bin(/N) ~/.cabal/bin(/N) $GOPATH/bin(/N) + ${KREW_ROOT:-$HOME/.krew}/bin ~/.cargo/bin(/N) ~/.poetry/bin(/N) ~/.cache/rebar3/bin(/N) @@ -32,4 +33,5 @@ fpath=( typeset -xU path manpath fpath [ -S ~/.gnupg/S.gpg-agent.ssh ] && export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh [ -S /run/user/$EUID/gnupg/S.gpg-agent.ssh ] && export SSH_AUTH_SOCK=/run/user/$EUID/gnupg/S.gpg-agent.ssh +[ -S $XDG_RUNTIME_DIR/mpd/socket ] && export MPD_HOST=$XDG_RUNTIME_DIR/mpd/socket (( $+commands[rbenv] )) && eval "$(rbenv init -)" |