Stub out lsp config, reorganise

custom-vars.el

@@ -5,8 +5,10 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    '("b54376ec363568656d54578d28b95382854f62b74c32077821fdfd604268616a" default))
+ '(org-agenda-files '("~/Documents/notes/todo.org"))
  '(package-selected-packages
-   '(evil-collection which-key vterm use-package rainbow-delimiters pdf-tools org-roam-ui org-modern nix-mode magit kagi gruvbox-theme gotham-theme evil doom-themes doom-modeline-now-playing crdt consult-org-roam command-log-mode catppuccin-theme)))
+   '(dap-mode lsp-ui lsp-mode marginalia vertico evil-collection which-key vterm use-package rainbow-delimiters pdf-tools org-roam-ui org-modern nix-mode magit kagi gruvbox-theme gotham-theme evil doom-themes doom-modeline-now-playing crdt consult-org-roam command-log-mode catppuccin-theme))
+ '(visible-bell nil))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

init.el

@@ -1,12 +1,22 @@
-(setq inhibit-startup-message t)
 (scroll-bar-mode -1)
 (tool-bar-mode -1)
 (tooltip-mode -1)
 (set-fringe-mode 10)
 (menu-bar-mode -1)
 
+(setq inhibit-startup-message t)
 (setq visible-bell nil)
 (setq ring-bell-function 'ignore)
+(setq auto-save-timeout '5)
+(setq auto-save-interval '20)
+(setq global-auto-revert-non-file-buffers t)
+(setq custom-file (locate-user-emacs-file "custom-vars.el"))
+(load custom-file 'noerror 'nomessage)
+
+(setq use-dialog-box nil)
+(global-auto-revert-mode 1)
+(setq global-auto-rever-non-file-buffers t)
+
 
 (require 'package)
 (setq package-archives '(("melpa" . "https://melpa.org/packages/")
@@ -42,14 +52,13 @@
 		vterm-mode-hook))
   (add-hook mode (lambda () (display-line-numbers-mode 0))))
 
-(setq global-auto-revert-non-file-buffers t)
 (use-package which-key
   :init (which-key-mode)
   :diminish which-key-mode
   :config
   (setq which-key-idle-delay 0))
 
-(set-face-attribute 'default nil :font "FiraCode Nerd Font" :height 100)
+(set-face-attribute 'default nil :font "FiraCode Nerd Font" :height 150)
 
 (use-package kagi
   :ensure t
@@ -87,13 +96,13 @@
 (setq interprogram-paste-function 'wl-paste)
 
 
+;; Enable Evil
 (unless (package-installed-p 'evil)
   (package-install 'evil))
 
-;; Enable Evil
 (require 'evil)
-(evil-mode 1)
 (setq evil-want-keybing nil)
+(evil-mode 1)
 
 (use-package evil-collection
   :ensure t
@@ -101,22 +110,87 @@
   :init
   (evil-collection-init))
 
-
 ;; org
-(setq org-roam-directory (file-truename "~/Documents/notes"))
-(setq org-roam-dailies-directory (file-truename "~/Documents/notes/daily/"))
+(use-package org-roam
+  :ensure t
+  :custom
+  (org-roam-directory (file-truename "~/Documents/notes"))
+  (org-roam-dailies-directory (file-truename "~/Documents/notes"))
+  (org-roam-completion-everywhere t)
+  (org-roam-dailies-capture-templates
+    '(("d" "default" entry "* %<%I:%M %p>: %?"
+       :if-new (file+head "%<%Y-%m-%d>.org" "#+title: %<%Y-%m-%d>\n"))))
+  :bind (("C-c n l" . org-roam-buffer-toggle)
+         ("C-c n f" . org-roam-node-find)
+         ("C-c n i" . org-roam-node-insert)
+         :map org-mode-map
+         ("C-M-i" . completion-at-point)
+         :map org-roam-dailies-map
+         ("Y" . org-roam-dailies-capture-yesterday)
+         ("T" . org-roam-dailies-capture-tomorrow))
+  :bind-keymap
+  ("C-c n d" . org-roam-dailies-map)
+  :config
+  (require 'org-roam-dailies) ;; Ensure the keymap is available
+  (org-roam-db-autosync-mode))
 (org-roam-db-autosync-mode)
-
-(setq auto-save-timeout '5)
-(setq auto-save-interval '20)
+;; Bind this to C-c n I
+(defun org-roam-node-insert-immediate (arg &rest args)
+  (interactive "P")
+  (let ((args (cons arg args))
+        (org-roam-capture-templates (list (append (car org-roam-capture-templates)
+                                                  '(:immediate-finish t)))))
+    (apply #'org-roam-node-insert args)))
 
 (setq org-agenda-files '("~/Documents/notes/daily/"))
 (save-place-mode 1)
 
-(setq custom-file (locate-user-emacs-file "custom-vars.el"))
-(load custom-file 'noerror 'nomessage)
+;; vertico
+(unless (package-installed-p 'vertico)
+  (package-install 'vertico))
 
-(setq use-dialog-box nil)
-(global-auto-revert-mode 1)
-(setq global-auto-rever-non-file-buffers t)
-;; test
+(use-package vertico
+  :ensure t
+  :bind (:map vertico-map
+         ("C-j" . vertico-next)
+         ("C-k" . vertico-previous)
+         ("C-f" . vertico-exit)
+         :map minibuffer-local-map
+         ("M-h" . backward-kill-word))
+  :custom
+  (vertico-cycle t)
+  :init
+  (vertico-mode))
+
+(use-package savehist
+  :init
+  (savehist-mode))
+
+(use-package marginalia
+  :after vertico
+  :ensure t
+  :custom
+  (marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil))
+  :init
+  (marginalia-mode))
+
+;; lsp
+;; (use-package lsp-mode
+;;   :init
+;;   ;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
+;;   (setq lsp-keymap-prefix "C-c l")
+;;   :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
+;;          (python-mode . lsp)
+;;          ;; if you want which-key integration
+;;          (lsp-mode . lsp-enable-which-key-integration))
+;;   :commands lsp) 
+
+;; ;; optionally
+;; (use-package lsp-ui :commands lsp-ui-mode)
+;; ;; optionally if you want to use debugger
+;; (use-package dap-mode)
+
+;; ;; optional if you want which-key integration
+;; (use-package which-key
+;;     :config
+;;     (which-key-mode))