summary refs log tree commit diff
path: root/emacs/custom
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/custom')
-rw-r--r--emacs/custom/fcuny-navigation.el38
1 files changed, 7 insertions, 31 deletions
diff --git a/emacs/custom/fcuny-navigation.el b/emacs/custom/fcuny-navigation.el
index 44d7c39..b4ed9a3 100644
--- a/emacs/custom/fcuny-navigation.el
+++ b/emacs/custom/fcuny-navigation.el
@@ -1,4 +1,9 @@
+;;; fcuny-navigation.el --- Configure parts related to navigation
+;;; Commentary:
+;;; Code:
+
 (require 'fcuny-vars)
+(require 'use-package)
 
 (setq help-window-select t)
 
@@ -57,6 +62,7 @@
    (quote (("default"
             ("org"    (mode . org-mode))
             ("go"     (mode . go-mode))
+            ("nix"    (mode . nix-mode))
             ("python" (mode . python-mode))
             ("config" (or
                        (name . "\\.conf$")
@@ -88,29 +94,6 @@
 
 (use-package rg
   :ensure t
-  :config
-  (rg-define-search fcuny/grep-git-or-dir
-    :query ask
-    :format regexp
-    :files "everything"
-    :confirm prefix
-    :flags ("--hidden -g !.git")
-    :dir (let ((vc (magit-toplevel)))
-           (if vc
-               vc
-             default-directory)))
-  (rg-define-search fcuny/grep-git-or-dir-todos
-    :query "TODO\|FIXME\|XXX"
-    :format regexp
-    :files "everything"
-    :confirm prefix
-    :flags ("--hidden -g !.git")
-    :dir (let ((vc (magit-toplevel)))
-           (if vc
-               vc
-             default-directory)))
-  :bind (("M-s g" . fcuny/grep-git-or-dir)
-         ("M-s t" . fcuny/grep-git-or-dir-todos))
   :custom
   (rg-group-result t)
   (rg-show-columns t)
@@ -170,12 +153,5 @@
   :config
   (which-key-mode))
 
-;; treemacs is being pulled by lsp/dap mode, so let's be explicit
-;; about getting it installed, and ensure that it writes its own data
-;; in our var directory.
-(use-package treemacs
-  :ensure t
-  :custom
-  (treemacs-persist-file (expand-file-name "treemacs-persist" fcuny/path-emacs-var)))
-
 (provide 'fcuny-navigation)
+;;; fcuny-navigation.el ends here