diff options
| -rw-r--r-- | emacs/inits/10-ivy.el | 6 | ||||
| -rw-r--r-- | emacs/inits/15-project-mgmt.el | 13 | ||||
| -rw-r--r-- | emacs/inits/20-programming.el | 15 | ||||
| -rw-r--r-- | emacs/inits/25-theorems.el | 4 | ||||
| -rw-r--r-- | emacs/themes/acme-theme.el | 4 |
5 files changed, 29 insertions, 13 deletions
diff --git a/emacs/inits/10-ivy.el b/emacs/inits/10-ivy.el index 8867bb8..47cc783 100644 --- a/emacs/inits/10-ivy.el +++ b/emacs/inits/10-ivy.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2019-09-09 22:10:08 (tslil@basingstoke)> +;; Time-stamp: <2020-01-26 16:39:05 (tslil@bison)> (use-package amx :ensure t) @@ -17,6 +17,7 @@ ("C-m" . ivy-alt-done) :map swiper-map ("M-%" . swiper-query-replace)) + :config (setq ivy-use-virtual-buffers nil ivy-display-style 'fancy @@ -39,6 +40,8 @@ (use-package ivy-rich :ensure t :config (setq ivy-rich-path-style 'abbrev + ivy-rich-parse-remote-buffer nil + ivy-rich-parse-remote-file-path nil ivy-rich-display-transformers-list '(ivy-switch-buffer (:columns @@ -76,6 +79,7 @@ (ivy-rich-mode 1)) + ;; (defun limited-counsel-locate-cmd (input) ;; "Return a shell command based on INPUT." ;; (counsel-require-program "locate") diff --git a/emacs/inits/15-project-mgmt.el b/emacs/inits/15-project-mgmt.el index 8197f99..bca9597 100644 --- a/emacs/inits/15-project-mgmt.el +++ b/emacs/inits/15-project-mgmt.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2019-04-09 23:20:17 (tslil@bison)> +;; Time-stamp: <2020-01-26 16:41:24 (tslil@bison)> (use-package projectile :ensure t @@ -7,11 +7,16 @@ :config (projectile-mode 1) + (defadvice projectile-project-root (around ignore-remote first activate) + (unless (file-remote-p default-directory) ad-do-it)) + (setq projectile-completion-system 'ivy projectile-mode-line-prefix "" - projectile-mode-line-function '(lambda () - (format " ¶[%s]" - (projectile-project-name))))) + ;; projectile-mode-line-function '(lambda () + ;; (format " ¶[%s]" + ;; (projectile-project-name))) + project-mode-line-function '(lambda () " ¶") + )) (use-package magit :ensure t diff --git a/emacs/inits/20-programming.el b/emacs/inits/20-programming.el index a072e22..18ba4b0 100644 --- a/emacs/inits/20-programming.el +++ b/emacs/inits/20-programming.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2020-01-19 21:42:02 (tslil@bison)> +;; Time-stamp: <2020-01-29 10:47:16 (tslil@bison)> ;; ----------------------------------------------------------------------------- ;; General setup @@ -31,8 +31,8 @@ (use-package shift-number :ensure t - :bind (("C-c S-i" . shift-number-up) - ("C-c S-d" . shift-number-down))) + :bind (("C-c s p" . shift-number-up) + ("C-c s n" . shift-number-down))) (use-package comment-dwim-2 :ensure t @@ -158,13 +158,20 @@ :ensure t :defer t :bind (:map rust-mode-map + ("M-," . lh-backward-delim) + ("M-." . lh-forward-delim) + ("M-/" . lh-matching-delim) + ("M-p" . beginning-of-defun) + ("M-n" . end-of-defun) ("C-c C-c" . rust-compile) ("C-c C-r" . rust-run)) :hook (rust-mode . (lambda () ;; For some reason this is not automatic (setq-local electric-pair-pairs (cons '(?' . ?') electric-pair-pairs)) - (flycheck-mode) + ;; Pair {} in rust format strings ... ? + (setq-local electric-pair-text-pairs + (cons '(?{ . ?}) electric-pair-pairs)) (flycheck-rust-setup))) :config (setq rust-indent-offset 4 diff --git a/emacs/inits/25-theorems.el b/emacs/inits/25-theorems.el index f5ab26b..e45648a 100644 --- a/emacs/inits/25-theorems.el +++ b/emacs/inits/25-theorems.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2020-01-08 18:37:56 (tslil@bison)> +;; Time-stamp: <2020-01-28 15:23:07 (tslil@bison)> ;; ----------------------------------------------------------------------------- ;; Coq @@ -45,7 +45,7 @@ :binary "hoqtop" :args nil))) -(defvar use-coq-env "HoTT") +(defvar use-coq-env "UniMath") (defun mike-implicify (ntimes) (interactive "p") diff --git a/emacs/themes/acme-theme.el b/emacs/themes/acme-theme.el index 37dc7c1..317fe56 100644 --- a/emacs/themes/acme-theme.el +++ b/emacs/themes/acme-theme.el @@ -22,7 +22,7 @@ (deftheme acme "A theme inspired by the classic colours of the ACME editor.") -(let ((bg-yellow "#FFFFBA") +(let ((bg-yellow "#FFFFEA") (bg-blue "#DAEFEF") (lazy "#D1D1C0") @@ -41,7 +41,7 @@ '(cursor ((t (:background "black")))) '(escape-glyph ((t (:foreground "black")))) '(highlight ((t (:foreground "grey30")))) - `(region ((t (:background ,yellow :foreground "black")))) + '(region ((t (:background "orange" :foreground "black")))) `(secondary-selection ((t (:background ,red)))) '(trailing-whitespace ((t (:background "grey")))) `(widget-field ((t (:background ,bg-blue)))) |