@@ -92,6 +92,93 @@

 (defvar fwoar-git-mode :ssh)

 (when (locate-library "site-lisp")

   (load "site-lisp"))

+

+

+

+(fwoar/zenburn-with-color-variables

+  (defface magit-keyword-feature

+    `((t :foreground ,zenburn-green :inherit magit-keyword))

+    "Face for parts of commit messages inside brackets."

+    :group 'magit-faces)

+  (defface magit-keyword-chore

+    `((t :foreground ,zenburn-blue :inherit magit-keyword))

+    "Face for parts of commit messages inside brackets."

+    :group 'magit-faces)

+  (defface magit-keyword-misc

+    `((t :foreground ,zenburn-fg-1 :inherit magit-keyword))

+    "Face for parts of commit messages inside brackets."

+    :group 'magit-faces)

+  (defface magit-keyword-bug

+    `((t :foreground ,zenburn-red :inherit magit-keyword))

+    "Face for parts of commit messages inside brackets."

+    :group 'magit-faces))

+

+(defun fwoar/propertize-magit-log (_rev msg)

+  (let ((boundary 0))

+    (while (string-match "^\\(\\(?:feat\\(?:ure\\)?(\\([^)]+?\\))\\)\\|\\(?:feat\\(ure\\)?\\>\\)\\)" msg boundary)

+      (setq boundary (match-end 0))

+      (magit--put-face (match-beginning 0) boundary

+                       'magit-keyword-feature msg)))

+  (let ((boundary 0))

+    (while (string-match "^\\(\\(?:chore(\\([^)]+?\\))\\)\\|\\(?:chore\\>\\)\\)" msg boundary)

+      (setq boundary (match-end 0))

+      (magit--put-face (match-beginning 0) boundary

+                       'magit-keyword-chore msg)))

+  (let ((boundary 0))

+    (while (string-match "^\\(\\(?:bug(\\([^)]+?\\))\\)\\|\\(?:bug\\>\\)\\)"  msg boundary)

+      (setq boundary (match-end 0))

+      (magit--put-face (match-beginning 0) boundary

+                       'magit-keyword-bug msg)))

+  (let ((boundary 0))

+    (while (string-match "^\\([^:\n\t]+\\):"  msg boundary)

+      (setq boundary (match-end 0))

+      (let ((group (match-string 1 msg)))

+        (unless (or (> (length group) 20)

+                    (s-starts-with? "feat" group)

+                    (s-starts-with? "Merge" group)

+                    (s-starts-with? "merge" group)

+                    (s-starts-with? "chore" group)

+                    (s-starts-with? "bug" group))

+          (magit--put-face (match-beginning 0) (1- boundary)

+                           'magit-keyword-misc msg))))))

+

+(use-package magit

+  :ensure t

+  :config

+  (evil-define-key 'normal magit-file-mode-map " a" 'magit)

+  ;; TODO: figure this out with transients

+  ;;(magit-define-popup-action 'magit-dispatch-popup ?j "Browse remote" 'browse-at-remote)

+  'magit-dispatch

+

+  (advice-add 'magit-log-propertize-keywords :after

+              'fwoar/propertize-magit-log))

+

+(use-package browse-at-remote

+  :after magit

+  :ensure t

+  :config (push (cons "gitlab.cj.com" "gitlab")

+                browse-at-remote-remote-type-domains))

+

+(eval-and-compile

+  (defvar *fwoar-git-repos*

+    (file-name-as-directory

+     (expand-file-name (car (file-expand-wildcards "~/git*_repos"))

+                       "~"))))

+

+(eval-and-compile

+  (defun fwoar-git-repo (name ssh-remote http-remote)

+    (let ((dir-name (file-name-as-directory (expand-file-name name *fwoar-git-repos*))))

+      (unless (file-exists-p dir-name)

+        (ecase fwoar-git-mode

+          (:ssh (magit-run-git-with-input "clone" ssh-remote dir-name))

+          (:http (magit-run-git-with-input "clone" http-remote dir-name))))

+      dir-name)))

+

+(defvar *dotfiles-repo*

+  (fwoar-git-repo "dotfiles"

+                  "git@git.fiddlerwoaroof.com:dotfiles.git"

+                  "https://git.fiddlerwoaroof.com/git/dotfiles.git"))

+

 (defun load-package-configuration (package)

   (let* ((local-configs "~/.emacs.d/lisp/configurations/")

          (git-configs (concat *dotfiles-repo*

@@ -104,6 +191,8 @@

 ;; slime depends on fwoar-git-repo

 (load-package-configuration 'slime)

 (load-package-configuration 'cider)

+(evil-define-key 'normal magit-file-mode-map " a" 'magit)

+

 ;;(use-package multifiles

@@ -429,92 +518,6 @@ With a prefix ARG invalidates the cache first."

 (use-package highlight-parentheses :ensure t :config

   (global-highlight-parentheses-mode 1))

-

-

-(fwoar/zenburn-with-color-variables

-  (defface magit-keyword-feature

-    `((t :foreground ,zenburn-green :inherit magit-keyword))

-    "Face for parts of commit messages inside brackets."

-    :group 'magit-faces)

-  (defface magit-keyword-chore

-    `((t :foreground ,zenburn-blue :inherit magit-keyword))

-    "Face for parts of commit messages inside brackets."

-    :group 'magit-faces)

-  (defface magit-keyword-misc

-    `((t :foreground ,zenburn-fg-1 :inherit magit-keyword))

-    "Face for parts of commit messages inside brackets."

-    :group 'magit-faces)

-  (defface magit-keyword-bug

-    `((t :foreground ,zenburn-red :inherit magit-keyword))

-    "Face for parts of commit messages inside brackets."

-    :group 'magit-faces))

-

-(defun fwoar/propertize-magit-log (_rev msg)

-  (let ((boundary 0))

-    (while (string-match "^\\(\\(?:feat\\(?:ure\\)?(\\([^)]+?\\))\\)\\|\\(?:feat\\(ure\\)?\\>\\)\\)" msg boundary)

-      (setq boundary (match-end 0))

-      (magit--put-face (match-beginning 0) boundary

-                       'magit-keyword-feature msg)))

-  (let ((boundary 0))

-    (while (string-match "^\\(\\(?:chore(\\([^)]+?\\))\\)\\|\\(?:chore\\>\\)\\)" msg boundary)

-      (setq boundary (match-end 0))

-      (magit--put-face (match-beginning 0) boundary

-                       'magit-keyword-chore msg)))

-  (let ((boundary 0))

-    (while (string-match "^\\(\\(?:bug(\\([^)]+?\\))\\)\\|\\(?:bug\\>\\)\\)"  msg boundary)

-      (setq boundary (match-end 0))

-      (magit--put-face (match-beginning 0) boundary

-                       'magit-keyword-bug msg)))

-  (let ((boundary 0))

-    (while (string-match "^\\([^:\n\t]+\\):"  msg boundary)

-      (setq boundary (match-end 0))

-      (let ((group (match-string 1 msg)))

-        (unless (or (> (length group) 20)

-                    (s-starts-with? "feat" group)

-                    (s-starts-with? "Merge" group)

-                    (s-starts-with? "merge" group)

-                    (s-starts-with? "chore" group)

-                    (s-starts-with? "bug" group))

-          (magit--put-face (match-beginning 0) (1- boundary)

-                           'magit-keyword-misc msg))))))

-

-(use-package magit

-  :ensure t

-  :config

-  (evil-define-key 'normal magit-file-mode-map " a" 'magit)

-  ;; TODO: figure this out with transients

-  ;;(magit-define-popup-action 'magit-dispatch-popup ?j "Browse remote" 'browse-at-remote)

-  'magit-dispatch

-

-  (advice-add 'magit-log-propertize-keywords :after

-              'fwoar/propertize-magit-log))

-

-(use-package browse-at-remote

-  :after magit

-  :ensure t

-  :config (push (cons "gitlab.cj.com" "gitlab")

-                browse-at-remote-remote-type-domains))

-

-(eval-and-compile

-  (defvar *fwoar-git-repos*

-    (file-name-as-directory

-     (expand-file-name (car (file-expand-wildcards "~/git*_repos"))

-                       "~"))))

-

-(eval-and-compile

-  (defun fwoar-git-repo (name ssh-remote http-remote)

-    (let ((dir-name (file-name-as-directory (expand-file-name name *fwoar-git-repos*))))

-      (unless (file-exists-p dir-name)

-        (ecase fwoar-git-mode

-          (:ssh (magit-run-git-with-input "clone" ssh-remote dir-name))

-          (:http (magit-run-git-with-input "clone" http-remote dir-name))))

-      dir-name)))

-

-(defvar *dotfiles-repo*

-  (fwoar-git-repo "dotfiles"

-                  "git@git.fiddlerwoaroof.com:dotfiles.git"

-                  "https://git.fiddlerwoaroof.com/git/dotfiles.git"))

-

 (global-company-mode 1)