From 679dc3603896151cce2eff6e331b2d154884fe79 Mon Sep 17 00:00:00 2001 From: Nikolai Shields Date: Sun, 25 Aug 2024 19:54:39 -0500 Subject: [PATCH] Improve build ergonomics --- custom-vars.el | 4 ++-- init.el | 45 ++++++++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/custom-vars.el b/custom-vars.el index 0e9eaed..35751de 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 - '("b1a691bb67bd8bd85b76998caf2386c9a7b2ac98a116534071364ed6489b695d" "d80952c58cf1b06d936b1392c38230b74ae1a2a6729594770762dc0779ac66b7" "10e5d4cc0f67ed5cafac0f4252093d2119ee8b8cb449e7053273453c1a1eb7cc" "13096a9a6e75c7330c1bc500f30a8f4407bd618431c94aeab55c9855731a95e1" "81f53ee9ddd3f8559f94c127c9327d578e264c574cda7c6d9daddaec226f87bb" "aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" "34cf3305b35e3a8132a0b1bdf2c67623bc2cb05b125f8d7d26bd51fd16d547ec" "88f7ee5594021c60a4a6a1c275614103de8c1435d6d08cc58882f920e0cec65e" "80214de566132bf2c844b9dee3ec0599f65c5a1f2d6ff21a2c8309e6e70f9242" "2721b06afaf1769ef63f942bf3e977f208f517b187f2526f0e57c1bd4a000350" "b54376ec363568656d54578d28b95382854f62b74c32077821fdfd604268616a" default)) + '("d77d6ba33442dd3121b44e20af28f1fae8eeda413b2c3d3b9f1315fbda021992" "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 - '(gptel chatgpt-shell consult-projectile undo-tree orderless kubernetes-evil kubernetes multi-vterm 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)) + '(consult gptel chatgpt-shell consult-projectile undo-tree orderless kubernetes-evil kubernetes multi-vterm 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 552ab32..a54a77b 100644 --- a/init.el +++ b/init.el @@ -8,8 +8,8 @@ (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 auto-save-timeout '2) +(setq auto-save-interval '2) (setq global-auto-revert-non-file-buffers t) (setq custom-file (locate-user-emacs-file "custom-vars.el")) (load custom-file 'noerror 'nomessage) @@ -252,9 +252,9 @@ :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)) + (setq projectile-project-search-path '("~/Code/git.dwavesys.com/" "~/.emacs.d/" "/etc/nixos" )) + (setq projectile-auto-discover t)) + (global-set-key (kbd "M-n") #'other-window) @@ -308,17 +308,28 @@ (completion-styles '(orderless basic)) (completion-category-overrides '((file (styles basic partial-completion))))) -(use-package gptel - :ensure t - :config - (setq gptel-api-key "sk-proj-uk1aiEdBmPThYf3XIXzyT3BlbkFJVjKC2dDapa5MsttCsnTv")) +(setq treesit-language-source-alist + '((bash "https://github.com/tree-sitter/tree-sitter-bash") + (cmake "https://github.com/uyha/tree-sitter-cmake") + (css "https://github.com/tree-sitter/tree-sitter-css") + (elisp "https://github.com/Wilfred/tree-sitter-elisp") + (go "https://github.com/tree-sitter/tree-sitter-go") + (html "https://github.com/tree-sitter/tree-sitter-html") + (javascript "https://github.com/tree-sitter/tree-sitter-javascript" "master" "src") + (json "https://github.com/tree-sitter/tree-sitter-json") + (make "https://github.com/alemuller/tree-sitter-make") + (markdown "https://github.com/ikatyang/tree-sitter-markdown") + (python "https://github.com/tree-sitter/tree-sitter-python") + (toml "https://github.com/tree-sitter/tree-sitter-toml") + (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") + (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src") + (docker "https://github.com/camdencheek/tree-sitter-dockerfile") + (yaml "https://github.com/ikatyang/tree-sitter-yaml"))) -;; Install and configure chatgpt-shell -(use-package chatgpt-shell - :ensure t - :config - ;; Set your OpenAI API key here - (setq chatgpt-shell-api-key "sk-proj-uk1aiEdBmPThYf3XIXzyT3BlbkFJVjKC2dDapa5MsttCsnTv")) +(defun my-projectile-compile-project-silently () + "Compile the project using the preset command without prompting." + (interactive) + (let ((compilation-read-command nil)) ;; Prevent prompt + (projectile-compile-project nil))) -;; Optional: Bind chatgpt-shell to a key for quick access -(global-set-key (kbd "C-c C-g") 'chatgpt-shell) +(define-key projectile-mode-map (kbd "C-c m") 'my-projectile-compile-project-silently)