diff --git a/README.org b/README.org index 62a08db..1349868 100644 --- a/README.org +++ b/README.org @@ -1,5 +1,12 @@ * LEARNING EMACS ** DONE configure vertico -** TODO configure projectile +** DONE configure projectile +** TODO configure lsps for: +- [ ] nix +- [ ] go +- [ ] python +- [ ] bash +*** TODO learn use lsp completion +*** TODO learn to use compile ** DONE configure fzf.el ** DONE go through the magit tutorial diff --git a/custom-vars.el b/custom-vars.el index 8b4fe2c..72d6cce 100644 --- a/custom-vars.el +++ b/custom-vars.el @@ -4,12 +4,12 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("b54376ec363568656d54578d28b95382854f62b74c32077821fdfd604268616a" default)) + '("b1a691bb67bd8bd85b76998caf2386c9a7b2ac98a116534071364ed6489b695d" "d80952c58cf1b06d936b1392c38230b74ae1a2a6729594770762dc0779ac66b7" "10e5d4cc0f67ed5cafac0f4252093d2119ee8b8cb449e7053273453c1a1eb7cc" "13096a9a6e75c7330c1bc500f30a8f4407bd618431c94aeab55c9855731a95e1" "81f53ee9ddd3f8559f94c127c9327d578e264c574cda7c6d9daddaec226f87bb" "aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" "34cf3305b35e3a8132a0b1bdf2c67623bc2cb05b125f8d7d26bd51fd16d547ec" "88f7ee5594021c60a4a6a1c275614103de8c1435d6d08cc58882f920e0cec65e" "80214de566132bf2c844b9dee3ec0599f65c5a1f2d6ff21a2c8309e6e70f9242" "2721b06afaf1769ef63f942bf3e977f208f517b187f2526f0e57c1bd4a000350" "b54376ec363568656d54578d28b95382854f62b74c32077821fdfd604268616a" default)) '(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 - '(evil-collection-vterm org-roam 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)) + '(projectile evil-collection-vterm org-roam 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. diff --git a/init.el b/init.el index f6b8044..af3e8b7 100644 --- a/init.el +++ b/init.el @@ -44,7 +44,7 @@ (use-package command-log-mode) (global-set-key (kbd "") 'keyboard-escape-quit) -(load-theme 'catppuccin t) +(load-theme 'modus-vivendi t) (column-number-mode) (global-display-line-numbers-mode t) @@ -215,6 +215,11 @@ (use-package magit-todos :defer t) +(defun dw/switch-project-action () + "Switch to a workspace with the project name and start `magit-status'." + (persp-switch (projectile-project-name)) + (magit-status)) + (use-package fzf :bind (("C-c f g" . fzf-git-files) ("C-c f f" . fzf-find-file) @@ -230,11 +235,14 @@ 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) +(use-package projectile + :diminish projectile-mode + :config (projectile-mode) + :demand t + :bind ("C-M-p" . projectile-find-file) + :bind-keymap + ("C-c p" . projectile-command-map) + :init + (when (file-directory-p "~/Code") + (setq projectile-project-search-path '("~/Code"))) + (setq projectile-switch-project-action #'projectile-dired))