diff --git a/README.org b/README.org index 052d271b..6fb3f98b 100644 --- a/README.org +++ b/README.org @@ -265,7 +265,7 @@ Probably the prettiest and best modeline I've found. :ensure t :init (doom-modeline-mode 1) - (setq doom-modeline-height 45 + (setq doom-modeline-height 30 doom-modeline-bar-width 3 all-the-icons-scale-factor 0.9 doom-modeline-hud nil @@ -501,6 +501,10 @@ This evil-collection package includes a lot of other evil based things. "wk" '(evil-window-up :which-key "up window") "wh" '(evil-window-left :which-key "left window") "wl" '(evil-window-right :which-key "right window") + "wH" '(evil-window-move-far-left :which-key "right window") + "wK" '(evil-window-move-very-top :which-key "right window") + "wJ" '(evil-window-move-very-bottom :which-key "right window") + "wL" '(evil-window-move-far-right :which-key "right window") ";" '(execute-extended-command :which-key "execute command") ":" '(eval-expression :which-key "evaluate expression")) (general-def 'minibuffer-local-map @@ -1952,7 +1956,11 @@ Since I like to make my window manager handle a lot of the window management, I "Return non-nil if function SYM is autoloaded." (-when-let (file-name (buffer-file-name buf)) (setq file-name (s-chop-suffix ".gz" file-name)) - (help-fns--autoloaded-p sym file-name))) + (condition-case nil + (help-fns--autoloaded-p sym file-name) + ; new in Emacs 29.0.50 + ; see https://github.com/Wilfred/helpful/pull/283 + (error (help-fns--autoloaded-p sym))))) (defun helpful--skip-advice (docstring) "Remove mentions of advice from DOCSTRING." @@ -2832,7 +2840,7 @@ Let's add our own eshell prompt. and set the password cache to a significantly h (setenv "CHROME_EXECUTABLE" "/usr/bin/qutebrowser") (setenv "JAVA_HOME" "/usr/lib/jvm/default") - (add-hook 'eshell-mode-hook '(display-line-numbers-mode -1)) + (add-hook 'eshell-mode-hook (lambda () (display-line-numbers-mode -1))) (setq eshell-command-aliases-list '(("q" "exit") @@ -2842,6 +2850,7 @@ Let's add our own eshell prompt. and set the password cache to a significantly h ("bd" "eshell-up $1") ("rg" "rg --color=always $*") ("ll" "ls -lah $*") + ("less" "view-file $1") ("gg" "magit-status") ("clear" "clear-scrollback") ("!c" "eshell-previous-input 2") diff --git a/init.el b/init.el index 7e4ac05c..40ffa6af 100644 --- a/init.el +++ b/init.el @@ -108,7 +108,7 @@ :ensure t :init (doom-modeline-mode 1) - (setq doom-modeline-height 45 + (setq doom-modeline-height 30 doom-modeline-bar-width 3 all-the-icons-scale-factor 0.9 doom-modeline-hud nil @@ -249,6 +249,10 @@ "wk" '(evil-window-up :which-key "up window") "wh" '(evil-window-left :which-key "left window") "wl" '(evil-window-right :which-key "right window") + "wH" '(evil-window-move-far-left :which-key "right window") + "wK" '(evil-window-move-very-top :which-key "right window") + "wJ" '(evil-window-move-very-bottom :which-key "right window") + "wL" '(evil-window-move-far-right :which-key "right window") ";" '(execute-extended-command :which-key "execute command") ":" '(eval-expression :which-key "evaluate expression")) (general-def 'minibuffer-local-map @@ -1343,7 +1347,11 @@ targets." "Return non-nil if function SYM is autoloaded." (-when-let (file-name (buffer-file-name buf)) (setq file-name (s-chop-suffix ".gz" file-name)) - (help-fns--autoloaded-p sym file-name))) + (condition-case nil + (help-fns--autoloaded-p sym file-name) + ; new in Emacs 29.0.50 + ; see https://github.com/Wilfred/helpful/pull/283 + (error (help-fns--autoloaded-p sym))))) (defun helpful--skip-advice (docstring) "Remove mentions of advice from DOCSTRING." @@ -1964,7 +1972,7 @@ targets." (setenv "CHROME_EXECUTABLE" "/usr/bin/qutebrowser") (setenv "JAVA_HOME" "/usr/lib/jvm/default") - (add-hook 'eshell-mode-hook '(display-line-numbers-mode -1)) + (add-hook 'eshell-mode-hook (lambda () (display-line-numbers-mode -1))) (setq eshell-command-aliases-list '(("q" "exit") @@ -1974,6 +1982,7 @@ targets." ("bd" "eshell-up $1") ("rg" "rg --color=always $*") ("ll" "ls -lah $*") + ("less" "view-file $1") ("gg" "magit-status") ("clear" "clear-scrollback") ("!c" "eshell-previous-input 2") @@ -2432,19 +2441,3 @@ interfere with the default `bongo-playlist-buffer'." gcmh-verbose nil)) (setq warning-suppress-types '((comp))) -(custom-set-variables - ;; custom-set-variables was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(pdf-misc-print-program "/usr/bin/lpr") - '(pdf-misc-print-program-args '("-o media=Letter" "-o fitplot")) - '(safe-local-variable-values - '((projectile-project-run-cmd . "./build/bin/presenter") - (projectile-project-compilation-cmd . "cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -B build/ . && make -j8 --dir build/ && rm -rf ~/.cache/librepresenter/LibrePresenter/qmlcache/")))) -(custom-set-faces - ;; custom-set-faces was added by Custom. - ;; If you edit it by hand, you could mess it up, so be careful. - ;; Your init file should contain only one such instance. - ;; If there is more than one, they won't work right. - '(org-modern-tag ((t :background "#9aedfe" :foreground "#282a36"))))