aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMountain Man <43313373+MountainMan1312@users.noreply.github.com>2023-05-16 00:19:15 -0400
committerGitHub <noreply@github.com>2023-05-16 00:19:15 -0400
commite01dbb35ee1ca399edb9aa93664ca881c78683ac (patch)
treed18a80253bce41aa8070cb9a7b5c3b31905b2816
parentAdd keybind to open agenda file (diff)
parentUse `magit` for git stuff (diff)
downloadmmosmacs-e01dbb35ee1ca399edb9aa93664ca881c78683ac.tar.gz
mmosmacs-e01dbb35ee1ca399edb9aa93664ca881c78683ac.tar.bz2
mmosmacs-e01dbb35ee1ca399edb9aa93664ca881c78683ac.zip
PR #24: Merge `project-repo-management` branch to `stable` branch
-rw-r--r--.gitignore5
-rw-r--r--init.el38
2 files changed, 40 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index fd7c680..0205f3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
1auto-save-list/ 1auto-save-list/
2bookmarks
2eln-cache/ 3eln-cache/
4projectile.cache
5projectile-bookmarks.eld
6projectile-known-projects.eld
3straight/ 7straight/
8transient/
4.org-id-locations 9.org-id-locations
diff --git a/init.el b/init.el
index 08af089..7c95bf1 100644
--- a/init.el
+++ b/init.el
@@ -327,9 +327,10 @@
327 327
328 328
329;; --------------------------------------------------------------------- 329;; ---------------------------------------------------------------------
330;;; File Management 330;;; File, project, & repository management
331;; ---------------- 331;; ---------------------------------------
332;; Everything to do with file or directory management goes here. 332;; This section contains everything to do with file, project, & repo
333;; management. This includes `magit' and `projectile'.
333;; --------------------------------------------------------------------- 334;; ---------------------------------------------------------------------
334 335
335;; --------------------------------- 336;; ---------------------------------
@@ -366,6 +367,37 @@
366(setq create-lockfiles nil) 367(setq create-lockfiles nil)
367 368
368 369
370;; ---------------------------------
371;; Project management
372;; ------------------
373;; `Projectile' provides features
374;; for operating on a project level.
375;; ---------------------------------
376
377(use-package projectile
378 :straight t
379 :config
380 (projectile-mode)
381 (setq projectile-project-search-path '("~/Projects")
382 projectile-known-projects-file "~/.emacs.d/projectile-known-projects.eld"
383 projectile-cache-file "~/.emacs.d/projectile.cache")
384 :bind-keymap ("C-c p" . projectile-command-map))
385
386
387;; ---------------------------------
388;; `Magit' - A git porcelain
389;; -------------------------
390;; Magit provides a state-of-the-art
391;; interface for managing `git'
392;; repositories.
393;; ---------------------------------
394
395(use-package magit
396 :straight t
397 :custom
398 (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
399
400
369 401
370 402
371;; --------------------------------------------------------------------- 403;; ---------------------------------------------------------------------