From 16191caabca9cef67c8df9c4c791f02cf9bfb481 Mon Sep 17 00:00:00 2001
From: Juan Placencia <juan@placencia.uno>
Date: Fri, 11 Jun 2021 22:39:31 -0500
Subject: [PATCH] Bugfixes

---
 uno/.gitignore            |  1 +
 uno/bootstrap.org         | 18 +++++++++++++++---
 uno/modules/app/rss.org   | 16 +++++++++++++++-
 uno/modules/config.org    |  2 +-
 uno/modules/dev/help.org  | 27 +++++++++++++++++++++++++++
 uno/modules/doc/org.org   |  3 +++
 uno/modules/key/emacs.org |  3 ---
 uno/modules/key/vim.org   |  2 --
 uno/modules/window.org    |  1 +
 9 files changed, 63 insertions(+), 10 deletions(-)
 create mode 100644 uno/modules/dev/help.org

diff --git a/uno/.gitignore b/uno/.gitignore
index abf136d..4fc880e 100644
--- a/uno/.gitignore
+++ b/uno/.gitignore
@@ -1 +1,2 @@
 *.el
+/private/
diff --git a/uno/bootstrap.org b/uno/bootstrap.org
index aa3f6e0..2bd0fd2 100644
--- a/uno/bootstrap.org
+++ b/uno/bootstrap.org
@@ -16,6 +16,9 @@
 
   (defun uno-cache-path (name)
     (uno-emacs-path (concat "cache/" name)))
+
+  (defun uno-private-path (name)
+    (uno-path (concat "private/" name)))
 #+END_SRC
 
 * Backup Files
@@ -68,6 +71,15 @@ Set up general and leader key binds that are used throughout.
     (general-evil-setup))
 
   (use-package general
+    :custom
+    (general-override-states '(insert
+                               emacs
+                               hybrid
+                               normal
+                               visual
+                               motion
+                               operator
+                               replace))
     :init
     (defvar uno-leader-key "SPC"
       "Leader key.")
