my-navigation: sim-pli-fy

1 files changed, 33 insertions, 46 deletions

diff --git a/emacs/custom/my-navigation.el b/emacs/custom/my-navigation.el
index 356a6c9..d7c8eba 100644
--- a/emacs/custom/my-navigation.el
+++ b/emacs/custom/my-navigation.el
@@ -1,54 +1,41 @@
-;;; my-navigation.el --- Configure parts related to navigation
+;;; my-navigation.el --- Configure parts related to navigation -*- lexical-binding: t -*-
+
 ;;; Commentary:
-;;; Code:
 
-(require 'use-package)
+;;; Code:
 
 (setq help-window-select t)
 
-(use-package project
-  :ensure t
-  :bind-keymap ("C-c p" . project-prefix-map)
-  :custom
-  (project-list-file (expand-file-name "var/projects" user-emacs-directory))
-  (project-switch-commands
-   '((?f "File" project-find-file)
-     (?d "Dired" project-dired)
-     (?b "Buffer" project-switch-to-buffer)
-     (?e "Eshell" project-eshell)
-     (?m "Magit status" magit-project-status)
-     (?r "Search" rg-project))))
-
-(use-package bookmark
-  :custom
-  (bookmark-save-flag 1))
-
-(use-package ibuffer
-  :bind ("C-x C-b" . ibuffer))
-
-(use-package recentf
-  :init (recentf-mode 1)
-  :config
-  (setq recentf-max-saved-items 500
-        recentf-exclude '(".gz" ".xz" ".zip")
-        recentf-save-file (expand-file-name "var/recentf" user-emacs-directory)))
-
-(use-package rg
-  :ensure t
-  :custom
-  (rg-group-result t)
-  (rg-show-columns t)
-  (rg-align-position-numbers t)
-  (rg-align-line-number-field-length 3)
-  (rg-align-column-number-field-length 3)
-  (rg-align-line-column-separator "#")
-  (rg-align-position-content-separator "|"))
-
-(use-package which-key
-  :diminish which-key-mode
-  :ensure t
-  :config
-  (which-key-mode))
+(customize-set-variable 'project-list-file (expand-file-name "var/projects" user-emacs-directory))
+(customize-set-variable 'project-switch-commands
+                        '((?f "File" project-find-file)
+                          (?d "Dired" project-dired)
+                          (?b "Buffer" project-switch-to-buffer)
+                          (?e "Eshell" project-eshell)
+                          (?m "Magit status" magit-project-status)
+                          (?r "Search" rg-project)))
+
+(customize-set-variable 'bookmark-save-flag 1)
+(customize-set-variable 'bookmark-file (expand-file-name "var/bookmarks" user-emacs-directory))
+
+(global-set-key (kbd "C-x C-b") 'ibuffer)
+(global-set-key (kbd "M-g i") 'imenu)
+
+(customize-set-variable 'recentf-max-saved-items 500)
+(customize-set-variable 'recentf-exclude '(".gz" ".xz" ".zip"))
+(customize-set-variable 'recentf-save-file (expand-file-name "var/recentf" user-emacs-directory))
+(add-hook 'after-init-hook 'recentf-mode)
+
+(customize-set-variable 'rg-group-result t)
+(customize-set-variable 'rg-show-columns t)
+(customize-set-variable 'rg-align-position-numbers t)
+(customize-set-variable 'rg-align-line-number-field-length 3)
+(customize-set-variable 'rg-align-column-number-field-length 3)
+(customize-set-variable 'rg-align-line-column-separator "#")
+(customize-set-variable 'rg-align-position-content-separator "|")
+
+(add-hook 'after-init-hook 'which-key-mode)
 
 (provide 'my-navigation)
+
 ;;; my-navigation.el ends here