From 1753d0dfa0d6ddb413ac868dfa25011e5bfa8983 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Sat, 24 Jun 2023 15:32:00 +1000 Subject: Fixing corfu map and rofi keybinding --- emacs/.emacs.d/init/ycp-complete.el | 6 +++++- emacs/.emacs.d/init/ycp-org.el | 31 +++++++++++++++++++++++++++++-- emacs/.emacs.d/lisp/my/my-magit.el | 5 +++-- misc/.config/rofi/config.rasi | 16 ++++++++-------- 4 files changed, 45 insertions(+), 13 deletions(-) diff --git a/emacs/.emacs.d/init/ycp-complete.el b/emacs/.emacs.d/init/ycp-complete.el index e59bbfd..8e27f8e 100644 --- a/emacs/.emacs.d/init/ycp-complete.el +++ b/emacs/.emacs.d/init/ycp-complete.el @@ -143,11 +143,15 @@ (define-key corfu-map [remap previous-line] nil) (define-key corfu-map [remap beginning-of-buffer] nil) (define-key corfu-map [remap end-of-buffer] nil) + (define-key corfu-map [remap move-beginning-of-line] nil) + (define-key corfu-map [remap move-end-of-line] nil) (my-keybind corfu-map "C-j" #'corfu-insert "" nil "C-s" #'corfu-next - "C-r" #'corfu-previous) + "C-r" #'corfu-previous + "C-a" nil + ) (require 'my-corfu) (add-hook 'minibuffer-setup-hook #'my-corfu-enable-always-in-minibuffer 1) diff --git a/emacs/.emacs.d/init/ycp-org.el b/emacs/.emacs.d/init/ycp-org.el index edf2dca..513f719 100644 --- a/emacs/.emacs.d/init/ycp-org.el +++ b/emacs/.emacs.d/init/ycp-org.el @@ -1,8 +1,35 @@ -;; -*- lexical-binding: t; -*- +;;; ycp-org.el -- My config for org -*- lexical-binding: t -*- + +;; Copyright (C) 2023 Free Software Foundation. + +;; Author: Yuchen Pei +;; Package-Requires: ((emacs "28.2")) + +;; This file is part of dotted. + +;; dotted is free software: you can redistribute it and/or modify it under +;; the terms of the GNU Affero General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; dotted is distributed in the hope that it will be useful, but WITHOUT +;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General +;; Public License for more details. + +;; You should have received a copy of the GNU Affero General Public +;; License along with dotted. If not, see . + +;;; Commentary: + +;; My config for org. + +;;; Code: + + ;;; the glorious org mode (my-package org - (require 'my-org) (my-keybind global-map "M-u" #'org-store-link "C-c a" #'org-agenda diff --git a/emacs/.emacs.d/lisp/my/my-magit.el b/emacs/.emacs.d/lisp/my/my-magit.el index cf6749b..c6fc0f6 100644 --- a/emacs/.emacs.d/lisp/my/my-magit.el +++ b/emacs/.emacs.d/lisp/my/my-magit.el @@ -32,9 +32,10 @@ (require 'my-project) (require 'org) -(defun magit-clone-org-source (arg) +(defun my-magit-clone-org-source (arg) (interactive "P") - (let* ((url (org-entry-get (point) "Source")) + (let* ((url (or (org-entry-get (point) "Source") + (org-entry-get (point) "Website"))) (default-base-dir (alist-get "3p" my-projects-root-dirs nil nil 'string=)) (default-name diff --git a/misc/.config/rofi/config.rasi b/misc/.config/rofi/config.rasi index 0784e08..aab83de 100644 --- a/misc/.config/rofi/config.rasi +++ b/misc/.config/rofi/config.rasi @@ -73,24 +73,24 @@ configuration { kb-move-word-forward: "Alt+f"; /* kb-move-char-back: "Left,Control+b";*/ /* kb-move-char-forward: "Right,Control+f";*/ - kb-remove-word-back: "Control+BackSpace"; + kb-remove-word-back: "Alt+BackSpace"; kb-remove-word-forward: "Alt+d"; /* kb-remove-char-forward: "Delete,Control+d";*/ kb-remove-char-back: "BackSpace"; /* kb-remove-to-eol: "Control+k";*/ - kb-remove-to-sol: "Control+K"; -/* kb-accept-entry: "Control+j,Control+m,Return,KP_Enter";*/ -/* kb-accept-custom: "Control+Return";*/ + kb-remove-to-sol: "Alt+K"; + kb-accept-entry: "Control+j"; + kb-accept-custom: "Return"; /* kb-accept-custom-alt: "Control+Shift+Return";*/ /* kb-accept-alt: "Shift+Return";*/ /* kb-delete-entry: "Shift+Delete";*/ -/* kb-mode-next: "Shift+Right,Control+Tab";*/ -/* kb-mode-previous: "Shift+Left,Control+ISO_Left_Tab";*/ + kb-mode-next: "Control+Right"; + kb-mode-previous: "Control+Left"; /* kb-mode-complete: "Control+l";*/ /* kb-row-left: "Control+Page_Up";*/ /* kb-row-right: "Control+Page_Down";*/ - kb-row-up: "Up,Control+p,Alt+p"; - kb-row-down: "Down,Control+n,Alt+n"; + kb-row-up: "Up,Control+p,Alt+p,Control+r"; + kb-row-down: "Down,Control+n,Alt+n,Control+s"; /* kb-row-tab: "";*/ /* kb-element-next: "Tab";*/ /* kb-element-prev: "ISO_Left_Tab";*/ -- cgit v1.2.3