remove pulsar, opmitize yank/paste

2 files changed, 184 insertions, 162 deletions

diff --git a/config.el b/config.el
index 590faa6..082363c 100644
--- a/config.el
+++ b/config.el
@@ -1103,18 +1103,7 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
   (evil-mode 1)
   (define-key evil-normal-state-map "u" 'undo-tree-undo)
   (define-key evil-normal-state-map (kbd "C-r") 'undo-tree-redo)
-  
-  (setq select-enable-clipboard nil)
-  (setq select-enable-primary nil)
-  
-  ;; (evil-define-operator my-evil-yank-to-clipboard (beg end type register yank-handler)
-  ;;   (interactive "<R><x><y>")
-  ;;   (let ((select-enable-clipboard t))
-  ;;     (evil-yank beg end type register yank-handler)))
-  
-  ;; (define-key evil-normal-state-map (kbd "Y") 'my-evil-yank-to-clipboard)
-  ;; (define-key evil-visual-state-map (kbd "Y") 'my-evil-yank-to-clipboard)
-  
+   
   (evil-set-initial-state 'help-mode 'emacs)
   (evil-set-initial-state 'messages-buffer-mode 'normal)
   (evil-set-initial-state 'dired-mode 'normal)
@@ -1122,6 +1111,26 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 
 (modify-syntax-entry ?_ "w")
 
+(setq select-enable-clipboard nil)
+(setq select-enable-primary nil)
+
+(evil-define-operator my/evil-yank-to-clipboard (beg end type register yank-handler)
+  :move-point nil
+  :repeat nil
+  (interactive "<R><x><y>")
+  (let ((select-enable-clipboard t))
+    (evil-yank beg end type register yank-handler)))
+
+(defun my/evil-paste-from-clipboard ()
+  (interactive)
+  (let ((select-enable-clipboard t))
+    (evil-paste-before 1 ?+)))
+
+(general-def '(normal visual) 'override
+  :prefix "SPC"
+  "yy" 'my/evil-yank-to-clipboard
+  "yp" 'my/evil-paste-from-clipboard)
+
 (use-package smartparens
   :ensure t
   :init
@@ -1239,52 +1248,52 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 (use-package envrc
   :hook (after-init . envrc-global-mode))
 
-(use-package pulsar
-  :defer t
-  :straight t
-  :ensure t
-  :hook
-  ;; (after-init . pulsar-global-mode)
-  :init
-  (setq pulsar-pulse-on-window-change nil)
-  :config
-  (setq pulsar-pulse t)
-  (setq pulsar-delay 0.025)
-  (setq pulsar-iterations 10)
-  (setq pulsar-face 'evil-ex-lazy-highlight)
+;; (use-package pulsar
+;;   :defer t
+;;   :straight t
+;;   :ensure t
+;;   :hook
+;;   ;; (after-init . pulsar-global-mode)
+;;   :init
+;;   (setq pulsar-pulse-on-window-change nil)
+;;   :config
+;;   (setq pulsar-pulse t)
+;;   (setq pulsar-delay 0.025)
+;;   (setq pulsar-iterations 10)
+;;   (setq pulsar-face 'evil-ex-lazy-highlight)
 
-  (add-hook 'org-agenda-mode-hook
-            (lambda () (pulsar-mode -1)))
+;;   (add-hook 'org-agenda-mode-hook
+;;             (lambda () (pulsar-mode -1)))
 
-  (setq pulsar-pulse-functions
-        '(evil-scroll-down
-          flymake-goto-next-error
-          flymake-goto-prev-error
-          evil-yank
-          evil-yank-line
-          evil-delete
-          evil-delete-line
-          evil-jump-item
-          diff-hl-next-hunk
-          diff-hl-previous-hunk
-          recenter-top-bottom
-          move-to-window-line-top-bottom
-          reposition-window
-          bookmark-jump
-          other-window
-          delete-window
-          delete-other-windows
-          forward-page
-          backward-page
-          scroll-up-command
-          scroll-down-command
-          windmove-right
-          windmove-left
-          windmove-up
-          windmove-down
-          tab-new
-          tab-close
-          tab-next)))
+;;   (setq pulsar-pulse-functions
+;;         '(evil-scroll-down
+;;           flymake-goto-next-error
+;;           flymake-goto-prev-error
+;;           evil-yank
+;;           evil-yank-line
+;;           evil-delete
+;;           evil-delete-line
+;;           evil-jump-item
+;;           diff-hl-next-hunk
+;;           diff-hl-previous-hunk
+;;           recenter-top-bottom
+;;           move-to-window-line-top-bottom
+;;           reposition-window
+;;           bookmark-jump
+;;           other-window
+;;           delete-window
+;;           delete-other-windows
+;;           forward-page
+;;           backward-page
+;;           scroll-up-command
+;;           scroll-down-command
+;;           windmove-right
+;;           windmove-left
+;;           windmove-up
+;;           windmove-down
+;;           tab-new
+;;           tab-close
+;;           tab-next)))
 
 (use-package evil-org
   :ensure t
@@ -2075,36 +2084,36 @@ completion-category-overrides '((file (styles partial-completion))))) ;; Customi
 (global-set-key (kbd "C-=") 'text-scale-increase)
 (global-set-key (kbd "C--") 'text-scale-decrease)
 
-(defun my/evil-delete-to-blackhole (orig-fn beg end &optional type register &rest args)
-  (apply orig-fn beg end type ?_ args))
+;; (defun my/evil-delete-to-blackhole (orig-fn beg end &optional type register &rest args)
+;;   (apply orig-fn beg end type ?_ args))
 
-(advice-add 'evil-delete :around 'my/evil-delete-to-blackhole)
+;; (advice-add 'evil-delete :around 'my/evil-delete-to-blackhole)
 
-(my-leader
-  "y" '(my/yank-to-clipboard :wk "clipboard" :ignore t)
-  "yy" '(my/yank-to-clipboard :wk "yank to clipboard")
-  "yp" '(my/paste-from-clipboard :wk "paste from clipboard"))
+;; (my-leader
+;;   "y" '(my/yank-to-clipboard :wk "clipboard" :ignore t)
+;;   "yy" '(my/yank-to-clipboard :wk "yank to clipboard")
+;;   "yp" '(my/paste-from-clipboard :wk "paste from clipboard"))
 
-(defun my/yank-to-clipboard ()
-  (interactive)
-  (if (region-active-p)
-      (let ((select-enable-clipboard t))
-        (kill-ring-save (region-beginning) (region-end))
-        (message "Yanked to clipboard"))
-    (message "No region active")))
+;; (defun my/yank-to-clipboard ()
+;;   (interactive)
+;;   (if (region-active-p)
+;;       (let ((select-enable-clipboard t))
+;;         (kill-ring-save (region-beginning) (region-end))
+;;         (message "Yanked to clipboard"))
+;;     (message "No region active")))
 
-(defun my/paste-from-clipboard ()
-  (interactive)
-  (let ((select-enable-clipboard t))
-    (yank)))
+;; (defun my/paste-from-clipboard ()
+;;   (interactive)
+;;   (let ((select-enable-clipboard t))
+;;     (yank)))
 
-(defun my/delete-to-clipboard ()
-  (interactive)
-  (if (region-active-p)
-      (let ((select-enable-clipboard t))
-        (kill-region (region-beginning) (region-end))
-        (message "Deleted to clipboard"))
-    (message "No region active")))
+;; (defun my/delete-to-clipboard ()
+;;   (interactive)
+;;   (if (region-active-p)
+;;       (let ((select-enable-clipboard t))
+;;         (kill-region (region-beginning) (region-end))
+;;         (message "Deleted to clipboard"))
+;;     (message "No region active")))
 
 (use-package elfeed
   :ensure t
diff --git a/config.org b/config.org
index ca9b9a6..a785c3a 100644
--- a/config.org
+++ b/config.org
@@ -1478,18 +1478,7 @@ ily <3.
   (evil-mode 1)
   (define-key evil-normal-state-map "u" 'undo-tree-undo)
   (define-key evil-normal-state-map (kbd "C-r") 'undo-tree-redo)
-  
-  (setq select-enable-clipboard nil)
-  (setq select-enable-primary nil)
-  
-  ;; (evil-define-operator my-evil-yank-to-clipboard (beg end type register yank-handler)
-  ;;   (interactive "<R><x><y>")
-  ;;   (let ((select-enable-clipboard t))
-  ;;     (evil-yank beg end type register yank-handler)))
-  
-  ;; (define-key evil-normal-state-map (kbd "Y") 'my-evil-yank-to-clipboard)
-  ;; (define-key evil-visual-state-map (kbd "Y") 'my-evil-yank-to-clipboard)
-  
+   
   (evil-set-initial-state 'help-mode 'emacs)
   (evil-set-initial-state 'messages-buffer-mode 'normal)
   (evil-set-initial-state 'dired-mode 'normal)
@@ -1498,6 +1487,30 @@ ily <3.
 (modify-syntax-entry ?_ "w")
 #+end_src
 
+*** evil yank/paste keymaps
+
+#+begin_src emacs-lisp
+(setq select-enable-clipboard nil)
+(setq select-enable-primary nil)
+
+(evil-define-operator my/evil-yank-to-clipboard (beg end type register yank-handler)
+  :move-point nil
+  :repeat nil
+  (interactive "<R><x><y>")
+  (let ((select-enable-clipboard t))
+    (evil-yank beg end type register yank-handler)))
+
+(defun my/evil-paste-from-clipboard ()
+  (interactive)
+  (let ((select-enable-clipboard t))
+    (evil-paste-before 1 ?+)))
+
+(general-def '(normal visual) 'override
+  :prefix "SPC"
+  "yy" 'my/evil-yank-to-clipboard
+  "yp" 'my/evil-paste-from-clipboard)
+#+end_src
+
 ** smart-parens
 
 #+begin_src emacs-lisp
@@ -1660,52 +1673,52 @@ ily <3.
 * pulsar
 
 #+begin_src emacs-lisp
-(use-package pulsar
-  :defer t
-  :straight t
-  :ensure t
-  :hook
-  ;; (after-init . pulsar-global-mode)
-  :init
-  (setq pulsar-pulse-on-window-change nil)
-  :config
-  (setq pulsar-pulse t)
-  (setq pulsar-delay 0.025)
-  (setq pulsar-iterations 10)
-  (setq pulsar-face 'evil-ex-lazy-highlight)
+;; (use-package pulsar
+;;   :defer t
+;;   :straight t
+;;   :ensure t
+;;   :hook
+;;   ;; (after-init . pulsar-global-mode)
+;;   :init
+;;   (setq pulsar-pulse-on-window-change nil)
+;;   :config
+;;   (setq pulsar-pulse t)
+;;   (setq pulsar-delay 0.025)
+;;   (setq pulsar-iterations 10)
+;;   (setq pulsar-face 'evil-ex-lazy-highlight)
 
-  (add-hook 'org-agenda-mode-hook
-            (lambda () (pulsar-mode -1)))
+;;   (add-hook 'org-agenda-mode-hook
+;;             (lambda () (pulsar-mode -1)))
 
-  (setq pulsar-pulse-functions
-        '(evil-scroll-down
-          flymake-goto-next-error
-          flymake-goto-prev-error
-          evil-yank
-          evil-yank-line
-          evil-delete
-          evil-delete-line
-          evil-jump-item
-          diff-hl-next-hunk
-          diff-hl-previous-hunk
-          recenter-top-bottom
-          move-to-window-line-top-bottom
-          reposition-window
-          bookmark-jump
-          other-window
-          delete-window
-          delete-other-windows
-          forward-page
-          backward-page
-          scroll-up-command
-          scroll-down-command
-          windmove-right
-          windmove-left
-          windmove-up
-          windmove-down
-          tab-new
-          tab-close
-          tab-next)))
+;;   (setq pulsar-pulse-functions
+;;         '(evil-scroll-down
+;;           flymake-goto-next-error
+;;           flymake-goto-prev-error
+;;           evil-yank
+;;           evil-yank-line
+;;           evil-delete
+;;           evil-delete-line
+;;           evil-jump-item
+;;           diff-hl-next-hunk
+;;           diff-hl-previous-hunk
+;;           recenter-top-bottom
+;;           move-to-window-line-top-bottom
+;;           reposition-window
+;;           bookmark-jump
+;;           other-window
+;;           delete-window
+;;           delete-other-windows
+;;           forward-page
+;;           backward-page
+;;           scroll-up-command
+;;           scroll-down-command
+;;           windmove-right
+;;           windmove-left
+;;           windmove-up
+;;           windmove-down
+;;           tab-new
+;;           tab-close
+;;           tab-next)))
 #+end_src
 
 * evil-org
@@ -2615,40 +2628,40 @@ ily <3.
 ** yanking 
 
 #+begin_src emacs-lisp
-(defun my/evil-delete-to-blackhole (orig-fn beg end &optional type register &rest args)
-  (apply orig-fn beg end type ?_ args))
+;; (defun my/evil-delete-to-blackhole (orig-fn beg end &optional type register &rest args)
+;;   (apply orig-fn beg end type ?_ args))
 
-(advice-add 'evil-delete :around 'my/evil-delete-to-blackhole)
+;; (advice-add 'evil-delete :around 'my/evil-delete-to-blackhole)
 
-(my-leader
-  "y" '(my/yank-to-clipboard :wk "clipboard" :ignore t)
-  "yy" '(my/yank-to-clipboard :wk "yank to clipboard")
-  "yp" '(my/paste-from-clipboard :wk "paste from clipboard"))
+;; (my-leader
+;;   "y" '(my/yank-to-clipboard :wk "clipboard" :ignore t)
+;;   "yy" '(my/yank-to-clipboard :wk "yank to clipboard")
+;;   "yp" '(my/paste-from-clipboard :wk "paste from clipboard"))
 #+end_src
 
 *** explicit yanking/pasting
 
 #+begin_src emacs-lisp
-(defun my/yank-to-clipboard ()
-  (interactive)
-  (if (region-active-p)
-      (let ((select-enable-clipboard t))
-        (kill-ring-save (region-beginning) (region-end))
-        (message "Yanked to clipboard"))
-    (message "No region active")))
+;; (defun my/yank-to-clipboard ()
+;;   (interactive)
+;;   (if (region-active-p)
+;;       (let ((select-enable-clipboard t))
+;;         (kill-ring-save (region-beginning) (region-end))
+;;         (message "Yanked to clipboard"))
+;;     (message "No region active")))
 
-(defun my/paste-from-clipboard ()
-  (interactive)
-  (let ((select-enable-clipboard t))
-    (yank)))
+;; (defun my/paste-from-clipboard ()
+;;   (interactive)
+;;   (let ((select-enable-clipboard t))
+;;     (yank)))
 
-(defun my/delete-to-clipboard ()
-  (interactive)
-  (if (region-active-p)
-      (let ((select-enable-clipboard t))
-        (kill-region (region-beginning) (region-end))
-        (message "Deleted to clipboard"))
-    (message "No region active")))
+;; (defun my/delete-to-clipboard ()
+;;   (interactive)
+;;   (if (region-active-p)
+;;       (let ((select-enable-clipboard t))
+;;         (kill-region (region-beginning) (region-end))
+;;         (message "Deleted to clipboard"))
+;;     (message "No region active")))
 #+end_src
 
 * elfeed