adding rust and go support to dev settings

dev-settings-work.el

@@ -0,0 +1,96 @@
+;;; dev-settings-work.el --- Work-specific development configuration (Windows)
+
+;;; C# Configuration
+
+(use-package csharp-mode
+  :defer t
+  :hook (csharp-mode . eglot-ensure)
+  :config
+  ;; C# LSP server configuration
+  ;; Install via: dotnet tool install --global csharp-ls
+  (add-to-list 'eglot-server-programs
+               '(csharp-mode . ("csharp-ls")))
+  (add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-mode)))
+
+;; DAP for .NET debugging
+(with-eval-after-load 'dap-mode
+  (require 'dap-netcore)
+  (setq dap-netcore-install-dir (expand-file-name "~/.emacs.d/.extension/vscode/ms-dotnettools.csharp")))
+
+;;; Python Configuration
+
+(use-package python-ts-mode
+  :ensure nil  ; Built-in with tree-sitter
+  :mode "\\.py\\'"
+  :hook (python-ts-mode . eglot-ensure)
+  :config
+  (setq python-shell-interpreter "python3"))
+
+;; Python debugging configuration
+(with-eval-after-load 'dap-mode
+  (require 'dap-python)
+  (setq dap-python-debugger 'debugpy))
+
+;; Python virtual environment support
+(use-package pyvenv
+  :defer t
+  :commands (pyvenv-activate pyvenv-workon))
+
+;;; JavaScript/TypeScript Configuration
+
+;; Use built-in js-mode with eglot (no js2-mode needed)
+(use-package js-mode
+  :ensure nil  ; Built-in
+  :mode "\\.js\\'"
+  :hook (js-mode . eglot-ensure)
+  :config
+  (setq js-indent-level 2))
+
+;; TypeScript with tree-sitter
+(use-package typescript-ts-mode
+  :ensure nil  ; Built-in with tree-sitter
+  :mode (("\\.ts\\'" . typescript-ts-mode)
+         ("\\.tsx\\'" . tsx-ts-mode))
+  :hook ((typescript-ts-mode . eglot-ensure)
+         (tsx-ts-mode . eglot-ensure))
+  :config
+  (setq typescript-ts-mode-indent-offset 2))
+
+;;; Node.js Configuration
+
+;; Node.js REPL
+(use-package nodejs-repl
+  :defer t
+  :commands nodejs-repl)
+
+;; JSON support
+(use-package json-ts-mode
+  :ensure nil  ; Built-in with tree-sitter
+  :mode "\\.json\\'")
+
+;;; Additional Web Development Tools
+
+;; Web mode for HTML/JSX/template files
+(use-package web-mode
+  :defer t
+  :mode ("\\.html\\'"
+         "\\.vue\\'")
+  :config
+  (setq web-mode-markup-indent-offset 2
+        web-mode-css-indent-offset 2
+        web-mode-code-indent-offset 2))
+
+;; CSS with tree-sitter
+(use-package css-ts-mode
+  :ensure nil  ; Built-in with tree-sitter
+  :mode "\\.css\\'"
+  :config
+  (setq css-indent-offset 2))
+
+;; REST client for API testing
+(use-package restclient
+  :defer t
+  :mode ("\\.http\\'" . restclient-mode))
+
+(provide 'dev-settings-work)
+;;; dev-settings-work.el ends here

dev-settings.el

@@ -0,0 +1,195 @@
+;;; dev-settings.el --- Development environment configuration
+
+;; Disable warnings for config files
+(setq byte-compile-warnings '(not free-vars unresolved noruntime lexical make-local))
+
+;;; Package Management
+(require 'use-package)
+(setq use-package-always-ensure t)
+
+;;; Core Development Packages
+
+;; Company - autocomplete
+(use-package company
+  :defer 1
+  :config
+  (global-company-mode)
+  (setq company-idle-delay 0.2
+        company-minimum-prefix-length 2
+        company-show-numbers t
+        company-tooltip-align-annotations t))
+
+;; Eglot - Built-in LSP client (Emacs 29+)
+(use-package eglot
+  :ensure nil  ; Built-in to Emacs 29+
+  :defer t
+  :commands (eglot eglot-ensure)
+  :config
+  ;; Disable intrusive features
+  (setq eglot-autoshutdown t
+        eglot-send-changes-idle-time 0.5)
+  ;; Disable eldoc signature help and documentation on hover
+  (setq eldoc-echo-area-use-multiline-p nil)
+  (add-to-list 'eglot-stay-out-of 'eldoc))
+
+;; DAP Mode - Debug Adapter Protocol
+(use-package dap-mode
+  :defer t
+  :commands (dap-mode dap-debug)
+  :config
+  (require 'dap-gdb-lldb)  ; C/C++
+  (require 'dap-cpptools))
+
+;;; Tree-sitter Configuration (Emacs 29+)
+;; Tree-sitter is built-in to Emacs 29+
+;; Language grammars need to be installed separately
+
+;; Automatically install tree-sitter grammars
+(use-package treesit-auto
+  :custom
+  (treesit-auto-install t)  ; Auto-install without prompting
+  :config
+  (treesit-auto-add-to-auto-mode-alist 'all)
+  (global-treesit-auto-mode))
+
+;;; C/C++ Configuration
+
+(use-package c-ts-mode
+  :ensure nil  ; Built-in
+  :mode (("\\.c\\'" . c-ts-mode)
+         ("\\.h\\'" . c-ts-mode)
+         ("\\.cpp\\'" . c++-ts-mode)
+         ("\\.hpp\\'" . c++-ts-mode)
+         ("\\.cc\\'" . c++-ts-mode)
+         ("\\.cxx\\'" . c++-ts-mode))
+  :hook ((c-ts-mode . eglot-ensure)
+         (c++-ts-mode . eglot-ensure))
+  :config
+  (setq c-ts-mode-indent-offset 4))
+
+;; Install clangd for C/C++ LSP support
+;; Arch: sudo pacman -S clang
+;; Windows: Download from LLVM releases
+
+;;; Go Configuration
+
+(use-package go-ts-mode
+  :ensure nil  ; Built-in to Emacs 29+
+  :mode "\\.go\\'"
+  :hook (go-ts-mode . eglot-ensure)
+  :config
+  (setq go-ts-mode-indent-offset 4))
+
+;; Install gopls for Go LSP support
+;; Arch: sudo pacman -S go gopls
+;; Debug adapter: go install github.com/go-delve/delve/cmd/dlv@latest
+
+(with-eval-after-load 'dap-mode
+  (require 'dap-dlv-go))
+
+;;; Rust Configuration
+
+(use-package rust-ts-mode
+  :ensure nil  ; Built-in to Emacs 29+
+  :mode "\\.rs\\'"
+  :hook (rust-ts-mode . eglot-ensure)
+  :config
+  (setq rust-ts-mode-indent-offset 4))
+
+;; Install rust-analyzer for Rust LSP support
+;; Arch: sudo pacman -S rust rust-analyzer
+
+(with-eval-after-load 'eglot
+  (add-to-list 'eglot-server-programs
+               '(rust-ts-mode . ("rust-analyzer"))))
+
+(with-eval-after-load 'dap-mode
+  (require 'dap-gdb-lldb))
+
+;; Note: Rust debugging uses the same gdb-lldb adapter as C/C++
+;; configured in the DAP Mode section above
+
+;;; Common Lisp Configuration
+
+(use-package slime
+  :defer t
+  :commands slime
+  :config
+  (setq inferior-lisp-program "sbcl")
+  (setq slime-contribs '(slime-fancy slime-company))
+  (setq slime-lisp-implementations
+        '((sbcl ("sbcl") :coding-system utf-8-unix)
+          (ccl ("ccl") :coding-system utf-8-unix))))
+
+(use-package slime-company
+  :defer t
+  :after (slime company)
+  :config
+  (setq slime-company-completion 'fuzzy))
+
+;;; Emacs Lisp Configuration
+
+(use-package elisp-mode
+  :ensure nil
+  :hook ((emacs-lisp-mode . eldoc-mode)
+         (emacs-lisp-mode . company-mode)))
+
+;; Better elisp docs
+(use-package helpful
+  :defer t
+  :commands (helpful-callable helpful-variable helpful-key))
+
+;;; Additional Useful Packages
+
+(use-package smartparens
+  :defer 1
+  :hook (prog-mode . smartparens-mode)
+  :config
+  (require 'smartparens-config))
+
+;; Snippets
+(use-package yasnippet
+  :defer 2
+  :config
+  (yas-global-mode 1))
+
+(use-package yasnippet-snippets
+  :defer t
+  :after yasnippet)
+
+;;; LSP Keybindings
+(with-eval-after-load 'general
+  (rh/leader-keys
+    "g"  '(:ignore t :which-key "lsp/go-to")
+    "gd" '(xref-find-definitions :which-key "go to definition")
+    "gr" '(xref-find-references :which-key "find references")
+    "gi" '(eglot-find-implementation :which-key "go to implementation")
+    "gt" '(eglot-find-typeDefinition :which-key "go to type definition")
+    "gh" '(eldoc-doc-buffer :which-key "show documentation")
+    "gs" '(eldoc :which-key "signature help")
+    "ga" '(eglot-code-actions :which-key "code actions")
+    "gn" '(eglot-rename :which-key "rename symbol")
+    "ge" '(flymake-show-buffer-diagnostics :which-key "show diagnostics")
+    "gf" '(eglot-format-buffer :which-key "format buffer")
+    
+    "d"  '(:ignore t :which-key "debug")
+    "dd" '(dap-debug :which-key "start debugging")
+    "db" '(dap-breakpoint-toggle :which-key "toggle breakpoint")
+    "dc" '(dap-continue :which-key "continue")
+    "dn" '(dap-next :which-key "step over")
+    "di" '(dap-step-in :which-key "step into")
+    "do" '(dap-step-out :which-key "step out")
+    "dr" '(dap-restart-frame :which-key "restart")
+    "dq" '(dap-disconnect :which-key "quit/disconnect")
+    "de" '(dap-eval :which-key "eval expression")
+    "dl" '(dap-ui-locals :which-key "show locals")
+    "ds" '(dap-ui-sessions :which-key "show sessions")))
+
+;;; Conditional loading of work-specific settings (Windows only)
+(when (eq system-type 'windows-nt)
+  (let ((work-settings (expand-file-name "dev-settings-work.el" user-emacs-directory)))
+    (when (file-exists-p work-settings)
+      (load work-settings))))
+
+(provide 'dev-settings)
+;;; dev-settings.el ends here

init.el

@@ -12,14 +12,6 @@
 (setq display-line-numbers-type 'relative)
 (global-display-line-numbers-mode)
 
-;;disable line numbers for modes where it's weird
-(dolist (mode '(org-mode-hook
-		term-mode-hook
-		shell-mode-hook
-		eshell-mode-hook))
-  (add-hook mode (lambda () (display-line-numbers-mode 0))))
-
-
 ;;disable file backups
 (setq make-backup-files nil)
 (setq create-lockfiles nil)
@@ -28,21 +20,10 @@
 (setq vc-follows-symlinks t
       find-file-visit-truename t)
 
-;; Font Stuff ------------------------------------------------------------------
-(defvar rh/default-font-size 180)
-(set-face-attribute 'default nil :font "Fira Code Retina" :height rh/default-font-size)
-
-;; Set the fixed pitch face
-(set-face-attribute 'fixed-pitch nil :font "Fira Code Retina" :height 260)
-
-;; Set the variable pitch face
-(set-face-attribute 'variable-pitch nil :font "Cantarell" :height 295 :weight 'regular)
-
 ;; Package Manager -------------------------------------------------------------
 (require 'package)
 
-(setq package-archives '(("mepla" . "https://melpa.org/packages/")
-			 ("org" . "https://orgmode.org/elpa")
+(setq package-archives '(("melpa" . "https://melpa.org/packages/")
 			 ("elpa" . "https://elpa.gnu.org/packages/")))
 
 (package-initialize)
@@ -70,7 +51,7 @@
 
 ;;change delimeters to different colors to help identify them
 (use-package rainbow-delimiters
-  :hook (prod-mode . rainbow-delimiters-mode))
+  :hook (prog-mode . rainbow-delimiters-mode))
 
 ;; Replace the line at the bottom with something more stylish
 (use-package doom-modeline
@@ -133,9 +114,28 @@
     :prefix "SPC"
     :global-prefix "C-SPC")
 
-  (rune/leader-keys
+  (rh/leader-keys
     "t"  '(:ignore t :which-key "toggles")
-    "tt" '(counsel-load-theme :which-key "choose theme")))
+    "tt" '(consult-theme :which-key "choose theme")
+
+    "f"  '(:ignore t :which-key "files")
+    "ff" '(find-file :which-key "find file")
+    "fr" '(consult-recent-file :which-key "recent files")
+    "fb" '(consult-buffer :which-key "switch buffer")
+    
+    "o"  '(:ignore t :which-key "org")
+    "oa" '(org-agenda :which-key "agenda")
+    "oc" '(org-capture :which-key "capture")
+    "ol" '(org-store-link :which-key "store link")
+    "oi" '(org-insert-link :which-key "insert link")
+    "ot" '(org-todo :which-key "cycle todo")
+    "os" '(org-schedule :which-key "schedule")
+    "od" '(org-deadline :which-key "deadline")
+    "oT" '(org-time-stamp :which-key "timestamp")
+    "op" '(org-priority :which-key "priority")
+    "ox" '(org-toggle-checkbox :which-key "toggle checkbox")
+    "o-" '(org-ctrl-c-minus :which-key "insert item/cycle list type")
+    "or" '(org-refile :which-key "refile")))
 
 (use-package evil
   :init
@@ -203,9 +203,6 @@
   ;; Use default terminal for SSH (if relevant)
   (magit-process-find-password-functions '(magit-process-password-auth-source)))
 
-(use-package evil-magit
-  :after magit)
-
 ;; IDK what this stuff is but it shows up automatically ------------------------
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
@@ -224,52 +221,12 @@
 
 (defun rh/org-mode-setup ()
   (org-indent-mode)
-  (variable-pitch-mode 1)
   (visual-line-mode 1))
 
-
-(defun rh/org-font-setup ()
-  ;; Replace list hyphen with dot
-  (font-lock-add-keywords 'org-mode
-                          '(("^ *\\([-]\\) "
-                             (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))))
-
-  ;; Set faces for heading levels
-  (dolist (face '((org-level-1 . 1.2)
-                  (org-level-2 . 1.1)
-                  (org-level-3 . 1.05)
-                  (org-level-4 . 1.0)
-                  (org-level-5 . 1.1)
-                  (org-level-6 . 1.1)
-                  (org-level-7 . 1.1)
-                  (org-level-8 . 1.1)))
-    (set-face-attribute (car face) nil :font "Cantarell" :weight 'regular :height (cdr face)))
-
-  ;; Ensure that anything that should be fixed-pitch in Org files appears that way
-  (set-face-attribute 'org-block nil :foreground nil :inherit 'fixed-pitch)
-  (set-face-attribute 'org-code nil   :inherit '(shadow fixed-pitch))
-  (set-face-attribute 'org-table nil   :inherit '(shadow fixed-pitch))
-  (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch))
-  (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch))
-  (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch))
-  (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch))
-
 (use-package org
   :hook (org-mode . rh/org-mode-setup)
   :config
-  (setq org-ellipsis " ▾")
-  (rh/org-font-setup))
+  (setq org-agenda-files (directory-files-recursively "~/org" "\\.org$")))
 
-(use-package org-bullets
-  :after org
-  :hook (org-mode . org-bullets-mode)
-  :custom
-  (org-bullets-bullet-list '("◉" "○" "●" "○" "●" "○" "●")))
-
-(defun rh/org-mode-visual-fill ()
-  (setq visual-fill-column-width 100
-        visual-fill-column-center-text t)
-  (visual-fill-column-mode 1))
-
-(use-package visual-fill-column
-  :hook (org-mode . rh/org-mode-visual-fill))
+;; Development Environment -----------------------------------------------------
+(load (expand-file-name "dev-settings.el" user-emacs-directory))