diff --git a/conf/kuso.config.el b/conf/kuso.config.el deleted file mode 100644 index db22571..0000000 --- a/conf/kuso.config.el +++ /dev/null @@ -1,12 +0,0 @@ -(require 'cask "~/.cask/cask.el") -(cask-initialize) - -(add-to-list 'load-path "--PATH--/kuso.d") - -(setq developer-name "--FULLNAME--") -(setq developer-email "--EMAIL--") -(setq kuso-workspace "--WORKSPACE--") - -;; Uncomment this line if you want to debug an error -;; (toggle-debug-on-error) - diff --git a/fg42-config.el b/fg42-config.el index f10f217..ec79311 100644 --- a/fg42-config.el +++ b/fg42-config.el @@ -1,12 +1,12 @@ (add-to-list 'load-path (concat (getenv "FG42_HOME") "/lib")) -;(toggle-debug-on-error) +(toggle-debug-on-error) (require 'fg42) ;; Load the default theme (theme themes/color-theme-monokai) ;; Disable abilities which we do not want to load -(disable 'rbenv 'helm) +(disable 'rbenv 'helm 'swiper) ;; Activate these extensions (activate-extensions 'editor diff --git a/lib/extensions/development.el b/lib/extensions/development.el index 5311db2..39bdd8f 100644 --- a/lib/extensions/development.el +++ b/lib/extensions/development.el @@ -11,12 +11,15 @@ (depends-on 'magit) (depends-on 'indent-guide) (depends-on 'yasnippet) -(depends-on 'direx) -(depends-on 'popwin) -(depends-on 'ag) (depends-on 'hl-sexp) (depends-on 'smart-mode-line) +(with-ability code-browser + (depends-on 'neotree)) + +(with-ability pt + (depends-on 'pt)) + (with-ability spell (depends-on 'flyspell)) ;; TODO: Add flycheck-color-modebar diff --git a/lib/extensions/development/init.el b/lib/extensions/development/init.el index db249fb..15cce03 100644 --- a/lib/extensions/development/init.el +++ b/lib/extensions/development/init.el @@ -24,6 +24,12 @@ (insert (current-kill 0))))) +;;;###autoload +(defun enable-pt-search () + (interactive) + (define-key projectile-mode-map (kbd "C-c p s s") 'projectile-pt) + (define-key projectile-mode-map (kbd "C-c p s r") 'pt-regexp)) + ;;;###autoload (defun extension/development-initialize () "Development plugin initialization." @@ -95,18 +101,20 @@ (ability code-browser () "Adds the code browser to FG42." - (autoload 'direx "direx" "Simple code browser.") - (require 'popwin) - (popwin-mode t) + (require 'neotree) + (global-set-key [f8] 'neotree-toggle)) - (push '(direx:direx-mode :position left :width 30 :dedicated t) - popwin:special-display-config) - (global-set-key (kbd "C-c q") 'direx-project:jump-to-project-root-other-window)) + (ability pt () + "Provides fast search ability via platinium search" + (require 'pt) + (cheatsheet-add :group 'Development + :key "C-c p s s" + :description "Search within a project using pt. It's fast.") - (ability fast-search () - "Provides fast search ability via silver search" - (setq ag-reuse-window 't) - (setq ag-highlight-search t)) + (cheatsheet-add :group 'Development + :key "C-c p s r" + :description "Search for a regexp in a project.") + (add-hook 'projectile-mode-hook 'enable-pt-search)) (ability smart-mode-line () "Smarter modeline for FG42" diff --git a/lib/extensions/editor.el b/lib/extensions/editor.el index 1196f05..fc1e940 100644 --- a/lib/extensions/editor.el +++ b/lib/extensions/editor.el @@ -8,6 +8,7 @@ (depends-on 'dired+) (depends-on 'seq) (depends-on 'ov) +(depends-on 'cheatsheet) (with-ability ido (depends-on 'ido) diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el index 7f8b40c..7b22614 100644 --- a/lib/extensions/editor/init.el +++ b/lib/extensions/editor/init.el @@ -10,6 +10,7 @@ "Base plugin initialization." (message "Initializing 'editor' extension.") + (require 'cheatsheet) (require 'extensions/editor/utils) ;; Remove splash screen