@@ -75,13 +87,13 @@ Set up general and leader key binds that are used throughout.
       "Mode leader key.")
     :config
     (general-create-definer uno-define
-      :states 'motion)
+      :states '(motion normal visual))
     (general-create-definer uno-leader-define
       :prefix uno-leader-key
-      :states 'motion)
+      :states '(motion normal visual))
     (general-create-definer uno-mode-leader-define
       :prefix uno-mode-leader-key
-      :states 'motion)
+      :states '(motion normal visual))
     (uno-leader-define "" nil)
     (uno-mode-leader-define "" nil))
 #+END_SRC
diff --git a/uno/modules/app/rss.org b/uno/modules/app/rss.org
index 78eda6b..7b39654 100644
--- a/uno/modules/app/rss.org
+++ b/uno/modules/app/rss.org
@@ -22,8 +22,20 @@ Use =elfeed= to provide an interface for RSS feeds.
     :custom
     (elfeed-db-directory (uno-cache-path "elfeed"))
     :general
+    (uno-define
+      :keymaps 'elfeed-search-mode-map
+      "r" 'elfeed-update)
     (uno-leader-define
-      "ar" '(elfeed :which-key "RSS")))
+      "ar" '(elfeed :which-key "RSS")
+      "fer" '(uno/app/rss/edit :which-key "Edit RSS configuration"))
+    :init
+    (defvar uno-app-rss-config (uno-private-path "elfeed.org")
+      "Path for RSS configuration.")
+    (defun uno/app/rss/edit ()
+      "Open RSS configuration."
+      (interactive)
+      (find-file uno-app-rss-config))
+      (uno/add-useless-buffer "\\*elfeed-log\\*"))
 #+END_SRC
 
 * Org Integration
@@ -33,6 +45,8 @@ Use =elfeed-org= to provide easier management.
 #+BEGIN_SRC emacs-lisp
   (use-package elfeed-org
     :after (uno-app-rss elfeed)
+    :custom
+    (rmh-elfeed-org-files `(,uno-app-rss-config))
     :config
     (elfeed-org))
 #+END_SRC
diff --git a/uno/modules/config.org b/uno/modules/config.org
index a3157da..20f9381 100644
--- a/uno/modules/config.org
+++ b/uno/modules/config.org
@@ -20,7 +20,7 @@ Define core config package.
     :general
     (uno-leader-define
       "fed" '(uno/config/edit :which-key "Edit emacs configuration")
-      "fer" '(uno/config/reload :which-key "Reload Emacs configuration")
+      "feR" '(uno/config/reload :which-key "Reload Emacs configuration")
       "fs" '(save-buffer :which-key "Save file")
       "fS" '(uno/file/save-all-files :which-key "Save all files"))
     :init
diff --git a/uno/modules/dev/help.org b/uno/modules/dev/help.org
new file mode 100644
index 0000000..ea3bb51
--- /dev/null
+++ b/uno/modules/dev/help.org
@@ -0,0 +1,27 @@
+#+TITLE: Dev - Help
+#+AUTHOR: Juan Placencia
+
+* Package
+
+Define help dev package.
+
+#+BEGIN_SRC emacs-lisp
+  (use-package emacs
+    :after uno-dev
+    :config
+    (provide 'uno-dev-help))
+#+END_SRC
+
+* Helpful
+
+#+BEGIN_SRC emacs-lisp
+  (use-package helpful
+    :after uno-dev-help
+    :general
+    (uno-leader-define
+      "hdf" '(helpful-callable :which-key "Describe function")
+      "hdk" '(helpful-key :which-key "Describe key")
+      "hdv" '(helpful-variable :which-key "Describe variable"))
+    :config
+    (uno/handle-side-window "\\*helpful *"))
+#+END_SRC
diff --git a/uno/modules/doc/org.org b/uno/modules/doc/org.org
index 2f1e9fc..47454ce 100644
--- a/uno/modules/doc/org.org
+++ b/uno/modules/doc/org.org
@@ -29,6 +29,9 @@ Define Org document package.
     :general
     (uno-mode-leader-define
       :keymaps 'org-mode-map
+      "i" '(:ignore t :which-key "Insert")
+      "il" '(org-insert-link :which-key "Set link")
+      "it" '(org-set-tags-command :which-key "Set tags")
       "p" '(org-present :which-key "Org present")
       "'" '(org-edit-special :which-key "Edit special"))
     (uno-mode-leader-define
diff --git a/uno/modules/key/emacs.org b/uno/modules/key/emacs.org
index ea3f81f..be85c6c 100644
--- a/uno/modules/key/emacs.org
+++ b/uno/modules/key/emacs.org
@@ -32,13 +32,10 @@ Define core keybinds.
       "hd" '(:ignore t :which-key "Describe")
       "hdb" '(describe-bindings :which-key "Describe bindings")
       "hdc" '(describe-char :which-key "Describe char")
-      "hdf" '(describe-function :which-key "Describe function")
       "hdF" '(describe-face :which-key "Describe face")
-      "hdk" '(describe-key :which-key "Describe key")
       "hdm" '(describe-mode :which-key "Describe mode")
       "hdp" '(describe-package :which-key "Describe package")
       "hdt" '(describe-theme :which-key "Describe theme")
-      "hdv" '(describe-variable :which-key "Describe variable")
       "q" '(:ignore t :which-key "Quit")
       "qq" '(save-buffers-kill-terminal :which-key "Save all and quit Emacs")
       "qQ" '(kill-emacs :which-key "Quit Emacs")
diff --git a/uno/modules/key/vim.org b/uno/modules/key/vim.org
index be95369..9a18401 100644
--- a/uno/modules/key/vim.org
+++ b/uno/modules/key/vim.org
@@ -21,8 +21,6 @@ Define Vim key package.
     (evil-split-window-before t)
     (evil-vsplit-window-right t)
     (evil-want-integration t)
-    :hook
-    (uno-special-mode . evil-motion-state)
     :general
     (uno-define ";" 'evil-ex)
     :init
diff --git a/uno/modules/window.org b/uno/modules/window.org
index 6e8e802..f860281 100644
--- a/uno/modules/window.org
+++ b/uno/modules/window.org
@@ -38,6 +38,7 @@ Define where certain buffers go where in the window.
     :config
     (uno/handle-side-window "\\*Backtrace\\*")
     (uno/handle-side-window "\\*Compile-Log\\*")
+    (uno/handle-side-window "\\*Completions\\*")
     (uno/handle-side-window "\\*eshell\\*" 'bottom -1)
     (uno/handle-side-window "\\*[Hh]elp\\*")
     (uno/handle-side-window "\\*Messages\\*")