4 files changed, 17 insertions(+), 24 deletions(-)

M emacs.d/lisp/eglot-x.el
M emacs.d/lisp/settings.el
M emacs.d/lisp/themodor-dark.el
M hgrc
M emacs.d/lisp/eglot-x.el +2 -1
@@ 14,6 14,7 @@ 
   :hook ((elm-mode
           fsharp-mode
           csharp-mode
+          rust-mode
           csharp-tree-sitter-mode) . 'eglot-ensure)
   :config
   (setq eglot-confirm-server-initiated-edits nil))

          
@@ 78,7 79,7 @@ Don't use them, since we implement the
              `(csharp-tree-sitter-mode
                . (eglot-omnisharp
                   ;; Hacked version of this file that runs mono from brew 
-                  ,(expand-file-name "~/LSP/omnisharp-roslyn/v1.37.7/run")
+                  ,(expand-file-name "~/LSP/omnisharp-roslyn/v1.37.9/run")
                   "-lsp")))
 
 (add-to-list 'eglot-server-programs

          
M emacs.d/lisp/settings.el +13 -23
@@ 52,22 52,24 @@ 
         locale-coding-system 'utf-8  
         auto-mode-case-fold nil
         help-window-select t
-        compilation-scroll-output t))
+        compilation-scroll-output t
+        tab-always-indent 'complete)
+  ;; Completion things
+  (setq completion-styles '(flex)
+        completion-ignore-case t))
 
 (use-package elisp-mode
   :ensure nil
   :bind (("C-c C-k" . #'eval-buffer)))
 
-(use-package helm
-  :bind (("C-." . 'helm-imenu)
-         ("C-x C-f" . 'helm-find-files)
-         ("M-å" . 'helm-command-prefix)
-         ("M-x" . 'helm-M-x)
-         ("M-å r" . 'helm-register)
-         ("M-å o" . 'helm-occur))
+(use-package corfu
   :config
-  (helm-mode 1)
-  (setq completion-styles '(flex)))
+  (corfu-global-mode t))
+
+(use-package vertico
+  :config
+  (vertico-mode t)
+  (setq completions-detailed t))
 
 ;; Display buffer madness
 (setq display-buffer-base-action '(display-buffer-same-window))

          
@@ 80,18 82,6 @@ 
                         "*xref*"
                         "*sly-mrepl for sbcl"))
          display-buffer-use-some-window (inhibit-same-window . t))
-        ("*Completions*"
-         (display-buffer-in-side-window)
-         (side . right)
-         (width . 1))
-        ("*helm-mode-completion-at-point*"
-         (display-buffer-in-side-window)
-         (side . bottom)
-         (height . 1.5))
-        ("*Register Preview*"
-         (display-buffer-in-side-window)
-         (side . bottom)
-         (height . 1.5))
         (".*" display-buffer-same-window)))
 
 ;;; Windows

          
@@ 150,7 140,7 @@ 
 (defun ercodor-start ()
   (interactive)
   (load "~/.emacs.d/erc-auth.el")
-  (erc :server "irc.freenode.net"
+  (erc :server "irc.libera.chat"
        :port "6667"
        :nick "theothornhill"
        :password erc-pass))

          
M emacs.d/lisp/themodor-dark.el +1 -0
@@ 283,6 283,7 @@ Also bind `class' to ((class color) (min
    '(woman-bold   ((t (:inherit font-lock-keyword-face))))
    '(woman-italic ((t (:inherit (font-lock-string-face italic)))))
 ;;;; Third-party
+   `(vertico-current ((t (:background ,themodor-dark-bg+2))))
 ;;;;; helm
 `(helm-header
      ((,class (:foreground ,themodor-dark-fg

          
M hgrc +1 -0
@@ 48,6 48,7 @@ ll =  log -G --template '{bookmarks} {re
 # Project related aliases
 # MyPage-CI
 mpci = ci -X Gulpfile.js -X .hgignore
+mpup = !"$HG" shelve; "$HG" update -r main; "$HG" unshelve
 
 
 # Local settings