From 0efab9eba9aad07b83725d70aaeb37f8dee1ac17 Mon Sep 17 00:00:00 2001
From: Juan Placencia <juan.placencia@mfrm.com>
Date: Tue, 27 Jul 2021 20:54:33 -0500
Subject: [PATCH] Bugfixes

---
 .gitignore              |  1 -
 uno/bootstrap.org       |  2 ++
 uno/modules/dev/git.org |  2 +-
 uno/modules/mode.org    | 12 +++++++-----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9713f0d..f931cce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@
 !/.gitignore
 !/init.el
 !/early-init.el
-
diff --git a/uno/bootstrap.org b/uno/bootstrap.org
index 838c1b9..26af6c5 100644
--- a/uno/bootstrap.org
+++ b/uno/bootstrap.org
@@ -95,9 +95,11 @@ Set up general and leader key binds that are used throughout.
       :states '(motion normal visual))
     (general-create-definer uno-leader-define
       :prefix uno-leader-key
+      :keymaps 'override
       :states '(motion normal visual))
     (general-create-definer uno-mode-leader-define
       :prefix uno-mode-leader-key
+      :keymaps 'override
       :states '(motion normal visual))
     (uno-leader-define "" nil)
     (uno-mode-leader-define "" nil))
diff --git a/uno/modules/dev/git.org b/uno/modules/dev/git.org
index b7a0718..26cfc42 100644
--- a/uno/modules/dev/git.org
+++ b/uno/modules/dev/git.org
@@ -80,7 +80,7 @@ Define Git dev package.
 
 #+BEGIN_SRC emacs-lisp
   (use-package gitattributes-mode
-    :after uno-dev-git
+    :after (uno-dev-git uno-mode)
     :config
     (uno/add-prog-mode 'gitattributes-mode))
 
diff --git a/uno/modules/mode.org b/uno/modules/mode.org
index 5b015f7..8a9fbae 100644
--- a/uno/modules/mode.org
+++ b/uno/modules/mode.org
@@ -17,16 +17,18 @@ Define core mode package.
 Define custom =prog-mode= as there are some libraries that do not abide.
 
 #+BEGIN_SRC emacs-lisp
+  (defvar uno-prog-based-modes '(nxml-mode prog-mode sgml-mode)
+    "List of prog based modes.")
+
+  (defun uno/add-prog-mode (mode)
+    "Consider MODE prog based."
+    (push mode uno-prog-based-modes))
+
   (use-package emacs
     :after uno-mode
     :hook
     ((conf-mode prog-mode) . uno/run-prog-mode-hook)
     :init
-    (defvar uno-prog-based-modes '(nxml-mode prog-mode sgml-mode)
-      "List of prog based modes.")
-    (defun uno/add-prog-mode (mode)
-      "Consider MODE prog based."
-      (push mode uno-prog-based-modes))
     (defun uno/run-prog-mode-hook ()
       "Configure program mode."
       (run-hooks 'uno-prog-mode-hook)))