Update gitignore, fine tune font settings

.gitignore

@@ -0,0 +1,19 @@
+/tutorial/
+/transient/
+/recentf
+/projects
+/places
+/org-roam.db
+/init.el~
+/history
+/fastgpt/
+/elpa/
+/eln-cache/
+/custom-vars.el~
+/bookmarks~
+/bookmarks
+/auto-save-list/
+/.org-id-locations
+/.lsp-session-v1
+/.dap-breakpoints
+/.cache/

README.org

@@ -1,5 +1,5 @@
 * LEARNING EMACS
-** TODO configure vertico 
+** DONE configure vertico 
 ** TODO configure projectile
-** TODO configure fzf.el
-** TODO go through the magit tutorial
+** DONE configure fzf.el
+** DONE go through the magit tutorial

custom-vars.el

@@ -5,9 +5,11 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    '("b54376ec363568656d54578d28b95382854f62b74c32077821fdfd604268616a" default))
- '(org-agenda-files '("~/Documents/notes/todo.org"))
+ '(magit-todos-insert-after '(bottom) nil nil "Changed by setter of obsolete option `magit-todos-insert-at'")
+ '(org-agenda-files
+   '("~/Documents/notes/20240306172458-homelab.org" "/home/nshields/Documents/notes/daily/2024-03-05.org" "/home/nshields/Documents/notes/daily/2024-03-12.org"))
  '(package-selected-packages
-   '(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))
+   '(pomodoro company fzf magit-todos 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.

init.el

@@ -35,8 +35,8 @@
 (use-package doom-modeline
   :ensure t
   :init (doom-modeline-mode 1)
-  :custom (doom-modeline-height 65)
-          (nerd-icons-scale-factor 1.5)
+  :custom (doom-modeline-height 35)
+          (nerd-icons-scale-factor 1.35)
           (doom-modeline-minor-modes-icon nil)
           (doom-modeline-major-modes-icon nil)
 	  (doom-modeline-icon t)
@@ -58,7 +58,7 @@
   :config
   (setq which-key-idle-delay 0))
 
-(set-face-attribute 'default nil :font "FiraCode Nerd Font" :height 150)
+(set-face-attribute 'default nil :font "FiraCode Nerd Font" :height 125)
 
 (use-package kagi
   :ensure t
@@ -115,7 +115,7 @@
   :ensure t
   :custom
   (org-roam-directory (file-truename "~/Documents/notes"))
-  (org-roam-dailies-directory (file-truename "~/Documents/notes"))
+  (org-roam-dailies-directory (file-truename "~/Documents/notes/daily"))
   (org-roam-completion-everywhere t)
   (org-roam-dailies-capture-templates
     '(("d" "default" entry "* %<%I:%M %p>: %?"
@@ -175,22 +175,62 @@
   (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) 
+(use-package lsp-mode
+  :ensure t)
 
-;; ;; optionally
-;; (use-package lsp-ui :commands lsp-ui-mode)
-;; ;; optionally if you want to use debugger
-;; (use-package dap-mode)
+(use-package lsp-nix
+  :ensure lsp-mode
+  :after (lsp-mode)
+  :demand t
+  :custom
+  (lsp-nix-nil-formatter ["nixpkgs-fmt"]))
 
-;; ;; optional if you want which-key integration
-;; (use-package which-key
-;;     :config
-;;     (which-key-mode))
+(use-package nix-mode
+  :hook (nix-mode . lsp-deferred)
+  :ensure t)
+;; optionally
+(use-package lsp-ui
+  :commands lsp-ui-mode
+  :config
+  (setq lsp-ui-doc-enable t)
+  (setq lsp-ui-doc-header t)
+  (setq lsp-ui-doc-include-signature t)
+  (setq lsp-ui-doc-border (face-foreground 'default))
+  (setq lsp-ui-sideline-show-code-actions t)
+  (setq lsp-ui-sideline-delay 0.05))
+;; 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))
+(use-package magit-todos
+  :after magit
+  :config (magit-todos-mode 1))
+
+
+(use-package fzf
+  :bind
+    ;; Don't forget to set keybinds!
+  :config
+  (setq fzf/args "-x --color bw --print-query --margin=1,0 --no-hscroll"
+        fzf/executable "fzf"
+        fzf/git-grep-args "-i --line-number %s"
+        ;; command used for `fzf-grep-*` functions
+        ;; example usage for ripgrep:
+        ;; fzf/grep-command "rg --no-heading -nH"
+        fzf/grep-command "grep -nrH"
+        ;; If nil, the fzf buffer will appear at the top of the window
+        fzf/position-bottom t
+        fzf/window-height 15))
+
+
+(defun efs/display-startup-time ()
+  (message "Emacs loaded in %s with %d garbage collections."
+           (format "%.2f seconds"
+                   (float-time
+                   (time-subtract after-init-time before-init-time)))
+           gcs-done))
+
+(add-hook 'emacs-startup-hook #'efs/display-startup-time)