From e6a931c68add03a5cbf2714be4a087b892aafd1d Mon Sep 17 00:00:00 2001
From: Warwick <warwick.l.e.new@gmail.com>
Date: Thu, 31 Jul 2025 14:28:20 +0100
Subject: [PATCH] Added lsp stuff

---
 init.el | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 81 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index fc7217d..419bd1e 100644
--- a/init.el
+++ b/init.el
@@ -1,3 +1,6 @@
+;; Use more memory to reduce garbage collection calls
+(setq gc-cons-threshold (* 8 1024 1024)) ;; 8 MB
+
 ;; Default changes
 (setq inhibit-startup-message t)
 (scroll-bar-mode -1)
@@ -5,14 +8,24 @@
 (tooltip-mode -1)
 (menu-bar-mode -1)
 (setq visible-bell t)
+(setq warning-minimum-level :error)
+(global-visual-line-mode)
 
 ;; Line Numbers
 (global-display-line-numbers-mode t)
 (column-number-mode)
 
-;; Disable line num on these modes1
+;; Disable line num on these modes
+(dolist (mode '(term-mode-hook
+		shell-mode-hook
+		treemacs-mode-hook
+		eshell-mode-hook))
+  (add-hook mode (lambda () (display-line-numbers-mode 0))))
+ 
+;; set up use-package
 (require 'package)
 (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
+(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/"))
 (package-initialize)
 
 (unless (package-installed-p 'use-package)
@@ -56,8 +69,9 @@
   :bind-keymap ("C-c p" . projectile-command-map))
 
 (use-package magit)
+;; TODO Look into forge for git community engagement
 
-;; Make M-x all-the-icons-install-fonts available
+;; Make M-x all-the-icons-install-fonts and M-x nerd-icons-install-fonts available
 (use-package all-the-icons
   :if (display-graphic-p))
 
@@ -81,6 +95,71 @@
   ([remap describe-variable] . counsel-describe-variable)
   ([remap describe-key] . helpful-key))
 
+;; Org mode
+(use-package org)
+(use-package org-bullets
+  :after org
+  :hook (org-mode . org-bullet-mode))
+;; TODO configure to be prettier
+
+;; Tree Sitter (better syntax highlighting)
+(use-package tree-sitter)
+(use-package tree-sitter-langs
+  :after tree-sitter
+  :init
+  (global-tree-sitter-mode)
+  (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
+
+;; lsp-mode
+(use-package lsp-mode
+  :commands (lsp lsp-deferred)
+  :init (setq lsp-keymap-prefix "C-c l")
+  :hook (lsp-mode . lsp-enable-which-key-integration))
+(use-package lsp-ui
+  :hook (lsp-mode . lsp-ui-mode))
+(use-package lsp-treemacs
+  :after lsp)
+(use-package lsp-ivy)
+
+;; company (useful for showing lsp-mode popups)
+(use-package company
+  :after lsp-mode
+  :hook (lsp-mode . company-mode)
+  :bind
+  (:map company-active-map
+	("<tab>" . company-complete-selection))
+  (:map lsp-mode-map
+	("<tab>" . company-indent-or-complete-common))
+  :custom
+  (company-minimum-prefix-length 1)
+  (company-idle-delay 0.0))
+(use-package company-box
+  :hook (company-mode . company-box-mode))
+
+;; TypeScript
+(use-package typescript-mode
+  :mode ("\\.[jt]s\\'" "\\.[jt]sx\\'")
+  :hook (typescript-mode . lsp-deferred)
+  :config (setq typescript-indent-level 2))
+
+;; C/C++
+(add-hook 'c-mode-hook 'lsp)
+(add-hook 'c++-mode-hook 'lsp)
+
 ;; TODO look into general for easy custom key bindings
 ;; TODO explore theme packages
 ;; TODO consider evil?
+
+(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.
+ '(package-selected-packages
+   '(tree-sitter-langs tree-sitter lsp-ivy lsp-treemacs lsp-ui company-box company which-key use-package typescript-mode rainbow-delimiters projectile org-bullets magit lsp-mode ivy-rich helpful doom-modeline counsel all-the-icons)))
+(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.
+ )