From 9dfe58a7f79a90d8398c745bb6c57fe0df54e909 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Wed, 9 Nov 2022 11:46:57 +0200 Subject: [PATCH] Update esy.org --- .emacs.d/esy.org | 68 ++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/.emacs.d/esy.org b/.emacs.d/esy.org index 65b06e6..b60127e 100644 --- a/.emacs.d/esy.org +++ b/.emacs.d/esy.org @@ -162,22 +162,16 @@ For further information about Elisp headers, see [[info:elisp#Library (setq package-selected-packages - '(academic-phrases avy ace-window alert - all-the-icons all-the-icons-completion all-the-icons-dired - all-the-icons-gnus anzu auctex-latexmk bbdb benchmark-init - browse-at-remote browse-kill-ring corfu command-log-mode - dabbrev define-word diff-hl diminish disable-mouse - dockerfile-mode elfeed embark-consult erlang - exec-path-from-shell flymake-swi-prolog ggtags git-blamed - git-timemachine gitconfig-mode gitignore-mode - gnu-elpa-keyring-update gnuplot gnuplot-mode go-mode - graphviz-dot-mode haskell-mode highlight-escape-sequences - htmlize ialign keyfreq keycast iedit lin list-unicode-display - logos lorem-ipsum magit marginalia markdown-mode move-dup - no-littering ns-auto-titlebar ob-prolog olivetti orderless - org-modern paredit pdf-tools rainbow-delimiters rg slack - smtpmail-multi tramp typit vterm vundo which-key - whitespace-cleanup-mode yaml-mode) + '(academic-phrases avy ace-window alert all-the-icons + all-the-icons-completion all-the-icons-dired all-the-icons-gnus + auctex-latexmk bbdb corfu command-log-mode dabbrev define-word + diff-hl dockerfile-mode elfeed embark-consult git-timemachine + gitconfig-mode gitignore-mode gnu-elpa-keyring-update gnuplot + gnuplot-mode go-mode graphviz-dot-mode haskell-mode htmlize + ialign keycast lin logos magit marginalia markdown-mode + no-littering ob-prolog olivetti orderless org-modern paredit + pdf-tools rainbow-delimiters rg slack smtpmail-multi tramp + typit vterm vundo which-key whitespace-cleanup-mode yaml-mode) package-archive-column-width 12 package-version-column-width 28) @@ -833,6 +827,7 @@ refiling directly into deeper headings as well. (keymap-global-set "C-c l" #'org-store-link) (keymap-global-set "C-c a" #'org-agenda) (keymap-global-set "C-c !" #'consult-flymake) + (keymap-global-set "C-c f" #'fontaine-set-preset) (keymap-global-set "C-c E" #'elfeed) (keymap-global-set "C-c G" #'gnus) (keymap-global-set "C-c S" #'esy/vterm-at) @@ -908,6 +903,8 @@ refiling directly into deeper headings as well. ;; (global-set-key (kbd "M-p") #'move-dup-move-lines-up) ;; (global-set-key (kbd "M-n") #'move-dup-move-lines-down) (global-set-key (kbd "M-#") #'define-word-at-point) + (global-set-key (kbd "M-o") #'previous-buffer) + (global-set-key (kbd "M-O") #'next-buffer) (global-set-key (kbd "C-,") #'backward-delete-char) (global-set-key (kbd "C-.") #'embark-act) (global-set-key (kbd "C-;") #'avy-goto-char-timer) @@ -929,17 +926,8 @@ refiling directly into deeper headings as well. (keymap-set ctl-x-map "b" #'consult-buffer) (keymap-set ctl-x-4-map "b" #'consult-buffer-other-window) (keymap-set ctl-x-map "C-b" #'ibuffer) - (keymap-set ctl-x-map "!" #'consult-flymake) - (keymap-set ctl-x-map "l" #'org-store-link) - (keymap-set ctl-x-map "c" #'org-capture) (keymap-set ctl-x-map "o" #'ace-window) - (keymap-set ctl-x-map "F" #'esy/find-esy-org) (keymap-set ctl-x-map "O" #'other-window) - (keymap-set ctl-x-map "S" #'esy/vterm-at) - (keymap-set ctl-x-map "V" #'vertalen-at-point) - (keymap-set ctl-x-map "G" #'gnus) - (keymap-set ctl-x-map "E" #'elfeed) - (keymap-set ctl-x-map "j" #'org-agenda) (put 'set-goal-column 'disabled nil)) (add-hook 'after-init-hook #'esy/customize-ctl-x-map) @@ -1017,9 +1005,13 @@ refiling directly into deeper headings as well. :END: #+begin_src emacs-lisp + (defun esy/local-all-the-icons-dired-mode () + (unless (file-remote-p default-directory) + (all-the-icons-dired-mode))) + (with-eval-after-load 'dired - (setq dired-dwim-target t)) - (add-hook 'dired-mode-hook #'all-the-icons-dired-mode) + (setq dired-dwim-target t) + (add-hook 'dired-mode-hook #'esy/local-all-the-icons-dired-mode)) #+end_src ** vterm :cmd: @@ -1069,7 +1061,10 @@ over ssh for remote connections. '("https://lwn.net/headlines/rss" "https://reddit.com/r/prolog/.rss" "https://maggieappleton.com/rss.xml" + "https://sachachua.com/blog/feed/" + "https://ajroach42.com/feed.xml" "https://arcology.garden/updates.xml" + "https://herman.bearblog.dev/feed/" "https://matt-rickard.com/rss" "https://www.haskellforall.com/feeds/posts/default" "https://cestlaz.github.io/rss.xml" @@ -1404,7 +1399,10 @@ does in the shell. (add-to-list 'display-buffer-alist '("*Completions*" (display-buffer-reuse-window display-buffer-at-bottom) - (window-parameters . ((mode-line-format . none)))))) + (window-parameters . ((mode-line-format . none))))) + (add-to-list 'all-the-icons-extension-icon-alist + '("pl" all-the-icons-alltheicon "prolog" + :height 1.1 :face all-the-icons-lmaroon))) (add-hook 'after-init-hook #'esy/setup-minibuffer) #+end_src @@ -2073,11 +2071,12 @@ Add the timezones of places of interest to the list of clocks shown by no-littering-var-directory)) (setq sql-connection-alist (let* ((a (auth-source-search :port 5432 - :max 3 + :max 4 :require '(:user :port :secret :host))) (d (car a)) (p (cadr a)) - (c (caddr a))) + (c (caddr a)) + (e (car (cdddr a)))) `((dev (sql-product 'postgres) (sql-user ,(plist-get d :user)) @@ -2098,7 +2097,14 @@ Add the timezones of places of interest to the list of clocks shown by (sql-port 5432) (sql-password ,(funcall (plist-get c :secret))) (sql-server ,(plist-get c :host)) - (sql-database "container_graph"))))) + (sql-database "container_graph")) + (ten + (sql-product 'postgres) + (sql-user ,(plist-get e :user)) + (sql-port 5432) + (sql-password ,(funcall (plist-get e :secret))) + (sql-server ,(cadr (split-string (plist-get e :host) (rx "^")))) + (sql-database ,(car (split-string (plist-get e :host) (rx "^")))))))) (define-advice sql-comint-postgres (:around (fun &rest args) use-sql-password) (let ((process-environment -- 2.39.5