summaryrefslogtreecommitdiff
path: root/emacs/init.el
diff options
context:
space:
mode:
authorThomas Ulmer <thomas.ulmer@redflagai.co>2025-06-03 14:41:03 -0700
committerThomas Ulmer <thomas.ulmer@redflagai.co>2025-06-12 15:17:20 -0700
commit9bb4b169d7348f73dd2a23f5e7572f6ccafaafa3 (patch)
treed81ef0a0f686023e25d5baa97461c05ed82ed974 /emacs/init.el
parentac236f968cff321012826d4e45b394994ede336a (diff)
indentation
Diffstat (limited to 'emacs/init.el')
-rw-r--r--emacs/init.el295
1 files changed, 132 insertions, 163 deletions
diff --git a/emacs/init.el b/emacs/init.el
index 3a8a874..8bf0340 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -561,23 +561,23 @@ the cyclic ordering. Don't involve windows that are dedicated."
(haskell-mode . interactive-haskell-mode))
(use-package ocp-indent)
(let ((opam-share (ignore-errors (car (process-lines "opam" "var" "share")))))
- (when (and opam-share (file-directory-p opam-share))
- ;; Register Merlin
- (add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
- (autoload 'merlin-mode "merlin" nil t nil)
- ;; Automatically start it in OCaml buffers
- (add-hook 'tuareg-mode-hook 'merlin-mode t)
- (add-hook 'caml-mode-hook 'merlin-mode t)
- ;; Use opam switch to lookup ocamlmerlin binary
- (setq merlin-command 'opam)
- ;; To easily change opam switches within a given Emacs session, you can
- ;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode
- ;; and use one of its "OPSW" menus.
- ))
+ (when (and opam-share (file-directory-p opam-share))
+ ;; Register Merlin
+ (add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
+ (autoload 'merlin-mode "merlin" nil t nil)
+ ;; Automatically start it in OCaml buffers
+ (add-hook 'tuareg-mode-hook 'merlin-mode t)
+ (add-hook 'caml-mode-hook 'merlin-mode t)
+ ;; Use opam switch to lookup ocamlmerlin binary
+ (setq merlin-command 'opam)
+ ;; To easily change opam switches within a given Emacs session, you can
+ ;; install the minor mode https://github.com/ProofGeneral/opam-switch-mode
+ ;; and use one of its "OPSW" menus.
+ ))
(use-package racket-mode)
(use-package rustic)
(progn ; elisp
- (keymap-set emacs-lisp-mode-map "C-c r" 'raise-sexp))
+ (keymap-set emacs-lisp-mode-map "C-c r" 'raise-sexp))
(use-package compile
:custom
@@ -667,7 +667,7 @@ changes."
(kill-buffer buf)
(setq exwm-randr-workspace-monitor-plist out-plist))
(while (> exwm-workspace-number (length exwm-workspace--list))
- (exwm-workspace-add)))
+ (exwm-workspace-add)))
(add-hook 'exwm-randr-screen-change-hook #'my/exwm-auto-workspace-montior)
(defun my/exwm-set-buffer-name ()
@@ -689,8 +689,8 @@ changes."
(interactive "p")
;; based on other-frame
(let ((filter-f (function (lambda (f)
- (and (exwm-workspace--active-p f)
- (not (eq (selected-frame) f))))))
+ (and (exwm-workspace--active-p f)
+ (not (eq (selected-frame) f))))))
(sframe (selected-frame))
(frame (selected-frame)))
(while (> arg 0)
@@ -740,36 +740,36 @@ changes."
(exwm-manage-force-tiling t)
(exwm-input-global-keys
- `(
- ([?\M-r] . exwm-reset)
- ;; Bind "s-w" to window switcher
- ([?\M-W] . consult-buffer)
- ([?\M-o] . other-window)
- ([?\M-O] . my/exwm-other-workspace)
-
- ([?\M-D] . my/dmenu)
- ([?\M-E] . my/browser)
- ([M-return] . eshell)
- ))
+ `(
+ ([?\M-r] . exwm-reset)
+ ;; Bind "s-w" to window switcher
+ ([?\M-W] . consult-buffer)
+ ([?\M-o] . other-window)
+ ([?\M-O] . my/exwm-other-workspace)
+
+ ([?\M-D] . my/dmenu)
+ ([?\M-E] . my/browser)
+ ([M-return] . eshell)
+ ))
(exwm-input-simulation-keys
- '(;; movement
- ([?\C-b] . [left])
- ([?\M-b] . [C-left])
- ([?\C-f] . [right])
- ([?\M-f] . [C-right])
- ([?\C-p] . [up])
- ([?\C-n] . [down])
- ([?\C-a] . [home])
- ([?\C-e] . [end])
- ([?\M-v] . [prior])
- ([?\C-v] . [next])
- ([?\C-d] . [delete])
- ([?\C-k] . [S-end delete])
- ;; cut/paste.
- ;; ([?\C-w] . [?\C-x])
- ([?\M-w] . [?\C-c])
- ([?\C-y] . [?\C-v])
- ([?\C-s] . [?\C-f])))
+ '(;; movement
+ ([?\C-b] . [left])
+ ([?\M-b] . [C-left])
+ ([?\C-f] . [right])
+ ([?\M-f] . [C-right])
+ ([?\C-p] . [up])
+ ([?\C-n] . [down])
+ ([?\C-a] . [home])
+ ([?\C-e] . [end])
+ ([?\M-v] . [prior])
+ ([?\C-v] . [next])
+ ([?\C-d] . [delete])
+ ([?\C-k] . [S-end delete])
+ ;; cut/paste.
+ ;; ([?\C-w] . [?\C-x])
+ ([?\M-w] . [?\C-c])
+ ([?\C-y] . [?\C-v])
+ ([?\C-s] . [?\C-f])))
:bind (:map exwm-mode-map
("C-q" . 'exwm-input-send-next-key)
("M-!" . 'shell-command)))
@@ -965,37 +965,29 @@ BEG and END define the region."
;; If there is more than one, they won't work right.
'(comment-style 'extra-line)
'(connection-local-criteria-alist
- '(((:application eshell :protocol "ssh" :user "tmu" :machine
- "cnoserver")
+ '(((:application eshell :protocol "ssh" :user "tmu" :machine "cnoserver")
autogenerated-connection-local-profile/\(:application\ eshell\ :protocol\ \"ssh\"\ :user\ \"tmu\"\ :machine\ \"cnoserver\"\))
- ((:application vc-git :protocol "ssh" :user "tmu" :machine
- "cnoserver")
+ ((:application vc-git :protocol "ssh" :user "tmu" :machine "cnoserver")
autogenerated-connection-local-profile/\(:application\ vc-git\ :protocol\ \"ssh\"\ :user\ \"tmu\"\ :machine\ \"cnoserver\"\))
- ((:application vc-git) vc-git-connection-default-profile)
+ ((:application vc-git)
+ vc-git-connection-default-profile)
((:application tramp :protocol "kubernetes")
tramp-kubernetes-connection-local-default-profile)
((:application tramp :protocol "flatpak")
- tramp-container-connection-local-default-flatpak-profile
- tramp-flatpak-connection-local-default-profile)
+ tramp-container-connection-local-default-flatpak-profile tramp-flatpak-connection-local-default-profile)
((:application tramp)
- tramp-connection-local-default-system-profile
- tramp-connection-local-default-shell-profile)
- ((:application eshell) eshell-connection-default-profile)))
+ tramp-connection-local-default-system-profile tramp-connection-local-default-shell-profile)
+ ((:application eshell)
+ eshell-connection-default-profile)) t)
'(connection-local-profile-alist
'((autogenerated-connection-local-profile/\(:application\ eshell\ :protocol\ \"ssh\"\ :user\ \"tmu\"\ :machine\ \"cnoserver\"\)
- (eshell-path-env-list "/bin" "/usr/bin" "/sbin" "/usr/sbin"
- "/usr/local/bin" "/usr/local/sbin"))
+ (eshell-path-env-list "/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin"))
(autogenerated-connection-local-profile/\(:application\ vc-git\ :protocol\ \"ssh\"\ :user\ \"tmu\"\ :machine\ \"cnoserver\"\)
(vc-git--program-version . "2.48.1"))
- (vc-git-connection-default-profile (vc-git--program-version))
+ (vc-git-connection-default-profile
+ (vc-git--program-version))
(tramp-flatpak-connection-local-default-profile
- (tramp-remote-path "/app/bin" tramp-default-remote-path "/bin"
- "/usr/bin" "/sbin" "/usr/sbin"
- "/usr/local/bin" "/usr/local/sbin"
- "/local/bin" "/local/freeware/bin"
- "/local/gnu/bin" "/usr/freeware/bin"
- "/usr/pkg/bin" "/usr/contrib/bin" "/opt/bin"
- "/opt/sbin" "/opt/local/bin"))
+ (tramp-remote-path "/app/bin" tramp-default-remote-path "/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/freeware/bin" "/local/gnu/bin" "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin" "/opt/bin" "/opt/sbin" "/opt/local/bin"))
(tramp-kubernetes-connection-local-default-profile
(tramp-config-check . tramp-kubernetes--current-context-data)
(tramp-extra-expand-args 97
@@ -1008,114 +1000,92 @@ BEG and END define the region."
(tramp-kubernetes--context-namespace
(car tramp-current-connection))))
(tramp-container-connection-local-default-flatpak-profile
- (tramp-remote-path "/app/bin" tramp-default-remote-path "/bin"
- "/usr/bin" "/sbin" "/usr/sbin"
- "/usr/local/bin" "/usr/local/sbin"
- "/local/bin" "/local/freeware/bin"
- "/local/gnu/bin" "/usr/freeware/bin"
- "/usr/pkg/bin" "/usr/contrib/bin" "/opt/bin"
- "/opt/sbin" "/opt/local/bin"))
+ (tramp-remote-path "/app/bin" tramp-default-remote-path "/bin" "/usr/bin" "/sbin" "/usr/sbin" "/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/freeware/bin" "/local/gnu/bin" "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin" "/opt/bin" "/opt/sbin" "/opt/local/bin"))
(tramp-connection-local-darwin-ps-profile
- (tramp-process-attributes-ps-args "-acxww" "-o"
- "pid,uid,user,gid,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "-o" "state=abcde" "-o"
- "ppid,pgid,sess,tty,tpgid,minflt,majflt,time,pri,nice,vsz,rss,etime,pcpu,pmem,args")
- (tramp-process-attributes-ps-format (pid . number)
- (euid . number)
- (user . string)
- (egid . number) (comm . 52)
- (state . 5) (ppid . number)
- (pgrp . number)
- (sess . number)
- (ttname . string)
- (tpgid . number)
- (minflt . number)
- (majflt . number)
- (time . tramp-ps-time)
- (pri . number)
- (nice . number)
- (vsize . number)
- (rss . number)
- (etime . tramp-ps-time)
- (pcpu . number)
- (pmem . number) (args)))
+ (tramp-process-attributes-ps-args "-acxww" "-o" "pid,uid,user,gid,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" "-o" "state=abcde" "-o" "ppid,pgid,sess,tty,tpgid,minflt,majflt,time,pri,nice,vsz,rss,etime,pcpu,pmem,args")
+ (tramp-process-attributes-ps-format
+ (pid . number)
+ (euid . number)
+ (user . string)
+ (egid . number)
+ (comm . 52)
+ (state . 5)
+ (ppid . number)
+ (pgrp . number)
+ (sess . number)
+ (ttname . string)
+ (tpgid . number)
+ (minflt . number)
+ (majflt . number)
+ (time . tramp-ps-time)
+ (pri . number)
+ (nice . number)
+ (vsize . number)
+ (rss . number)
+ (etime . tramp-ps-time)
+ (pcpu . number)
+ (pmem . number)
+ (args)))
(tramp-connection-local-busybox-ps-profile
- (tramp-process-attributes-ps-args "-o"
- "pid,user,group,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "-o" "stat=abcde" "-o"
- "ppid,pgid,tty,time,nice,etime,args")
- (tramp-process-attributes-ps-format (pid . number)
- (user . string)
- (group . string) (comm . 52)
- (state . 5) (ppid . number)
- (pgrp . number)
- (ttname . string)
- (time . tramp-ps-time)
- (nice . number)
- (etime . tramp-ps-time)
- (args)))
+ (tramp-process-attributes-ps-args "-o" "pid,user,group,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" "-o" "stat=abcde" "-o" "ppid,pgid,tty,time,nice,etime,args")
+ (tramp-process-attributes-ps-format
+ (pid . number)
+ (user . string)
+ (group . string)
+ (comm . 52)
+ (state . 5)
+ (ppid . number)
+ (pgrp . number)
+ (ttname . string)
+ (time . tramp-ps-time)
+ (nice . number)
+ (etime . tramp-ps-time)
+ (args)))
(tramp-connection-local-bsd-ps-profile
- (tramp-process-attributes-ps-args "-acxww" "-o"
- "pid,euid,user,egid,egroup,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "-o"
- "state,ppid,pgid,sid,tty,tpgid,minflt,majflt,time,pri,nice,vsz,rss,etimes,pcpu,pmem,args")
- (tramp-process-attributes-ps-format (pid . number)
- (euid . number)
- (user . string)
- (egid . number)
- (group . string) (comm . 52)
- (state . string)
- (ppid . number)
- (pgrp . number)
- (sess . number)
- (ttname . string)
- (tpgid . number)
- (minflt . number)
- (majflt . number)
- (time . tramp-ps-time)
- (pri . number)
- (nice . number)
- (vsize . number)
- (rss . number)
- (etime . number)
- (pcpu . number)
- (pmem . number) (args)))
+ (tramp-process-attributes-ps-args "-acxww" "-o" "pid,euid,user,egid,egroup,comm=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" "-o" "state,ppid,pgid,sid,tty,tpgid,minflt,majflt,time,pri,nice,vsz,rss,etimes,pcpu,pmem,args")
+ (tramp-process-attributes-ps-format
+ (pid . number)
+ (euid . number)
+ (user . string)
+ (egid . number)
+ (group . string)
+ (comm . 52)
+ (state . string)
+ (ppid . number)
+ (pgrp . number)
+ (sess . number)
+ (ttname . string)
+ (tpgid . number)
+ (minflt . number)
+ (majflt . number)
+ (time . tramp-ps-time)
+ (pri . number)
+ (nice . number)
+ (vsize . number)
+ (rss . number)
+ (etime . number)
+ (pcpu . number)
+ (pmem . number)
+ (args)))
(tramp-connection-local-default-shell-profile
- (shell-file-name . "/bin/sh") (shell-command-switch . "-c"))
+ (shell-file-name . "/bin/sh")
+ (shell-command-switch . "-c"))
(tramp-connection-local-default-system-profile
- (path-separator . ":") (null-device . "/dev/null"))
- (eshell-connection-default-profile (eshell-path-env-list))))
+ (path-separator . ":")
+ (null-device . "/dev/null"))
+ (eshell-connection-default-profile
+ (eshell-path-env-list))) t)
'(custom-safe-themes
- '("6f5e3fd2b4245ffe660da69ea5c13ab392337e94776dfb23cc1d8d0f80e3baa2"
- "1b8c2fd98bf6777d8b95f8cf98fdaede88feee3419ec3e5008f94b56618ac6ca"
- "0cc5046b7981609166c28b64f6185fa5f73bcb00d21e037f304794c6aaa1f340"
- "9f2e4e8b2ddbfdd392eedbc123649d94654278dee5a53b899557224416413d35"
- "6dafb31ade9ff07229faaf05c41c2ae475c44731362b792f65f3930b1a2c9cfd"
- "dc77e008092a5a4aa6b6ed8e4826bebf8f2fb930a8de073bf7f458efd884cca8"
- "d1ff3e66028f9c527298580d2a64f9e3280f07f9e94d4dada72b67ef15069441"
- "3d4e3644e237a95683daa73e397c4c0d1ae06bbaaf8040104232591a28bc1315"
- "12a07bc38295e4b06a8965db261f51ea7ea61fbf91b3ef41298bbb549d1d9403"
- default))
+ '("aee99e2118e960b53016623dc2345d88227d1236d28c6c34858e1d55575cf7c3" "6f5e3fd2b4245ffe660da69ea5c13ab392337e94776dfb23cc1d8d0f80e3baa2" "1b8c2fd98bf6777d8b95f8cf98fdaede88feee3419ec3e5008f94b56618ac6ca" "0cc5046b7981609166c28b64f6185fa5f73bcb00d21e037f304794c6aaa1f340" "9f2e4e8b2ddbfdd392eedbc123649d94654278dee5a53b899557224416413d35" "6dafb31ade9ff07229faaf05c41c2ae475c44731362b792f65f3930b1a2c9cfd" "dc77e008092a5a4aa6b6ed8e4826bebf8f2fb930a8de073bf7f458efd884cca8" "d1ff3e66028f9c527298580d2a64f9e3280f07f9e94d4dada72b67ef15069441" "3d4e3644e237a95683daa73e397c4c0d1ae06bbaaf8040104232591a28bc1315" "12a07bc38295e4b06a8965db261f51ea7ea61fbf91b3ef41298bbb549d1d9403" default))
'(ede-project-directories
- '("/home/tmu/Desktop/eway/sway" "/home/tmu/Desktop/eway/cage"
- "/home/tmu/Desktop/eway/wlroots" "/home/tmu/Desktop/eway/comp"
- "/home/tmu/Desktop/eway"))
+ '("/home/tmu/Desktop/eway/sway" "/home/tmu/Desktop/eway/cage" "/home/tmu/Desktop/eway/wlroots" "/home/tmu/Desktop/eway/comp" "/home/tmu/Desktop/eway"))
'(eglot-events-buffer-config '(:size 0 :format full))
'(fortune-dir "/usr/share/fortune/")
'(gdb-non-stop-setting nil)
'(helm-minibuffer-history-key "M-p")
'(menu-bar-mode nil)
'(package-selected-packages
- '(balanced-windows bash-completion benchmark-init cape consult
- corfu-terminal counsel-embark eat ednc embark
- embark-consult embark-counsel esh-help
- evil-collection evil-easymotion evil-snipe
- evil-surround exwm-modeline fold-this free-keys
- haskell-mode hl-todo ibuffer-vc lsp-haskell
- magit marginalia minions ocp-indent orderless
- pass pyvenv racket-mode rustic sdcv shelldon
- sideline-flycheck sideline-flymake sideline-lsp
- treemacs-evil vertico visible-mark vterm winum))
+ '(balanced-windows bash-completion benchmark-init cape consult corfu-terminal counsel-embark eat ednc embark embark-consult embark-counsel esh-help evil-collection evil-easymotion evil-snipe evil-surround exwm-modeline fold-this free-keys haskell-mode hl-todo ibuffer-vc lsp-haskell magit marginalia minions ocp-indent orderless pass pyvenv racket-mode rustic sdcv shelldon sideline-flycheck sideline-flymake sideline-lsp treemacs-evil vertico visible-mark vterm winum))
'(pyim-assistant-scheme 'cangjie)
'(safe-local-variable-values '((LEXICAL-binding . t)))
'(scroll-bar-mode nil)
@@ -1123,8 +1093,7 @@ BEG and END define the region."
'(tool-bar-mode nil)
'(transient-mark-mode nil)
'(whitespace-style
- '(face trailing tabs lines-tail missing-newline-at-eof indentation
- space-after-tab space-before-tab tab-mark) t))
+ '(face trailing tabs lines-tail missing-newline-at-eof indentation space-after-tab space-before-tab tab-mark) t))
(custom-set-faces
;; custom-set-faces was added by Custom.