Compare commits

...

7 Commits

Author SHA1 Message Date
3b2f0a4cb4 Fix root finding.
The problem was projectile
2025-01-30 21:19:37 +01:00
6f70238b4e Add comments 2025-01-30 13:05:24 +01:00
59bf980f10 Disable buffer-menu-evil fix
We use ibuffer anyways
2025-01-30 12:57:43 +01:00
18ad943003 Better bindings. Use ibuffer. 2025-01-30 12:55:58 +01:00
ed4bfe44c2 Elecritc + disable some linenumbers + add rainbow 2025-01-29 16:15:17 +01:00
6f14f6db88 Merge branch 'master' of git.billenius.com:love/emacs 2025-01-29 16:09:24 +01:00
e8ab36fd1e Use jetbrains mono nerd font 2025-01-29 16:08:36 +01:00

159
.emacs
View File

@ -1,9 +1,15 @@
;;; package --- Summary: Emacs init
;;; Commentary:
;; Main features are LSP support and Evil mode
;;; Code:
;; ===========================
;; Package Management Setup
;; ===========================
(require 'package)
;(setq package-check-signature nil); Add MELPA, Org, and GNU package archives
;; Add MELPA, Org, and GNU package archives
(setq package-archives '(("melpa" . "https://melpa.org/packages/")
("org" . "https://orgmode.org/elpa/")
("gnu" . "https://elpa.gnu.org/packages/")))
@ -91,24 +97,21 @@
('light
(load-theme light-theme t))
(_
;; If we cannot detect the theme, default to light
;; If we cannot detect the theme, default to light
(load-theme light-theme t)))))
;; Apply theme at startup
(my/set-theme-based-on-appearance)
;; ===========================
;; UI Customizations
;; ===========================
;; Revert buffers when the underlying file has changed
(global-auto-revert-mode 1)
;; Use ibuffer, instead of Buffer-menu-mode.
(global-set-key (kbd "C-x C-b") 'ibuffer)
;; Electric Pair Mode - Completes parentheses, quotes, etc.
(electric-pair-mode 1)
;; Replace yes-no prompts with y-n
;; Replace yes-no prompts to y-n
(defalias 'yes-or-no-p 'y-or-n-p)
;; Disable unnecessary UI elements
@ -123,8 +126,30 @@
;; Enable visual line mode globally
(global-visual-line-mode 1)
;; Disable line numbers for some modes
(dolist (mode '(dired-mode-hook
doc-view-mode-hook
eshell-mode-hook
comint-mode-hook
inferior-python-mode-hook
org-mode-hook
shell-mode-hook
term-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0))))
;; Complete parentheses, quotes, etc
(electric-pair-mode 1)
;; Set Default Font to Iosevka 18pt
(set-face-attribute 'default nil :family "Iosevka" :height 150)
;;(set-face-attribute 'default nil :family "Iosevka" :height 150)
;; Set font
(set-face-attribute 'default nil
:family "JetBrains Mono Nerd Font"
:height 140
:weight 'normal
:width 'normal)
;; Line spacing
(setq-default line-spacing 0)
;; Backup files -> ~/.emacs.d/backups/
(setq backup-directory-alist `(("." . "~/.emacs.d/backups"))
@ -148,35 +173,70 @@
(add-to-list 'exec-path "/opt/homebrew/bin")
)
;; ===========================
;; Evil Mode Configuration
;; ===========================
(use-package evil
:ensure t
:init
(setq evil-want-integration t)
(setq evil-want-keybinding nil)
(setq evil-want-integration t
evil-want-keybinding nil)
:config
(evil-mode 1)) ;; Enable Evil Mode globally
(evil-mode 1)
;; Force modes to start in Emacs state
;;(dolist (mode '(;;Buffer-menu-mode
;;;;ibuffer-mode
;;dired-mode
;;help-mode
;;bookmark-bmenu-mode
;;gnus-summary-mode
;;gnus-group-mode
;;package-menu-mode))
;;(evil-set-initial-state mode 'emacs))
;; Correct keybindings for minibuffer maps using actual keymap objects
(dolist (keymap '(minibuffer-local-map
minibuffer-local-ns-map
minibuffer-local-completion-map
minibuffer-local-must-match-map
minibuffer-local-isearch-map))
(define-key (symbol-value keymap) [escape] 'minibuffer-keyboard-quit))
;; Set escape to quit in Evil states
(with-eval-after-load 'evil-maps
(define-key evil-normal-state-map [escape] 'keyboard-quit)
(define-key evil-visual-state-map [escape] 'keyboard-quit))
(keymap-global-set "C-u" 'evil-scroll-up))
(use-package evil-collection
:init
:after evil
:ensure t
:config
(evil-collection-init))
(keymap-global-set "C-u" 'evil-scroll-up)
;;(defun my/buffer-menu-evil-fix ()
;;"Disable Evil's C-n and C-p in `Buffer-menu-mode'."
;;(evil-define-key 'normal Buffer-menu-mode-map
;;(kbd "C-n") nil
;;(kbd "C-p") nil))
;;
;;(add-hook 'buffer-menu-mode-hook #'my/buffer-menu-evil-fix)
;; ===========================
;; Additional Packages
;; ===========================
;; Install and enable Helm
(use-package helm
:config
(helm-mode 1))
;; Skip helm for now, since it interferes with evil
;;(use-package helm
;;:ensure t
;;:init
;;(setq helm-display-function #'helm-default-display-buffer) ;; Fix potential display issues
;;:config
;;(helm-mode 1)
;;(define-key helm-map (kbd "<tab>") 'helm-execute-persistent-action) ;; Better navigation
;;(define-key helm-map (kbd "C-z") 'helm-select-action)) ;; Show actions list
;; Install and enable Company Mode globally
(use-package company
@ -187,13 +247,14 @@
(setq company-minimum-prefix-length 1
company-idle-delay 0.0)) ;; Show completions immediately
;; Install and configure Projectile
(use-package projectile
:init
(projectile-mode)
:config
(projectile-mode +1)
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)
(setq projectile-project-search-path '("~/Documents/Code/"))
)
(setq projectile-project-root-files '(".git" ".lsp-root"))
;;(setq projectile-project-root-files-bottom-up '(".git" ".clangd"))
(projectile-mode +1))
;; Install and bind Magit
(use-package magit
@ -204,6 +265,10 @@
:config
(which-key-mode))
(use-package rainbow-delimiters
:ensure t
:hook (prog-mode . rainbow-delimiters-mode))
;; ===========================
;; LSP Configuration
;; ===========================
@ -215,9 +280,35 @@
(rust-mode . lsp))
:commands lsp
:config
(setq lsp-prefer-flymake nil) ;; Use lsp-ui and flycheck instead of flymake
(setq lsp-enable-snippet t) ;; Disable snippet support if not needed
(setq lsp-headerline-breadcrumb-enable nil)) ;; Disable breadcrumb for performance
(setq lsp-prefer-flymake nil)
(setq lsp-enable-snippet t)
(setq lsp-headerline-breadcrumb-enable nil)
;; Enhanced project root detection with debug logging
(defun my/lsp-get-project-root ()
"Find the project root by locating the nearest .git directory with validation."
(let* ((current-file (or (buffer-file-name) default-directory))
(root-dir (locate-dominating-file current-file ".git"))
(valid-root (when root-dir
(expand-file-name root-dir))))
(when valid-root
(message "[LSP] Detected project root: %s" valid-root)
valid-root)))
;; Set project root detection for C/C++ before LSP initializes
(add-hook 'c-mode-hook (lambda ()
(setq-local lsp-project-root-function #'my/lsp-get-project-root)
(message "[LSP] C mode root: %s" (my/lsp-get-project-root))))
(add-hook 'c++-mode-hook (lambda ()
(setq-local lsp-project-root-function #'my/lsp-get-project-root)
(message "[LSP] C++ mode root: %s" (my/lsp-get-project-root))))
;; Configure ignored directories for better performance
(setq lsp-file-watch-ignored '("[/\\\\]\\.git$"
"[/\\\\]build$"
"[/\\\\]bin$"
"[/\\\\]tests$")))
(use-package lsp-ui
:commands lsp-ui-mode
@ -272,6 +363,16 @@
(setq rust-format-on-save t)
)
;; ===========================
;; C/C++ Line Length Configuration
;; ===========================
(defun my/c-mode-line-limit ()
"Set 80-character line limit for C/C++ files."
(setq fill-column 80)
(display-fill-column-indicator-mode 1)
)
(add-hook 'c-mode-hook #'my/c-mode-line-limit)
(message "Emacs init loaded.")
(custom-set-variables
;; custom-set-variables was added by Custom.
@ -280,7 +381,7 @@
;; If there is more than one, they won't work right.
'(helm-minibuffer-history-key "M-p")
'(package-selected-packages
'(lsp-mode lsp-pyright zenburn-theme which-key solarized-theme rust-mode projectile poetry magit lsp-ui lsp-treemacs kotlin-mode helm flycheck evil-collection dracula-theme company better-defaults)))
'(helm-evil rainbow-delimiters rainbow-delimiter catppuccin-theme lsp-pyright zenburn-theme which-key solarized-theme rust-mode projectile poetry magit lsp-ui lsp-treemacs kotlin-mode helm flycheck evil-collection dracula-theme company better-defaults)))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.