1 files changed, 29 insertions, 44 deletions

diff --git a/lisp/general.el b/lisp/general.el
index 95966e4..720ae79 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -65,6 +65,12 @@
 ;; Line highlighting
 (global-hl-line-mode 1)
 
+;; Set delay to 0
+(setq show-paren-delay 0)
+
+;; Line selection color
+(set-face-attribute 'region nil :background "#3b3911")
+
 ;; Initial major mode
 (setq initial-major-mode 'text-mode)
 
@@ -80,6 +86,7 @@
 ;; Modeline
 (use-package mood-line
   ;; Enable mood-line
+  :ensure t
   :config
   (mood-line-mode))
 
@@ -139,7 +146,7 @@
   ;; (setq vertico-scroll-margin 0)
 
   ;; Show more candidates
-  ;; (setq vertico-count 20)
+  (setq vertico-count 24)
 
   ;; Grow and shrink the Vertico minibuffer
   ;; (setq vertico-resize t)
@@ -197,7 +204,6 @@
   (define-key projectile-mode-map (kbd "C-c p f") 'projectile-ripgrep)
   (define-key projectile-mode-map (kbd "C-c p o") 'projectile-switch-project)
   (define-key projectile-mode-map (kbd "C-c p p") 'projectile-find-file)
-
   )
 
 
@@ -216,21 +222,6 @@
   (define-fringe-bitmap 'git-gutter-fr:modified [224] nil nil '(center repeated))
   (define-fringe-bitmap 'git-gutter-fr:deleted [128 192 224 240] nil nil 'bottom))
 
-(use-package magit
-  :ensure t)
-
-;; Emojis
-;; (use-package emojify
-;;   :ensure t
-;;   :config
-;;   (when (member "Segoe UI Emoji" (font-family-list))
-;;     (set-fontset-font
-;;      t 'symbol (font-spec :family "Segoe UI Emoji") nil 'prepend))
-;;   (setq emojify-display-style 'unicode)
-;;   (setq emojify-emoji-styles '(unicode))
-;;   (bind-key* (kbd "C-c e") #'emojify-insert-emoji)) ; override binding i
-;;  n any mode
-
 ;; icons
 (use-package all-the-icons
   :ensure t
@@ -245,22 +236,22 @@
   :defer t
   :init (add-hook 'after-init-hook 'global-company-mode)
   :config
-  (setq company-idle-delay              0.1
-        company-minimum-prefix-length   2
+  (setq company-minimum-prefix-length   2
         company-tooltip-limit           10
         company-backends                '((company-capf company-gtags company-elisp company-css company-dabbrev company-nxml))
         company-dabbrev-downcase nil
+        company-idle-delay nil
         )
+  (define-key company-mode-map (kbd "M-c") #'company-complete)
   )
 
-(use-package company-quickhelp
-  :ensure t
-  :defer t
-  :init (company-quickhelp-mode 1)
-  :config
-  (setq company-quickhelp-delay 0.1)
-  (setq company-quickhelp-color-background (face-attribute 'default :background))
-  )
+;; (use-package company-quickhelp
+;;   :ensure t
+;;   :defer t
+;;   :init (company-quickhelp-mode 1)
+;;   :config
+;;   (setq company-quickhelp-color-background (face-attribute 'default :background))
+;;   )
 
 ;; Eglot
 (use-package eglot
@@ -269,30 +260,17 @@
   :ensure t
   :bind ("<f2>" . #'eglot-rename)
   :config
-  (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd-19"))
-  (add-to-list 'eglot-server-programs `((dart-mode) "/home/matthew/Programs/flutter/bin/dart" "language-server"))
+  (add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd-18"))
+  (add-to-list 'eglot-server-programs `((dart-mode) "/home/matthew/Github/flutter/bin/dart" "language-server"))
   (add-hook 'c-mode-common-hook 'eglot-ensure)
-  (add-hook 'dart-mode-hook 'eglot-ensure))
+  (add-hook 'dart-mode-hook 'eglot-ensure)
+  (advice-add 'jsonrpc--log-event :override #'ignore))
 
 ;; (set-face-underline 'eglot-highlight-symbol-face t)
 
 (bind-key* (kbd "M-n") 'flymake-goto-next-error)
 (bind-key* (kbd "M-p") 'flymake-goto-prev-error)
 
-;; Vterm
-
-(defun vterm-mode-set-colors()
-	"Set the colors of vterm to match my personal taste."
-	(setq-local global-hl-line-mode nil)
-	;(turn-off-evil-mode)
-	(display-line-numbers-mode -1)
-	(setq left-fringe-width  0)
-	(setq right-fringe-width  0)
-	(set-window-fringes (selected-window) 0 0 nil)
-	(face-remap-add-relative 'default '(:background "#232627"))
-	(face-remap-add-relative 'default '(:foreground"#fcfcfc"))
-	)
-
 ;; Line movement
 (use-package drag-stuff
   :config
@@ -333,6 +311,13 @@
           (lambda ()
             (setq indent-line-function (lambda () 'noindent))))
 
+(use-package ultra-scroll
+  :load-path "~/.emacs.d/lisp/ultra-scroll" ; if you git clone'd instead of package-vc-install
+  :init
+  (setq scroll-conservatively 101 ; important!
+        scroll-margin 0) 
+  :config
+  (ultra-scroll-mode 1))
 
 (provide 'general)
 ;;; general.el ends here