Keybinds that make sense and a minimap

1 files changed, 38 insertions, 9 deletions

diff --git a/lisp/general.el b/lisp/general.el
index 1a94675..00c0a76 100644
--- a/lisp/general.el
+++ b/lisp/general.el
@@ -16,8 +16,8 @@
 (setq mac-shift-modifier 'meta)
 
 ;; Default Values
-										;(setq-default indent-tabs-mode t)  ; use spaces only if nil
-(setq-default tab-width 4) ; Assuming you want your tabs to be four spaces wide
+(setq-default indent-tabs-mode t)  ; use spaces only if nil
+(setq-default tab-width 2) ; Assuming you want your tabs to be four spaces wide
 (set-face-attribute 'default nil :font "Source Code Pro-10")
 (set-fontset-font t '(?😊 . ?😎) "Segoe UI Emoji")
 
@@ -31,8 +31,11 @@
 
 ;; Margin
 (global-linum-mode 1)
-;;(require 'minimap)
-;;(minimap-mode 1)
+(require 'minimap)
+(minimap-mode 1)
+(setq-default minimap-window-location "right")
+(setq-default minimap-highlight-line 1)
+(setq-default minimap-update-delay 0)
 (setq-default left-fringe-width  20)
 (setq-default right-fringe-width  20)
 (set-face-attribute 'fringe nil :background "white")
@@ -102,20 +105,46 @@
 (bind-key* (kbd "M-x") 'counsel-M-x)
 (bind-key* (kbd "C-;") 'neotree-toggle)
 
-(defun create-file ()
+(defun my-create-file ()
   "Create a file and refresh neotree."
   (interactive)
   (call-interactively #'make-empty-file)
+  (neotree-show)
   (neotree-refresh))
 
-(bind-key* (kbd "s-n") 'create-file)
+(bind-key* (kbd "M-n") 'my-create-file)
 
-(defun create-directory ()
+(defun my-create-directory ()
   "Create a directory and refresh neotree."
   (interactive)
   (call-interactively #'make-directory)
+  (neotree-show)
   (neotree-refresh))
-(bind-key* (kbd "s-N") 'create-directory)
+(bind-key* (kbd "M-N") 'my-create-directory)
+
+(defun my-delete-file ()
+  "Delete a file and refresh neotree."
+  (interactive)
+  (call-interactively #'delete-file)
+  (neotree-show)
+  (neotree-refresh))
+(bind-key* (kbd "M-d") 'my-delete-file)
+
+(defun my-delete-directory ()
+  "Delete a file and refresh neotree."
+  (interactive)
+  (call-interactively #'delete-directory)
+  (neotree-show)
+  (neotree-refresh))
+(bind-key* (kbd "M-D") 'my-delete-directory)
+
+(defun my-rename-file ()
+  "Rename a file and refresh neotree."
+  (interactive)
+  (call-interactively #'rename-file)
+  (neotree-show)
+  (neotree-refresh))
+(bind-key* (kbd "M-r") 'my-rename-file)
 
 ;; Company mode for code completion
 (use-package company
@@ -129,7 +158,7 @@
         company-show-quick-access       t
         company-tooltip-limit           20
         company-dabbrev-downcase        nil
-        company-backends                '((company-gtags company-elisp)) ; TODO: do i need company-irony here
+        company-backends                '((company-capf company-gtags company-elisp)) ; TODO: do i need company-irony here
         company-vscode-light-icons-margin 1
         )
   )