diff --git a/.bashrc b/.bashrc index 0e711c6..3568b4c 100644 --- a/.bashrc +++ b/.bashrc @@ -21,6 +21,9 @@ fi if [ -d "$HOME/.rvm" ] ; then export PATH="$PATH:$HOME/.rvm/bin" fi +# if [ -d "$HOME/.gem" ]; then +# export PATH="$HOME/.gem/ruby/2.7.0/bin:$PATH" +# fi if [ -d "$HOME/go" ] ; then export PATH="$HOME/go/bin:$PATH" fi diff --git a/.emacs.d/emacs.org b/.emacs.d/emacs.org index b2aa422..617b65f 100644 --- a/.emacs.d/emacs.org +++ b/.emacs.d/emacs.org @@ -408,7 +408,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." ) (my-leader-def "SPC" 'ivy-resume) -(my-leader-def "s" 'swiper-isearch) +(my-leader-def "s" 'swiper-isearch + "S" 'swiper-all) (general-define-key :keymaps '(ivy-minibuffer-map swiper-map) @@ -483,6 +484,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." :config (global-company-mode) (setq company-idle-delay (if my/lowpower 0.5 0.125)) + (setq company-dabbrev-downcase nil) (setq company-show-numbers t)) (use-package company-box @@ -684,7 +686,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." :straight t :if (not my/lowpower) :config - (add-hook 'dired-mode-hook 'all-the-icons-dired-mode)) + (add-hook 'dired-mode-hook 'all-the-icons-dired-mode) + (advice-add 'dired-add-entry :around #'all-the-icons-dired--refresh-advice) + (advice-add 'dired-remove-entry :around #'all-the-icons-dired--refresh-advice)) (use-package dired-open :straight t) @@ -1357,6 +1361,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (add-hook 'vue-mode-hook (lambda () (set-face-background 'mmm-default-submode-face nil))) #+end_src +** Python +#+begin_src emacs-lisp +(add-hook 'python-mode-hook #'smartparens-mode) +#+end_src ** Clojure #+begin_src emacs-lisp (use-package clojure-mode @@ -1499,7 +1507,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." )) (setq markdown-live-preview-delete-export 'delete-on-export) (setq markdown-asymmetric-header t) - (setq markdown-open-command "/home/pavel/bin/scripts/vmd-sep") + (setq markdown-open-command "/home/pavel/bin/scripts/chromium-sep") ) ;; (use-package livedown @@ -1512,6 +1520,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." :keymaps 'markdown-mode-map "M-" 'markdown-promote "M-" 'markdown-demote) + +(add-hook 'markdown-mode-hook #'smartparens-mode) +;; (my/set-smartparens-indent 'js-mode) #+end_src ** PlantUML #+begin_src emacs-lisp @@ -1527,6 +1538,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (general-nmap :keymaps 'plantuml-mode-map "RET" 'plantuml-preview) + +(add-hook 'plantuml-mode-hook #'smartparens-mode) #+end_src ** fish #+begin_src emacs-lisp @@ -1566,7 +1579,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (setq langtool-mother-tongue "ru")) (my-leader-def - :infix "S" + :infix "L" "c" 'langtool-check "s" 'langtool-server-stop "d" 'langtool-check-done diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 45cded5..90dc15b 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -276,6 +276,12 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (use-package swiper :straight t) +(use-package ivy-rich + :straight t + :config + (ivy-rich-mode 1) + (setcdr (assq t ivy-format-functions-alist) #'ivy-format-function-line)) + (my-leader-def :infix "f" "b" 'ivy-switch-buffer @@ -287,7 +293,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." ) (my-leader-def "SPC" 'ivy-resume) -(my-leader-def "s" 'swiper-isearch) +(my-leader-def "s" 'swiper-isearch + "S" 'swiper-all) (general-define-key :keymaps '(ivy-minibuffer-map swiper-map) @@ -356,6 +363,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." :config (global-company-mode) (setq company-idle-delay (if my/lowpower 0.5 0.125)) + (setq company-dabbrev-downcase nil) (setq company-show-numbers t)) (use-package company-box @@ -519,7 +527,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." :straight t :if (not my/lowpower) :config - (add-hook 'dired-mode-hook 'all-the-icons-dired-mode)) + (add-hook 'dired-mode-hook 'all-the-icons-dired-mode) + (advice-add 'dired-add-entry :around #'all-the-icons-dired--refresh-advice) + (advice-add 'dired-remove-entry :around #'all-the-icons-dired--refresh-advice)) (use-package dired-open :straight t) @@ -1079,6 +1089,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (add-hook 'vue-mode-hook (lambda () (set-face-background 'mmm-default-submode-face nil))) +(add-hook 'python-mode-hook #'smartparens-mode) + (use-package clojure-mode :straight t) @@ -1200,7 +1212,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." )) (setq markdown-live-preview-delete-export 'delete-on-export) (setq markdown-asymmetric-header t) - (setq markdown-open-command "/home/pavel/bin/scripts/vmd-sep") + (setq markdown-open-command "/home/pavel/bin/scripts/chromium-sep") ) ;; (use-package livedown @@ -1213,6 +1225,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." :keymaps 'markdown-mode-map "M-" 'markdown-promote "M-" 'markdown-demote) + +(add-hook 'markdown-mode-hook #'smartparens-mode) +;; (my/set-smartparens-indent 'js-mode) (use-package plantuml-mode :straight t @@ -1226,6 +1241,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (general-nmap :keymaps 'plantuml-mode-map "RET" 'plantuml-preview) + +(add-hook 'plantuml-mode-hook #'smartparens-mode) (use-package fish-mode :straight t) @@ -1253,7 +1270,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer." (setq langtool-mother-tongue "ru")) (my-leader-def - :infix "S" + :infix "L" "c" 'langtool-check "s" 'langtool-server-stop "d" 'langtool-check-done diff --git a/README.md b/README.md new file mode 100644 index 0000000..f47360e --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# dotfiles +My dotfiles. Deployed with [https://yadm.io/](yadm)