From a6377f7a670b0be801219a56f7ed922b77e39c43 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Tue, 25 Jul 2017 11:43:05 +0100
Subject: [PATCH] Various updates and additions

---
 modules/siren-dumb-jump.el   | 26 ++++++++++++++++++++++++++
 modules/siren-ecb.el         |  2 ++
 modules/siren-helm.el        |  3 ++-
 modules/siren-neotree.el     | 33 +++++++++++++++++++++++++++++----
 modules/siren-use-package.el | 15 +++++++++++++++
 siren-modules.el             |  6 ++++--
 6 files changed, 78 insertions(+), 7 deletions(-)
 create mode 100644 modules/siren-dumb-jump.el
 create mode 100644 modules/siren-use-package.el

diff --git a/modules/siren-dumb-jump.el b/modules/siren-dumb-jump.el
new file mode 100644
index 0000000..d7f7976
--- /dev/null
+++ b/modules/siren-dumb-jump.el
@@ -0,0 +1,26 @@
+;;; siren-dumb-jump.el --- jimeh's Emacs Siren: dumb-jump configuration.
+
+;;; Commentary:
+
+;; Basic configuration for dumb-jump.
+
+;;; Code:
+
+;; (siren-require-packages '(dumb-jump))
+
+(require 'siren-use-package)
+
+(use-package dumb-jump
+  :bind
+  (("M-g M-o" . dumb-jump-go-other-window)
+   ("M-g M-j" . dumb-jump-go)
+   ("M-g M-b" . dumb-jump-back)
+   ("M-g M-i" . dumb-jump-go-prompt)
+   ("M-g M-x" . dumb-jump-go-prefer-external)
+   ("M-g M-z" . dumb-jump-go-prefer-external-other-window))
+
+  :config
+  (setq dumb-jump-selector 'ivy))
+
+(provide 'siren-dumb-jump)
+;;; siren-dumb-jump.el ends here
diff --git a/modules/siren-ecb.el b/modules/siren-ecb.el
index 572f9a2..217897c 100644
--- a/modules/siren-ecb.el
+++ b/modules/siren-ecb.el
@@ -44,5 +44,7 @@
 
 (if window-system (ecb-activate))
 
+(global-set-key (kbd "C-x C-p") 'ecb-toggle-ecb-windows)
+
 (provide 'siren-ecb)
 ;;; siren-ecb.el ends here
diff --git a/modules/siren-helm.el b/modules/siren-helm.el
index d1059d5..1e19da0 100644
--- a/modules/siren-helm.el
+++ b/modules/siren-helm.el
@@ -16,7 +16,7 @@
 (require 'helm-open-github)
 (require 'helm-ag)
 (require 'helm-ls-git)
-;; (require 'helm-ctags)
+(require 'helm-gtags)
 
 (setq helm-ag-ignore-patterns '("*.sql")
       helm-ag-source-type "file-line"
@@ -42,6 +42,7 @@
 
 ;; Helm ag
 (global-set-key (kbd "C-c C-s") 'helm-do-ag)
+(global-set-key (kbd "C-c C-'") 'helm-do-ag-project-root)
 
 ;; Helm Projectile
 (global-set-key (kbd "C-c ;") 'helm-projectile)
diff --git a/modules/siren-neotree.el b/modules/siren-neotree.el
index 8832cd1..2bfcef6 100644
--- a/modules/siren-neotree.el
+++ b/modules/siren-neotree.el
@@ -6,16 +6,41 @@
 
 ;;; Code:
 
-(siren-require-packages '(neotree))
+(require 'siren-projectile)
+
+(siren-require-packages '(neotree all-the-icons))
 
 (require 'neotree)
-(global-set-key (kbd "C-x p") 'neotree-toggle)
 
+(defun neotree-project-dir-toggle ()
+  "Open NeoTree using the project root, using find-file-in-project,
+or the current buffer directory."
+  (interactive)
+  (let ((project-dir (ignore-errors (projectile-project-root)))
+        (file-name (buffer-file-name))
+        (neo-smart-open nil))
+    (if (and (fboundp 'neo-global--window-exists-p)
+             (neo-global--window-exists-p))
+        (neotree-hide)
+      (progn
+        (neotree-show)
+        (if project-dir
+            (neotree-dir project-dir))
+        (if file-name
+            (neotree-find file-name))))))
+
+(setq neo-autorefresh t)
+(setq neo-force-change-root t)
+(setq neo-mode-line-type 'default)
 (setq neo-show-hidden-files t)
+(setq neo-show-updir-line nil)
 (setq neo-smart-open nil)
-(setq neo-dont-be-alone t)
-(setq neo-theme (quote nerd))
+(setq neo-theme 'ascii)
+(setq neo-toggle-window-keep-p t)
+(setq neo-vc-integration '(face char))
 (setq neo-window-width 54)
 
+(global-set-key (kbd "C-x C-p") 'neotree-project-dir-toggle)
+
 (provide 'siren-neotree)
 ;;; siren-neotree.el ends here
diff --git a/modules/siren-use-package.el b/modules/siren-use-package.el
new file mode 100644
index 0000000..f342410
--- /dev/null
+++ b/modules/siren-use-package.el
@@ -0,0 +1,15 @@
+;;; siren-use-package.el --- jimeh's Emacs Siren: dumb-jump configuration.
+
+;;; Commentary:
+
+;; Basic configuration for use-package.
+
+;;; Code:
+
+(siren-require-packages '(use-package))
+
+(require 'use-package)
+(setq use-package-always-ensure t)
+
+(provide 'siren-use-package)
+;;; siren-use-package.el ends here
diff --git a/siren-modules.el b/siren-modules.el
index d71cd8a..ecec342 100644
--- a/siren-modules.el
+++ b/siren-modules.el
@@ -12,6 +12,7 @@
 (require 'siren-company)
 (require 'siren-dired)
 (require 'siren-direx)
+(require 'siren-dumb-jump)
 (require 'siren-edit-server)
 (require 'siren-editorconfig)
 (require 'siren-evil)
@@ -34,18 +35,19 @@
 (require 'siren-scroll-half-screen)
 (require 'siren-smartparens)
 (require 'siren-smex)
-;; (require 'siren-swiper)
 (require 'siren-text-manipulation)
 (require 'siren-toggle-quotes)
 (require 'siren-window-management)
 (require 'siren-yasnippet)
+;; (require 'siren-swiper)
+;; (require 'siren-volatile-highlights)
 ;; (require 'siren-zone)
 
 ;; Project management
 (require 'siren-projectile)
+(require 'siren-ecb)
 ;; (require 'siren-neotree)
 ;; (require 'siren-project-explorer)
-(require 'siren-ecb)
 
 ;; Workspace management
 (require 'siren-escreen)