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

Clean up and further improvements

Browse source
This commit is contained in:
Nikolai Shields 2024-05-22 02:04:43 -05:00
parent 0be073f995
commit eff1ae6d5c
Signed by: nikolaishields
SSH key fingerprint: SHA256:gcG2rc5bPVo4dQ6xICvEeOylJjHYUehCFFNrjjm+c50
1 changed files with 19 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
init.el
View file

@ -16,10 +16,8 @@
(setq use-dialog-box nil) (setq use-dialog-box nil)
(global-auto-revert-mode 1) (global-auto-revert-mode 1)
(setq global-auto-rever-non-file-buffers t) (setq global-auto-rever-non-file-buffers t)
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
;; Comment/uncomment this line to enable MELPA Stable if desired. See `package-archive-priorities`
;; and `package-pinned-packages`. Most users will not need or want to do this.
;;(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t)
(require 'package) (require 'package)
(setq package-archives '(("melpa" . "https://melpa.org/packages/") (setq package-archives '(("melpa" . "https://melpa.org/packages/")
("org" . "https://orgmode.org/elpa/") ("org" . "https://orgmode.org/elpa/")
@ -99,7 +97,6 @@
(setq interprogram-cut-function 'wl-copy) (setq interprogram-cut-function 'wl-copy)
(setq interprogram-paste-function 'wl-paste) (setq interprogram-paste-function 'wl-paste)
;; Enable Evil ;; Enable Evil
(use-package evil (use-package evil
:ensure t :ensure t
@ -107,13 +104,14 @@
(setq evil-want-integration t) (setq evil-want-integration t)
(setq evil-want-keybinding nil) (setq evil-want-keybinding nil)
:config :config
(evil-mode -1)) (evil-mode 1))
(use-package evil-collection (use-package evil-collection
:after evil :after evil
:ensure t :ensure t
:config :config
(evil-collection-init)) (evil-collection-init))
;; org ;; org
(use-package org-roam (use-package org-roam
:ensure t :ensure t
@ -225,28 +223,18 @@
(persp-switch (projectile-project-name)) (persp-switch (projectile-project-name))
(magit-status)) (magit-status))
(use-package fzf (use-package projectile
:bind (("C-C F g" . fzf-git-files) :diminish projectile-mode
("C-c f f" . fzf-find-file) :config (projectile-mode)
("C-c d" . fzf-directory) :demand t
("C-c f r" . fzf-grep) :bind ("C-M-p" . projectile-find-file)
;; ("C-c b" . fzf-switch-buffer) :bind-keymap
) ("C-c p" . projectile-command-map)
:config :init
(setq fzf/args "-x --print-query --margin=1,0 --no-hscroll" (when (file-directory-p "~/Code")
fzf/executable "fzf" (setq projectile-project-search-path '("~/Code")))
fzf/git-grep-args "-i --line-number %s"
fzf/grep-command "rg --no-heading -nH"
fzf/position-bottom t
fzf/window-height 15))
(setq projectile-switch-project-action #'projectile-dired)) (setq projectile-switch-project-action #'projectile-dired))
(use-package kubernetes-evil
:ensure t
:after kubernetes)
(global-set-key (kbd "M-n") #'other-window) (global-set-key (kbd "M-n") #'other-window)
;; emacs-land leader-key ;; emacs-land leader-key
@ -258,39 +246,12 @@
(use-package multi-vterm :ensure t) (use-package multi-vterm :ensure t)
(use-package multi-vterm (use-package multi-vterm
:ensure t :ensure t
:config :config
(add-hook 'vterm-mode-hook (add-hook 'vterm-mode-hook
(lambda () (lambda ()
(setq-local evil-insert-state-cursor 'box) ;; Disable evil-mode in vterm
(evil-insert-state))) (evil-emacs-state))))
(define-key vterm-mode-map [return] #'vterm-send-return)
(setq vterm-keymap-exceptions nil)
(evil-define-key 'insert vterm-mode-map (kbd "C-e") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-f") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-a") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-v") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-b") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-w") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-u") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-d") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-n") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-m") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-p") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-j") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-k") #'Vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-r") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-t") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-g") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-c") #'vterm--self-insert)
(evil-define-key 'insert vterm-mode-map (kbd "C-SPC") #'vterm--self-insert)
(evil-define-key 'normal vterm-mode-map (kbd "C-d") #'vterm--self-insert)
(evil-define-key 'normal vterm-mode-map (kbd ",c") #'multi-vterm)
(evil-define-key 'normal vterm-mode-map (kbd ",n") #'multi-vterm-next)
(evil-define-key 'normal vterm-mode-map (kbd ",p") #'multi-vterm-prev)
(evil-define-key 'normal vterm-mode-map (kbd "i") #'evil-insert-resume)
(evil-define-key 'normal vterm-mode-map (kbd "o") #'evil-insert-resume)
(evil-define-key 'normal vterm-mode-map (kbd "<return>") #'evil-insert-resume))
(use-package orderless (use-package orderless
:ensure t :ensure t