diff options
| author | Thomas Ulmer <thomasmulmer02@gmail.com> | 2025-03-12 10:18:42 -0700 |
|---|---|---|
| committer | Thomas Ulmer <thomasmulmer02@gmail.com> | 2025-03-12 10:18:42 -0700 |
| commit | 8300912bb63fc3918385f9e6d2a9777f62f164a2 (patch) | |
| tree | 032c134345ac4f8ac58125453bcaeab2538f0c44 /emacs/init.el | |
| parent | 2576f016153baa11c6e62deeb329dd72f0aa89c8 (diff) | |
firefox files and new emacs stuff
Diffstat (limited to 'emacs/init.el')
| -rw-r--r-- | emacs/init.el | 262 |
1 files changed, 163 insertions, 99 deletions
diff --git a/emacs/init.el b/emacs/init.el index 6c29450..29a39fc 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -7,21 +7,31 @@ ;; If there is more than one, they won't work right. '(comment-style 'extra-line) '(connection-local-criteria-alist - '(((:application vc-git) - vc-git-connection-default-profile) + '(((: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 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))) '(connection-local-profile-alist - '((vc-git-connection-default-profile - (vc-git--program-version)) + '((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)) (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 @@ -34,91 +44,127 @@ (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)))) '(custom-safe-themes - '("6f5e3fd2b4245ffe660da69ea5c13ab392337e94776dfb23cc1d8d0f80e3baa2" "1b8c2fd98bf6777d8b95f8cf98fdaede88feee3419ec3e5008f94b56618ac6ca" "0cc5046b7981609166c28b64f6185fa5f73bcb00d21e037f304794c6aaa1f340" "9f2e4e8b2ddbfdd392eedbc123649d94654278dee5a53b899557224416413d35" "6dafb31ade9ff07229faaf05c41c2ae475c44731362b792f65f3930b1a2c9cfd" "dc77e008092a5a4aa6b6ed8e4826bebf8f2fb930a8de073bf7f458efd884cca8" "d1ff3e66028f9c527298580d2a64f9e3280f07f9e94d4dada72b67ef15069441" "3d4e3644e237a95683daa73e397c4c0d1ae06bbaaf8040104232591a28bc1315" "12a07bc38295e4b06a8965db261f51ea7ea61fbf91b3ef41298bbb549d1d9403" default)) + '("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)) '(gdb-non-stop-setting nil) '(helm-minibuffer-history-key "M-p") '(menu-bar-mode nil) '(package-selected-packages - '(em-term em-hist embark-consult embark eat em-smart all-the-icons-completion all-the-icons marginalia visible-mark benchmark-init sideline-lsp sideline-flymake sideline-flycheck sideline lsp-haskell lsp-sourcekit emacs-lsp elisp-sandbox elsa lsp-mode corfu evil-config which-key orderless vertico evil)) + '(2048-game all-the-icons-completion amsreftex auctex benchmark-init + bongo buffer-move cape chinese-conv cmake-mode + company-go corfu corfu-terminal counsel-projectile + cuda-mode dockerfile-mode doom-modeline dumb-jump eat + edit-indirect eglot embark-consult ement + emms-player-simple-mpv emms-state esh-help + eshell-fringe-status eshell-vterm esup evil-collection + evil-easymotion evil-snipe evil-surround + exwm-firefox-evil exwm-modeline eyebrowse fish-mode + flycheck-aspell flymake-aspell + flymake-diagnostic-at-point fold-this folding free-keys + frog-jump-buffer gdscript-mode gxref haskell-mode + helm-exwm helm-hoogle highlight hindent hl-todo + ibuffer-project ibuffer-projectile imenu-anywhere + ivy-hydra ivy-prescient lsp-haskell magit marginalia + markdown-preview-mode minions nginx-mode oauth2 + orderless pass password-store + persp-mode-projectile-bridge popwin pyim-basedict + pyim-cangjiedict racket-mode rainbow-delimiters rustic + sdcv sideline-flycheck sideline-flymake sideline-lsp + simple-httpd spell-fu telephone-line tempel + tree-sitter-langs treemacs treemacs-evil + vertico-prescient vimgolf visible-mark volume which-key + workgroups yaml-mode)) '(pyim-assistant-scheme 'cangjie) '(safe-local-variable-values '((LEXICAL-binding . t))) '(scroll-bar-mode nil) @@ -126,7 +172,8 @@ '(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)) ;; --------------------------------------------------------------------- ;; non-package specific config @@ -153,6 +200,7 @@ (setq async-shell-command-buffer 'new-buffer) ;; start additional async shell commands in new buffers without asking (setq-default proced-auto-update-flag t) +(setq-default proced-auto-update-interval 1) ;; always auto update proced ;; -------------------------------------------------------------------- @@ -202,12 +250,6 @@ nil (window-parameters (mode-line-format . none))))) -(use-package all-the-icons) -(use-package all-the-icons-completion - :after (marginalia all-the-icons) - :hook (marginalia-mode . all-the-icons-completion-marginalia-setup) - :init (all-the-icons-completion-mode)) - (use-package orderless ;; ordering (minibuffer) completions :custom @@ -231,18 +273,24 @@ (corfu-quit-no-match t) :bind (("M-/" . completion-at-point))) +(use-package corfu-terminal + :init + ;; (corfu-terminal-mode 1) + :custom + (corfu-terminal-disable-on-gui nil)) + (use-package cape ;; extend completion frameworks :bind ("C-c p" . cape-prefix-map) :config (advice-add 'pcomplete-completions-at-point :around 'cape-wrap-silent) (advice-add 'pcomplete-completions-at-point :around 'cape-wrap-purify) - :custom - (completion-at-point-functions . '(cape-dict - tags-completion-at-point-function - cape-keyword - cape-dabbrev - cape-symbol))) + :init + (setq completion-at-point-functions '(cape-dict + tags-completion-at-point-function + cape-keyword + cape-dabbrev + cape-symbol))) (use-package dabbrev ;; Swap M-/ and C-M-/ @@ -346,24 +394,40 @@ (keymap-set eshell-hist-mode-map "C-c C-n" 'next-line) (keymap-set eshell-hist-mode-map "C-c C-p" 'previous-line) (keymap-set eshell-mode-map "C-l" 'eshell/clear) - (add-hook 'eshell-mode-hook 'eldoc-mode)) + (add-hook 'eshell-mode-hook 'eldoc-mode) + (add-hook 'eshell-mode-hook (lambda () (evil-local-mode -1))) + :custom + (eshell-prefer-lisp-functions t)) (use-package eat :init (add-hook 'eshell-load-hook #'eat-eshell-mode) - (add-hook 'eshell-load-hook #'eat-eshell-visual-command-mode) - (push "pass" eshell-visual-commands)) + (add-hook 'eshell-load-hook #'eat-eshell-visual-command-mode)) + +;; file browser +(use-package treemacs + :bind (("C-c t" . treemacs))) + +;; password integration +(use-package password-store) +(use-package auth-source-pass + :init (auth-source-pass-enable)) +(use-package pass + :custom + (pass-supress-confirmations t)) +(setq epg-pinentry-mode 'loopback) ;; ---------------------------------------------------------------------- ;; my custom stuff -;; (require 'evil-config) +(require 'evil-config) (require 'my-funcs) (require 'my-binds) (require 'coding-config) (require 'modeline-config) (require 'general-text) (require 'exwm-pref) +(require 'irc-config) ;; ---------------------------------------------------------------------- ;; theme stuff |
