From c9e4c36faf9a95a160fbe9c5a06fdf345b472d51 Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Sun, 23 Feb 2020 19:12:52 +0330 Subject: [PATCH 1/2] revert go extension --- lib/extensions/go.el | 24 ------------------------ lib/extensions/go/init.el | 23 ----------------------- 2 files changed, 47 deletions(-) delete mode 100644 lib/extensions/go.el delete mode 100644 lib/extensions/go/init.el diff --git a/lib/extensions/go.el b/lib/extensions/go.el deleted file mode 100644 index 77f0842..0000000 --- a/lib/extensions/go.el +++ /dev/null @@ -1,24 +0,0 @@ -;;; GoExtention --- Enable Golang support in FG42 -;;; Commentary: -;;; Code: -(require 'fpkg) -(require 'fg42/extension) -(require 'extensions/go-initialize) - -;; dependencies - -(depends-on 'go-mode) -(depends-on 'go-add-tags) -(depends-on 'go-stacktracer) -(depends-on 'go-eldoc) -(depends-on 'gotest) - - - -(extension go - :version 0.0.1 - :on-initialize extensions/go-initialize - :docs "lib/extensions/go/readme.org") - - -;;; go.el ends here diff --git a/lib/extensions/go/init.el b/lib/extensions/go/init.el deleted file mode 100644 index bb64b94..0000000 --- a/lib/extensions/go/init.el +++ /dev/null @@ -1,23 +0,0 @@ -;;; go-init --- The entry point for golang extension -;;; Commentary: -;;; Code: - -(defun fg42-go-hook () - """Setup emacs hooks and turn necessary modes on.""" - (lsp) - (flymake-mode-on) - (yas-minor-mode-on) - (add-hook 'before-save-hook #'lsp-format-buffer t t) - (add-hook 'before-save-hook #'lsp-organize-imports t t) - (add-hook 'go-mode-hook 'go-eldoc-setup) - (local-set-key (kbd "M-.") #'godef-jump) - (local-set-key (kbd "M-*") 'pop-tag-mark)) - - -(defun extensions/go-initialize () - """Initialize Golang extension.""" - (add-hook 'go-mode-hook 'fg42-go-hook)) - -(provide 'extensions/go/init) - -;;; init ends here. From cc40f763f16580900f38b2c9d756a5a3a2e5bf0f Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Sun, 23 Feb 2020 23:05:26 +0330 Subject: [PATCH 2/2] add space leader keybindings for evil mode --- lib/extensions/editor.el | 3 +++ lib/extensions/editor/init.el | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/extensions/editor.el b/lib/extensions/editor.el index 8db71a8..7f003e1 100644 --- a/lib/extensions/editor.el +++ b/lib/extensions/editor.el @@ -25,6 +25,9 @@ (depends-on 'eyebrowse) +;; general for simpler keybindin +(depends-on 'general) + ;; Themes (depends-on 'spacemacs-theme) (depends-on 'doom-themes) diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el index 7c67e80..6e0073a 100644 --- a/lib/extensions/editor/init.el +++ b/lib/extensions/editor/init.el @@ -98,6 +98,20 @@ "Highlights the current line." (global-hl-line-mode t)) + ;; enhance evil mode with space leader keybindings + (ability space-keys + "evil mode with space leader keybindings" + (when (is-evil?) + (general-define-key + :states '(normal visual insert emacs) + :prefix "SPC" + :non-normal-prefix "C-SPC" + "bl" 'switch-to-buffer + "ff" 'find-file + "sv" 'split-window-vertically + "sh" 'split-window-horizontally))) + + (ability flycheck () "Check syntax on the fly using flycheck." (require 'flycheck) @@ -386,7 +400,7 @@ (require 'extensions/editor/custom) (require 'extensions/editor/session-management) (require 'extensions/editor/lxdrive-mode) - (require 'extensions/editor/lxmodeline)) - (message "'editor' extension has been initialized.") + (require 'extensions/editor/lxmodeline) + (message "'editor' extension has been initialized.")) (provide 'extensions/editor/init)