X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/180cab37b6034248c12a50d0a77360b52ef1fbfe..08146d0e9a7916a3ace810c30ca52d1721d1a00f:/init.org?ds=sidebyside diff --git a/init.org b/init.org index 371ec1e..e2c87b3 100644 --- a/init.org +++ b/init.org @@ -28,7 +28,7 @@ having fast startup times. - [[#header][Header]] - [[#initial-setup][Initial setup]] - [[#core][Core]] -- [[#post-init][Post initialization]] +- [[#post-initialization][Post initialization]] - [[#footer][Footer]] * Header @@ -264,7 +264,6 @@ contain the mess. `((".*" ,(no-littering-expand-var-file-name "auto-save/") t)))) #+end_src - ** Custom file (=custom.el=) I'm not planning on using the custom file much, but even so, I @@ -287,15 +286,15 @@ Let's use [[https://github.com/purcell/exec-path-from-shell][exec-path-from-shel in my shell. #+begin_src emacs-lisp -;; (use-package exec-path-from-shell -;; :defer 1 -;; :init -;; (setq exec-path-from-shell-check-startup-files nil) -;; :config -;; (exec-path-from-shell-initialize) -;; ;; while we're at it, let's fix access to our running ssh-agent -;; (exec-path-from-shell-copy-env "SSH_AGENT_PID") -;; (exec-path-from-shell-copy-env "SSH_AUTH_SOCK")) +(use-package exec-path-from-shell + :defer 1 + :init + (setq exec-path-from-shell-check-startup-files nil) + :config + (exec-path-from-shell-initialize) + ;; while we're at it, let's fix access to our running ssh-agent + (exec-path-from-shell-copy-env "SSH_AGENT_PID") + (exec-path-from-shell-copy-env "SSH_AUTH_SOCK")) #+end_src ** Server @@ -322,11 +321,11 @@ See [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Emacs-Server.htm *** Smaller fringe -Set fringe to a small value so we don't have big borders in EXWM, but -can still see the =diff-hl= colors in the fringe. +Might want to set the fringe to a smaller value, especially if using +EXWM. I'm fine with the default for now. #+begin_src emacs-lisp -(fringe-mode '(3 . 1)) +;; (fringe-mode '(3 . 1)) #+end_src *** Disable disabled commands @@ -461,14 +460,15 @@ Roll your own modal mode *** [[https://github.com/ch11ng/exwm][EXWM]] (window manager) #+begin_src emacs-lisp -;; (use-package exwm -;; :config -;; (require 'exwm-config) -;; (exwm-config-default) -;; (require 'exwm-systemtray) -;; (exwm-systemtray-enable) -;; (require 'exwm-randr) -;; (exwm-randr-enable)) +(use-package exwm + :demand t + :config + (require 'exwm-config) + (exwm-config-default) + (require 'exwm-systemtray) + (exwm-systemtray-enable) + (require 'exwm-randr) + (exwm-randr-enable)) #+end_src *** [[https://orgmode.org/][Org mode]] @@ -520,39 +520,39 @@ There's no way I could top that, so I won't attempt to. **** Ivy #+begin_src emacs-lisp -;; (use-package ivy -;; :bind -;; (:map ivy-minibuffer-map -;; ([escape] . keyboard-escape-quit) -;; ("C-j" . ivy-next-line) -;; ("C-k" . ivy-previous-line) -;; ([S-up] . ivy-previous-history-element) -;; ([S-down] . ivy-next-history-element) -;; ("DEL" . ivy-backward-delete-char)) -;; :config -;; (ivy-mode 1)) +(use-package ivy + :bind + (:map ivy-minibuffer-map + ([escape] . keyboard-escape-quit) + ("C-j" . ivy-next-line) + ("C-k" . ivy-previous-line) + ([S-up] . ivy-previous-history-element) + ([S-down] . ivy-next-history-element) + ("DEL" . ivy-backward-delete-char)) + :config + (ivy-mode 1)) #+end_src **** Swiper #+begin_src emacs-lisp -;; (use-package swiper -;; :bind (([remap isearch-forward] . swiper) -;; ([remap isearch-backward] . swiper))) +(use-package swiper + :bind (([remap isearch-forward] . swiper) + ([remap isearch-backward] . swiper))) #+end_src **** Counsel #+begin_src emacs-lisp -;; (use-package counsel -;; :bind (([remap execute-extended-command] . counsel-M-x) -;; ([remap find-file] . counsel-find-file) -;; ("s-r" . counsel-recentf) -;; :map minibuffer-local-map -;; ("C-r" . counsel-minibuffer-history)) -;; :config -;; (counsel-mode 1) -;; (defalias 'locate #'counsel-locate)) +(use-package counsel + :bind (([remap execute-extended-command] . counsel-M-x) + ([remap find-file] . counsel-find-file) + ("s-r" . counsel-recentf) + :map minibuffer-local-map + ("C-r" . counsel-minibuffer-history)) + :config + (counsel-mode 1) + (defalias 'locate #'counsel-locate)) #+end_src * Borg's =layer/essentials= @@ -638,7 +638,7 @@ TODO: break this giant source block down into individual org sections. * Post initialization :PROPERTIES: -:CUSTOM_ID: post-init +:CUSTOM_ID: post-initialization :END: Display how long it took to load the init file.