From a23c863e2ef7a741fdf457531ae94fb657c9f400 Mon Sep 17 00:00:00 2001 From: zendesk-acicchetti Date: Wed, 5 May 2021 11:22:23 -0400 Subject: [PATCH] delta --- emacs/init.el | 8 +++++++- git/gitconfig | 6 ++++++ playbooks/roles/rust/tasks/main.yml | 7 +++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/emacs/init.el b/emacs/init.el index 4f5b977..3c86866 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -67,7 +67,7 @@ ("melpa" . "https://melpa.org/packages/") ("org" . "https://orgmode.org/elpa/"))) '(package-selected-packages - '(go-mode org-roam ox-jira consult embark-consult embark selectrum-prescient prescient marginalia consult-flycheck consult-selectrum selectrum lua-mode lsp-mode yaml-mode evil-lispy treemacs-magit treemacs-evil treemacs lsp-pyright lsp-ui rustic flycheck origami groovy-mode avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit)) + '(magit-delta go-mode org-roam ox-jira consult embark-consult embark selectrum-prescient prescient marginalia consult-flycheck consult-selectrum selectrum lua-mode lsp-mode yaml-mode evil-lispy treemacs-magit treemacs-evil treemacs lsp-pyright lsp-ui rustic flycheck origami groovy-mode avy editorconfig org-crypt tree-sitter-langs tree-sitter centaur-tabs dashboard page-break-lines wakatime-mode super-save ox-pandoc evil-surround evil-collection undo-tree toc-org evil-org org-plus-contrib evil-goggles evil-expat evil-commentary auto-package-update lispy smartparens which-key git-gutter rainbow-delimiters auto-complete-distel auto-complete evil magit evil-magit)) '(prescient-filter-method '(literal regexp initialism fuzzy)) '(ring-bell-function 'ignore) '(rustic-format-trigger 'on-compile) @@ -201,6 +201,12 @@ (evil-define-key 'normal 'global (kbd "g") 'magit-file-dispatch) (evil-define-key 'normal 'global (kbd "r") 'magit-status)) +(use-package magit-delta + :after (magit) + :if (executable-find "delta") + :config + (add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))) + ;; Lispy (use-package lispy :config (add-hook 'emacs-lisp-mode-hook (lambda () (lispy-mode 1)))) diff --git a/git/gitconfig b/git/gitconfig index 43fd22f..f479402 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -9,6 +9,9 @@ [core] autocrlf = input excludesfile = /Users/acicchetti/.gitignore + pager = delta +[interactive] + diffFilter = delta --color-only [include] path = ~/.gitconfig_local [fetch] @@ -21,3 +24,6 @@ rebase = true [init] defaultBranch = main +[delta] + side-by-side = true + line-numbers = true \ No newline at end of file diff --git a/playbooks/roles/rust/tasks/main.yml b/playbooks/roles/rust/tasks/main.yml index 690ee9b..82ba168 100644 --- a/playbooks/roles/rust/tasks/main.yml +++ b/playbooks/roles/rust/tasks/main.yml @@ -119,3 +119,10 @@ when: - rust_extras == true +- name: Install delta + shell: ~/.cargo/bin/cargo install git-delta + args: + creates: ~/.cargo/bin/delta + when: + - rust_extras == true +