summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xemacs.org27
1 files changed, 23 insertions, 4 deletions
diff --git a/emacs.org b/emacs.org
index 807860c..1c7422b 100755
--- a/emacs.org
+++ b/emacs.org
@@ -182,10 +182,30 @@ Fonts and basic appearance settings for each device
** Ivy
#+begin_src emacs-lisp
(require 'ivy)
+
+ (ivy-mode 1)
+ ;(setq ivy-use-virtual-buffers t)
+ ;(setq enable-recursive-minibuffers t)
;; keybindings
(global-set-key (kbd "C-s") 'swiper)
(define-key ivy-minibuffer-map (kbd "TAB") 'ivy-alt-done)
-
+ (global-set-key "\C-s" 'swiper)
+ (global-set-key (kbd "C-c C-r") 'ivy-resume)
+ (global-set-key (kbd "<f6>") 'ivy-resume)
+ (global-set-key (kbd "M-x") 'counsel-M-x)
+ (global-set-key (kbd "C-x C-f") 'counsel-find-file)
+ (global-set-key (kbd "<f1> f") 'counsel-describe-function)
+ (global-set-key (kbd "<f1> v") 'counsel-describe-variable)
+ (global-set-key (kbd "<f1> o") 'counsel-describe-symbol)
+ (global-set-key (kbd "<f1> l") 'counsel-find-library)
+ (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
+ (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
+ (global-set-key (kbd "C-c g") 'counsel-git)
+ (global-set-key (kbd "C-c j") 'counsel-git-grep)
+ (global-set-key (kbd "C-c k") 'counsel-ag)
+ (global-set-key (kbd "C-x l") 'counsel-locate)
+ (global-set-key (kbd "C-S-o") 'counsel-rhythmbox)
+ (define-key minibuffer-local-map (kbd "C-r") 'counsel-minibuffer-history)
(ivy-rich-mode 1)
(all-the-icons-ivy-rich-mode 1)
@@ -215,6 +235,7 @@ Fonts and basic appearance settings for each device
#+end_src
** Keybindings
#+begin_src emacs-lisp
+ (require 'dired)
(define-key dired-mode-map "b" 'dired-up-directory)
#+end_src
** All-the-icons.el
@@ -586,7 +607,7 @@ Hook with ~dired-mode~
#+begin_src emacs-lisp
(require 'markdown-mode)
(setq markdown-header-scaling t)
- (add-to-list 'auto-mode-alist '("\\.md\\" . gfm-mode))
+ (add-to-list 'auto-mode-alist '("\\.md\\'" . gfm-mode))
(setq markdown-command "multimarkdown")
#+end_src
* Programming
@@ -598,7 +619,6 @@ Hook with ~dired-mode~
(require 'company)
(add-hook 'after-init-hook 'global-company-mode)
(define-key company-active-map (kbd "TAB") 'company-indent-or-complete-common)
- (company--idle-delay 0.0)
(require 'company-box)
(add-hook 'company-mode 'company-box-mode)
@@ -649,7 +669,6 @@ Hook with ~dired-mode~
(require 'python-mode)
(add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode))
(add-hook 'python-mode 'lsp-deferred)
- (require 'dap-python-debugger)
#+end_src
** JSON
#+begin_src emacs-lisp