nikolaishields/emacs-config
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup magit and evil config, bind fzf to keys

Browse source
This commit is contained in:
Nikolai Shields 2024-03-24 12:45:02 -05:00
parent 260e9ea49a
commit 9b0bf8c647
Signed by: nikolaishields
SSH key fingerprint: SHA256:gcG2rc5bPVo4dQ6xICvEeOylJjHYUehCFFNrjjm+c50
2 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
custom-vars.el
View file

@ -9,7 +9,7 @@
'(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
'(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))
'(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.

46
init.el
View file

@ -97,19 +97,19 @@
;; Enable Evil
(unless (package-installed-p 'evil)
(package-install 'evil))
(require 'evil)
(setq evil-want-keybing nil)
(evil-mode 1)
(use-package evil
:ensure t
:init
(setq evil-want-integration t)
(setq evil-want-keybinding nil)
:config
(evil-mode 1))
(use-package evil-collection
:ensure t
:after evil
:init
:ensure t
:config
(evil-collection-init))
;; org
(use-package org-roam
:ensure t
@ -205,25 +205,27 @@
(use-package which-key
:config
(which-key-mode))
(use-package magit
:config (magit-mode 1))
(use-package magit-todos
:after magit
:config (magit-todos-mode 1))
(use-package magit
:bind ("C-M-;" . magit-status)
:commands (magit-status magit-get-current-branch)
:custom
(magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1))
(use-package magit-todos
:defer t)
(use-package fzf
:bind
;; Don't forget to set keybinds!
:bind (("C-c f g" . fzf-git-files)
("C-c f f" . fzf-find-file)
("C-c d" . fzf-directory)
("C-c f r" . fzf-grep)
("C-c b" . fzf-switch-buffer))
:config
(setq fzf/args "-x --color bw --print-query --margin=1,0 --no-hscroll"
(setq fzf/args "-x --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/grep-command "rg --no-heading -nH"
fzf/position-bottom t
fzf/window-height 15))