Add niri; other minor changes

emacs/init.el

@@ -1,6 +1,7 @@
-;;"GNU Emacs 30.2 (build 2, x86_64-pc-linux-gnu, GTK+ Version 3.24.50, cairo version 1.18.4)"
 (setq-local uconf-font-name "Iosevka")
-(setq custom-file (file-name-concat (file-name-directory user-init-file) "custom.el"))
+(setq custom-file
+      (file-name-concat
+       (file-name-directory user-init-file) "custom.el"))
 (setq inhibit-startup-screen t)
 (setq display-line-numbers-type 'relative)
 
@@ -14,17 +15,17 @@
 (column-number-mode 1)
 (whitespace-mode 1)
 
+(split-window-right)
+
 (keymap-global-set "C-."  'other-window)
 (keymap-global-set "C-c c"  'compile)
-(keymap-global-set "C-c C-c"  'recompile)
-
-(split-window-right)
+(keymap-global-set "C-c x"  'recompile)
 
 (require 'compile)
 (add-to-list
  'compilation-error-regexp-alist-alist
  '(paren-style
-   "^\\([^(\n]+\\)(\\([0-9]+\\),\\([0-9]+\\)):"
+   "^\\([^(\n]+\\)(\\([0-9]+\\)[,:]\\([0-9]+\\))"
    1 2 3))
 (add-to-list 'compilation-error-regexp-alist 'paren-style)
 
@@ -73,6 +74,11 @@
   (set-face-attribute 'default nil
 		      :font uconf-font-name))
 
+(require 'eglot)
+(add-to-list 'eglot-server-programs '((c++-mode c-mode) "clangd"))
+(add-hook 'c-mode-hook 'eglot-ensure)
+(add-hook 'c++-mode-hook 'eglot-ensure)
+
 (use-package magit
   :ensure t
   :bind (("C-x g" . magit-status)))