3 files changed, 17 insertions(+), 20 deletions(-)

M emacs.d/init.el
M emacs.d/lisp/eglot-x.el
M emacs.d/lisp/settings.el
M emacs.d/init.el +0 -11
@@ 33,17 33,6 @@ 
   :ensure nil
   :load-path "lisp")
 
-(use-package themodor
-  :ensure nil
-  :load-path "lisp"
-  ;; :config (enable-theme 'themodor)
-  )
-
-(use-package frende-theme
-  :ensure nil
-  :load-path "lisp"
-  :config (load-theme 'frende t))
-
 (use-package eglot-x
   :ensure nil
   :load-path "lisp")

          
M emacs.d/lisp/eglot-x.el +3 -2
@@ 13,9 13,10 @@ 
               ("C-c d" . 'eglot-find-workspace-diagnostics))
   :hook ((elm-mode
           fsharp-mode
-          csharp-mode
+;;          csharp-mode
           rust-mode
-          csharp-tree-sitter-mode) . 'eglot-ensure)
+;;          csharp-tree-sitter-mode
+          ) . 'eglot-ensure)
   :config
   (setq eglot-confirm-server-initiated-edits nil
         eglot-send-changes-idle-time 0

          
M emacs.d/lisp/settings.el +14 -7
@@ 33,6 33,7 @@ 
   (column-number-mode)
   (line-number-mode)
   (global-prettify-symbols-mode t)
+  (load-theme 'modus-operandi t)
   (setq-default fill-column 80
                 indent-tabs-mode nil
                 truncate-lines t

          
@@ 281,6 282,7 @@ 
 ;;; Third party packages
 
 (use-package corfu
+  :pin gnu
   :init
   (corfu-global-mode t)
   :config

          
@@ 299,6 301,7 @@ 
           geiser-repl-mode) . paredit-mode))
 
 (use-package yasnippet
+  :pin gnu
   :config
   (setq yas-snippet-dirs '("~/.emacs.d/snippets"))
   (yas-global-mode t))

          
@@ 317,19 320,20 @@ 
 (install-subrepo-package 'elm-mode)
 (install-subrepo-package 'fsharp-mode)
 
-(use-package tree-sitter :defer t)
+;; (use-package tree-sitter :defer t)
 
-(use-package tree-sitter-langs :defer t)
+;; (use-package tree-sitter-langs :defer t)
 
-(use-package tree-sitter-indent :ensure nil :defer t)
+;; (use-package tree-sitter-indent :ensure nil :defer t)
 
 (use-package csharp-mode
   :defer t
   :mode (("\\.csproj$" . nxml-mode)
-         ("\\.cake$" . csharp-tree-sitter-mode)
-         ("\\.cs\\'" . csharp-tree-sitter-mode))
-  :bind (:map csharp-tree-sitter-mode-map
-              ("C-c t" . 'dotnet-run-test-at-point)))
+         ("\\.cake$" . csharp-mode)
+         ("\\.cs\\'" . csharp-mode))
+  ;; :bind (:map csharp-tree-sitter-mode-map
+  ;;             ("C-c t" . 'dotnet-run-test-at-point))
+  )
 
 (use-package sly
   :defer t

          
@@ 339,6 343,9 @@ 
   (setq inferior-lisp-program "sbcl"
         sly-symbol-completion-mode nil))
 
+
+(use-package rust-mode :defer p)
+
 ;; Ligatures
 (let ((alist `((?! . ,(regexp-opt '("!!" "!=" "!==")))
                (?# . ,(regexp-opt '("##" "###" "####" "#(" "#?" "#[" "#_" "#_(" "#{")))