commit 9299d62785a70c92f6610fc031e2def74b4fc90d
parent 4fe218de5a555e55c0a097bfff596f3afdf32d1c
Author: Ethan Long <Ethan.Long@anu.edu.au>
Date: Tue, 23 May 2023 23:51:58 +1000
Some minor modifications xdddddd
Diffstat:
| M | init.el | | | 112 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- |
1 file changed, 110 insertions(+), 2 deletions(-)
diff --git a/init.el b/init.el
@@ -145,16 +145,22 @@
:config
(evil-collection-init))
+;; Cape
+(use-package cape
+ :ensure t)
;; Completion & Modernisation
(use-package corfu
:ensure t
+ :after cape
:custom
(corfu-cycle t)
(corfu-auto t)
(corfu-scroll-margin 5)
:init
- (global-corfu-mode))
+ (global-corfu-mode)
+ ;; Shouldn't have to do this, but lsp is a little bugged:
+ (advice-add #'lsp-completion-at-point :around #'cape-wrap-noninterruptible))
;; Some more useful configs
(use-package emacs
@@ -194,7 +200,8 @@
:ensure lsp-mode
:init
(setq gc-cons-threshold 100000000)
- (setq read-process-output-max (* 1024 1024)))
+ (setq read-process-output-max (* 1024 1024))
+ (setq lsp-completion-provider :none))
;; Haskell setup
@@ -221,4 +228,105 @@
(add-hook 'java-mode-hook #'lsp))
+;; Python setup
+(use-package lsp-pyright
+ :ensure t
+ :hook (python-mode . (lambda ()
+ (require 'lsp-pyright)
+ (lsp))))
+
+
;; Emacs crap that it does automatically:
+(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.
+ '(connection-local-criteria-alist
+ '(((:application tramp :protocol "flatpak")
+ tramp-container-connection-local-default-flatpak-profile)
+ ((:application tramp)
+ tramp-connection-local-default-system-profile tramp-connection-local-default-shell-profile)))
+ '(connection-local-profile-alist
+ '((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-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-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-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-connection-local-default-shell-profile
+ (shell-file-name . "/bin/sh")
+ (shell-command-switch . "-c"))
+ (tramp-connection-local-default-system-profile
+ (path-separator . ":")
+ (null-device . "/dev/null"))))
+ '(package-selected-packages
+ '(cape which-key use-package rust-mode rainbow-delimiters lsp-haskell ligature evil-collection doom-modeline counsel fast-scroll lsp-java corfu lsp-pyright)))
+(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.
+ )
