@@ -234,31 +234,7 @@

 (load-package-configuration 'evil)

 (load-package-configuration 'helm)

-

-(use-package projectile

-  :ensure t

-  :config

-  (setq

-   ;;       projectile-enable-caching t

-   projectile-generic-command "rg --files -0"

-   )

-

-  (projectile-register-project-type

-   'clojure '("project.clj")

-   :compile "lein uberjar"

-   :test-dir "src/test/")

-

-  (projectile-register-project-type

-   'lisp '("*.asd"))

-

-  (projectile-register-project-type

-   'npm '("package.json")

-   :compile "npm install"

-   :test "npm test"

-   :run "npm start"

-   :test-suffix ".spec")

-

-  (define-key evil-normal-state-map "gf" 'project-aware-ffap))

+(load-package-configuration 'projectile)

 ;; slime depends on fwoar-git-repo

 (load-package-configuration 'slime)

@@ -354,20 +330,6 @@

   (define-key global-map "\C-cc" 'org-capture)

   (evil-define-key 'visual 'global (kbd "<leader>c") 'org-capture))

-(use-package org-projectile

-  :ensure t

-  :after company

-  :config

-  (progn

-    (org-projectile-per-project)

-    (setq org-agenda-skip-unavailable-files t)

-    (setq org-projectile-per-project-filepath

-          "notes/README.org")

-    (setq org-agenda-files (append org-agenda-files (org-projectile-todo-files)))

-    (push (org-projectile-project-todo-entry) org-capture-templates)

-    (define-key projectile-mode-map (kbd "C-c c") 'org-capture))

-  :ensure t)

-

 (use-package delight

   :ensure t)

@@ -406,39 +368,6 @@

   (direnv-mode 1)

   (add-hook 'js2-mode-hook 'direnv-mode)

   (add-hook 'typescript-mode-hook 'direnv-mode))

-

-(defun more-than-one-project-file-p ()

-  (= (length (projectile-select-files (projectile-current-project-files)))

-     1))

-

-(defun global-find-known-file ())

-

-(defun helm-find-known-file (&optional arg)

-  "Use projectile with Helm for finding files in project

-

-With a prefix ARG invalidates the cache first."

-  (interactive "P")

-  (let ((projectile-enable-caching t))

-    (if (projectile-project-p)

-        (projectile-maybe-invalidate-cache arg)

-      (unless t

-        (error "You're not in a project"))))

-  (let ((helm-ff-transformer-show-only-basename nil)

-        (helm-boring-file-regexp-list nil))

-    (helm :sources 'helm-source-projectile-files-in-all-projects-list

-          :buffer (concat "*helm projectile: "

-                          (projectile-project-name)

-                          "*")

-          :truncate-lines helm-projectile-truncate-lines

-          :prompt (projectile-prepend-project-name "Find file in projects: "))))

-

-(defun project-aware-ffap (&rest args)

-  (interactive "F")

-  (apply (if (and (projectile-project-p)

-                  (more-than-one-project-file-p))

-             'helm-projectile-find-file-dwim

-           'find-file-at-point)

-         args))

 (use-package cl-generic

@@ -507,8 +436,6 @@ With a prefix ARG invalidates the cache first."

 (use-package ripgrep :ensure t)

-(use-package projectile-ripgrep :ensure t)

-

 (use-package scss-mode :ensure t)

 (use-package smartparens :ensure t :ensure t :config

@@ -557,10 +484,6 @@ With a prefix ARG invalidates the cache first."

   :after treemacs evil

   :ensure t)

-(use-package treemacs-projectile

-  :after treemacs projectile

-  :ensure t)

-

 (use-package treemacs-icons-dired

   :after treemacs dired

   :ensure t

@@ -570,10 +493,6 @@ With a prefix ARG invalidates the cache first."

   :after treemacs magit

   :ensure t)

-(use-package lsp-treemacs

-  :after treemacs lsp

-  :ensure t)

-

 (progn ;; emacs-lisp stuff

   (modify-syntax-entry ?- "w" emacs-lisp-mode-syntax-table)

   (modify-syntax-entry ?_ "w" emacs-lisp-mode-syntax-table)

@@ -590,11 +509,6 @@ With a prefix ARG invalidates the cache first."

 (when (file-exists-p custom-file)

   (load-file custom-file))

-(defun edit-init-el ()

-  (interactive)

-  (let ((default-directory *dotfiles-repo*))

-    (helm-projectile-find-file)))

-

 ;;(setq gc-cons-threshold (* 100 1024))

 (unless fwoar.is-ordinary

@@ -8,7 +8,6 @@

     (when filename

       (insert filename))))

-

 (use-package helm :ensure t

   :custom

   (helm-boring-buffer-regexp-list '("\\` " "\\`\\*helm" "\\`\\*Echo Area" "\\`\\*Minibuf" "\\`\\Pfuture"))

@@ -19,26 +18,12 @@

   (helm-mode)

   (global-set-key (kbd "M-x") 'helm-M-x)

   (global-set-key (kbd "C-x C-f") 'helm-find-files)

-  (evil-define-key 'normal 'global (kbd "<leader>f") 'helm-projectile)

   (evil-define-key 'normal 'global (kbd "<leader>j") 'helm-buffers-list)

   (evil-define-key 'normal 'global (kbd "<leader>s") 'helm-occur)

-  (evil-define-key 'normal 'global (kbd "<leader>S") 'helm-projectile-rg)

   (define-key helm-map (kbd "C-r") 'fwoar--paste-register-from-helm-current-buffer)

   (define-key helm-map (kbd "<right>") 'helm-execute-persistent-action)

-  (define-key helm-map

-    (kbd "<left>")

-    'helm-find-files-up-one-level))

-

-

-(use-package org-projectile-helm

-  :ensure t

-  :after org-projectile helm helm-org

-  :config

-  (define-key projectile-mode-map (kbd "C-c n p") 'org-projectile-helm-template-or-project))

+  (define-key helm-map (kbd "<left>") 'helm-find-files-up-one-level))

-(use-package helm-projectile :after helm :ensure t

-  :config

-  (evil-define-key 'normal 'global (kbd "<leader>h") 'helm-projectile-find-file-dwim))

 (use-package helm-ls-git :after helm :ensure t)

 (use-package helm-org :after helm :ensure t)

@@ -11,6 +11,10 @@

   :config

   (add-hook 'lsp-ui-mode-hook 'fwoar/lsp-ui-hook))

+(use-package lsp-treemacs

+  :after treemacs lsp

+  :ensure t)

+

 (comment

  (use-package lsp-treemacs

    :after lsp-mode treemacs

new file mode 100644

@@ -0,0 +1,119 @@

+(use-package projectile

+  :ensure t

+  :config

+  (setq

+   ;;       projectile-enable-caching t

+   projectile-generic-command "rg --files -0"

+   )

+

+  (projectile-register-project-type

+   'clojure '("project.clj")

+   :compile "lein uberjar"

+   :test-dir "src/test/")

+

+  (projectile-register-project-type

+   'lisp '("*.asd"))

+

+  (projectile-register-project-type

+   'npm '("package.json")

+   :compile "npm install"

+   :test "npm test"

+   :run "npm start"

+   :test-suffix ".spec")

+

+  (define-key evil-normal-state-map "gf" 'project-aware-ffap)

+  (projectile-mode 1)

+  )

+

+(use-package org-projectile

+  :ensure t

+  :after projectile company

+  :config

+  (progn

+    (org-projectile-per-project)

+    (setq org-agenda-skip-unavailable-files t)

+    (setq org-projectile-per-project-filepath

+          "notes/README.org")

+    (setq org-agenda-files (append org-agenda-files (org-projectile-todo-files)))

+    (push (org-projectile-project-todo-entry) org-capture-templates)

+    (define-key projectile-mode-map (kbd "C-c c") 'org-capture))

+  :ensure t)

+

+(use-package projectile-ripgrep

+  :ensure t

+  :after projectile)

+

+(use-package treemacs-projectile

+  :after treemacs projectile

+  :ensure t)

+

+(use-package org-projectile-helm

+  :ensure t

+  :after org-projectile helm helm-org

+  :config

+  (define-key projectile-mode-map (kbd "C-c n p") 'org-projectile-helm-template-or-project))

+

+(use-package helm-projectile

+  :after helm projectile

+  :ensure t

+  :config

+

+  (evil-define-key 'normal 'global (kbd "<leader>f") 'helm-projectile)

+  (evil-define-key 'normal 'global (kbd "<leader>S") 'helm-projectile-rg)

+  (evil-define-key 'normal 'global (kbd "<leader>h") 'helm-projectile-find-file-dwim))

+

+(defun more-than-one-project-file-p ()

+  (= (length (projectile-select-files (projectile-current-project-files)))

+     1))

+

+(defun global-find-known-file ())

+

+(defun helm-find-known-file (&optional arg)

+  "Use projectile with Helm for finding files in project

+

+With a prefix ARG invalidates the cache first."

+  (interactive "P")

+  (let ((projectile-enable-caching t))

+    (if (projectile-project-p)

+        (projectile-maybe-invalidate-cache arg)

+      (unless t

+        (error "You're not in a project"))))

+  (let ((helm-ff-transformer-show-only-basename nil)

+        (helm-boring-file-regexp-list nil))

+    (helm :sources 'helm-source-projectile-files-in-all-projects-list

+          :buffer (concat "*helm projectile: "

+                          (projectile-project-name)

+                          "*")

+          :truncate-lines helm-projectile-truncate-lines

+          :prompt (projectile-prepend-project-name "Find file in projects: "))))

+

+(defun project-aware-ffap (&rest args)

+  (interactive "F")

+  (apply (if (and (projectile-project-p)

+                  (more-than-one-project-file-p))

+             'helm-projectile-find-file-dwim

+           'find-file-at-point)

+         args))

+

+(defun edit-init-el ()

+  (interactive)

+  (let ((default-directory *dotfiles-repo*))

+    (helm-projectile-find-file)))

+

+(defun helm-projectile-rg ()

+  "Projectile version of `helm-rg'."

+  (interactive)

+  (if (require 'helm-rg nil t)

+      (if (projectile-project-p)

+          (let ((helm-rg-prepend-file-name-line-at-top-of-matches nil)

+                (helm-rg-include-file-on-every-match-line t))

+            (helm-rg (helm-projectile-rg--region-selection)

+                     nil

+                     (list (projectile-project-root))))

+        (error "You're not in a project"))

+    (when (yes-or-no-p "`helm-rg' is not installed. Install? ")

+      (condition-case nil

+          (progn

+            (package-install 'helm-rg)

+            (helm-projectile-rg))

+        (error "`helm-rg' is not available.  Is MELPA in your `package-archives'?")))))

@@ -135,24 +135,6 @@ from the selected region."

                       ,@(cdr pck)))

                  packages)))

-(defun helm-projectile-rg ()

-  "Projectile version of `helm-rg'."

-  (interactive)

-  (if (require 'helm-rg nil t)

-      (if (projectile-project-p)

-          (let ((helm-rg-prepend-file-name-line-at-top-of-matches nil)

-                (helm-rg-include-file-on-every-match-line t))

-            (helm-rg (helm-projectile-rg--region-selection)

-                     nil

-                     (list (projectile-project-root))))

-        (error "You're not in a project"))

-    (when (yes-or-no-p "`helm-rg' is not installed. Install? ")

-      (condition-case nil

-          (progn

-            (package-install 'helm-rg)

-            (helm-projectile-rg))

-        (error "`helm-rg' is not available.  Is MELPA in your `package-archives'?")))))

-

 (defmacro fwoar/defvaralias! (var val-var)

   `(progn

      (setq ,var ,val-var)

@@ -179,7 +161,6 @@ from the selected region."

 (defun post-init ()

   ;;(centaur-tabs-mode 1)

-  (projectile-mode 1)

   (evil-mode 1)

   (setup-indentation)