Merge branch 'master' of github.com:Mango0x45/dotfiles

2 files changed, 10 insertions, 43 deletions

diff --git a/.config/emacs/modules/mm-humanwave.el b/.config/emacs/modules/mm-humanwave.el
index 40bde27..3aa97b3 100644
--- a/.config/emacs/modules/mm-humanwave.el
+++ b/.config/emacs/modules/mm-humanwave.el
@@ -79,7 +79,6 @@ If METHOD is nil, a GET request is performed."
 
 ;;; Insert Imports in Vue
 
-
 (defun mm-humanwave-insert-vue-import-path (base-directory target-file)
   "Insert an import directive at POINT.
 The import directive imports TARGET-FILE relative from BASE-DIRECTORY.
@@ -95,8 +94,15 @@ behaviour of the INCLUDE-ALL-P argument to `mm-project-read-file-name'."
     (mm-humanwave-project-read-file-name current-prefix-arg)))
   (let ((path (file-name-sans-extension
                (file-relative-name target-file base-directory))))
+    (unless (string-match-p "/" path)
+      (setq path (concat "./" path)))
     (insert "import ")
     (save-excursion
+      (insert (thread-last
+                (file-name-base path)
+                (mm-string-split "-")
+                (mapconcat #'capitalize)))
+      (push-mark (point))
       (insert (format " from '%s';" path)))))
 
 (defun mm-humanwave-project-read-file-name (&optional include-all-p)
@@ -132,5 +138,4 @@ to the `project-find-file' command."
           (message "%s" path)
         path))))
 
-
 (provide 'mm-humanwave)
diff --git a/.config/emacs/modules/mm-projects.el b/.config/emacs/modules/mm-projects.el
index 25c1a18..02d7af4 100644
--- a/.config/emacs/modules/mm-projects.el
+++ b/.config/emacs/modules/mm-projects.el
@@ -108,45 +108,7 @@ This is intended to be called interactively via
 ;;; GitHub Pull Requests
 
 (require 'gh)
-(keymap-global-set "C-c p" #'gh-create-pr)
+(keymap-global-set "C-c p c" #'gh-create-pr)
+(keymap-global-set "C-c p o" #'gh-open-previous-pr)
 
-;; (defun mm-gh--get-labels ()
-;;   (with-temp-buffer
-;;     (call-process "gh" nil t nil "label" "list" "--json" "name")
-;;     (goto-char (point-min))
-;;     (let* ((data (json-parse-buffer))
-;;            (labels (seq-map (lambda (x) (gethash "name" x)) data)))
-;;       (sort labels
-;;             :in-place t
-;;             :lessp (lambda (x y)
-;;                      (let ((prefix-x-p (string-prefix-p "Sprint " x))
-;;                            (prefix-y-p (string-prefix-p "Sprint " y)))
-;;                        (cond
-;;                         ((and prefix-x-p prefix-y-p) (string> x y))
-;;                         (prefix-x-p t)
-;;                         (prefix-y-p nil)
-;;                         (:else (string< x y)))))))))
-
-;; (defun mm-gh-create-pr (title draftp labels)
-;;   "Create a GitHub pull request using the gh CLI.
-;; If DRAFT is non-nil, the PR will be created as a draft.
-;; LABELS should be a comma-separated string of GitHub labels."
-;;   (interactive
-;;    (list
-;;     (read-string (format-prompt "PR Title" nil))
-;;     (y-or-n-p "Create as draft PR? ")
-;;     (completing-read-multiple (format-prompt "PR Labels" nil)
-;;                               (mm-gh--get-labels))))
-;;   (let* ((branch (car (vc-git-branches)))
-;;          (title (format "%s %s" branch title))
-;;          (flags `("--fill-verbose" "--title" ,title "--assignee" "@me"))
-;;          (label-string (mapconcat #'identity labels ",")))
-;;     (when draftp
-;;       (setq flags (append flags '("--draft"))))
-;;     (when labels
-;;       (setq flags (append flags `("--label" ,label-string))))
-;;     (with-temp-buffer
-;;       (apply #'call-process "gh" nil t nil "pr" "create" flags)
-;;       (message (buffer-string)))))
-
-(provide 'mm-projects)
\ No newline at end of file
+(provide 'mm-projects)