Merge branch 'master' of github.com:SqrtMinusOne/dotfiles

This commit is contained in:
Pavel Korytov 2021-03-04 12:34:52 +03:00
commit f39411a3cd
4 changed files with 161 additions and 259 deletions

View file

@ -27,6 +27,7 @@
'(notmuch-search-oldest-first nil)
'(org-agenda-files
'("~/Documents/org-mode/ETU/sem-10.org" "~/Documents/org-mode/ETU/r&d.org" "~/Documents/org-mode/Personal/misc.org" "~/Documents/org-mode/Job/dig-traject.org" "~/Documents/org-mode/Personal/look-forward.org" "~/Documents/org-mode/ETU/sem-9.org"))
'(org-edit-src-content-indentation 0)
'(send-mail-function 'smtpmail-send-it)
'(sgml-basic-offset 2)
'(smtpmail-smtp-server "smtp.gmail.com")
@ -34,7 +35,8 @@
'(sp-autoskip-opening-pair t)
'(sp-highlight-pair-overlay nil)
'(wakatime-cli-path "/usr/bin/wakatime")
'(wakatime-python-bin nil))
'(wakatime-python-bin nil)
'(warning-suppress-types '((lsp-mode) (comp))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.

File diff suppressed because one or more lines are too long

View file

@ -21,7 +21,7 @@
(straight-use-package 'use-package)
(eval-when-compile (require 'use-package))
(setq use-package-verbose t)
;; (setq use-package-verbose t)
(setq my/lowpower (string= (system-name) "pntk"))
@ -70,12 +70,18 @@
:weight 'bold)
:straight t)
(defun my-edit-configuration ()
(defun my/edit-configuration ()
"Open the init file."
(interactive)
(find-file "~/.emacs.d/emacs.org"))
(general-define-key "C-c c" 'my-edit-configuration)
;; (defun my/edit-exwm-configuration ()
;; "Open the exwm config file."
;; (interactive)
;; (find-file "~/.emacs.d/exwm.org"))
(general-define-key "C-c c" 'my/edit-configuration)
;; (general-define-key "C-c C" 'my/edit-exwm-configuration)
(general-def :states '(normal insert visual)
"<home>" 'beginning-of-line
@ -154,7 +160,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
eshell
helpful
compile
comint)))
comint
magit)))
(use-package evil-quickscope
:straight t
@ -164,10 +171,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(LaTeX-mode . turn-on-evil-quickscope-mode)))
(general-create-definer my-leader-def
:prefix "SPC"
:keymaps 'override
:prefix "SPC"
:states '(normal motion emacs))
(general-def
:keymaps 'override
:states '(normal motion emacs insert visual)
@ -447,10 +454,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:config
(global-git-gutter-mode +1))
(use-package evil-magit
:after (magit)
:straight t)
(my-leader-def
"m" 'magit
"M" 'magit-file-dispatch)
@ -492,14 +495,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(setq-default tab-width 4)
(setq-default evil-shift-round nil)
(use-package winner-mode
:ensure nil
:config
(winner-mode)
:bind (:map evil-window-map
("u" . winner-undo)
("U" . winner-redo)
))
(winner-mode 1)
(define-key evil-window-map (kbd "u") 'winner-undo)
(define-key evil-window-map (kbd "U") 'winner-redo)
(use-package editorconfig
:straight t
@ -523,7 +521,12 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(general-imap "M-TAB" 'company-yasnippet)
(add-hook 'prog-mode-hook #'hs-minor-mode)
(use-package hideshowvis
:straight t
:config
;; (add-hook 'prog-mode-hook #'hs-minor-mode)
)
(general-nmap "TAB" 'evil-toggle-fold)
(general-nmap :keymaps 'hs-minor-mode-map "ze" 'hs-hide-level)
@ -540,9 +543,6 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:config
(global-activity-watch-mode))
(use-package no-littering
:straight t)
(use-package dired
:ensure nil
:custom ((dired-listing-switches "-alh --group-directories-first"))
@ -709,11 +709,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
;; (general-nmap "`" 'aweshell-dedicated-toggle)
;; (general-nmap "~" 'eshell)
(straight-override-recipe
'(org :repo "emacsmirror/org" :no-build t))
(use-package org
:straight t)
:straight (:type built-in))
(use-package evil-org
:straight t
@ -779,7 +776,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
;; (use-package htmlize
;; :straight t)
(defun my/setup-org-latex ()
(setq org-latex-compiler "xelatex")
(add-to-list 'org-latex-classes
@ -804,20 +801,25 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:keymaps 'org-mode-map
"C-c d" 'org-decrypt-entry
"C-c e" 'org-encrypt-entry
"M-p" 'org-latex-preview
)
"M-p" 'org-latex-preview)
(general-define-key
:keymaps 'org-mode-map
:states '(normal emacs)
"L" 'org-shiftright
"H" 'org-shiftleft)
(general-define-key
:keymaps 'org-agenda-mode-map
"M-]" 'org-agenda-later
"M-[" 'org-agenda-earlier)
(general-imap :keymaps 'org-mode-map "RET" 'evil-org-return)
;; (general-imap :keymaps 'org-mode-map "RET" 'evil-org-return)
(general-nmap :keymaps 'org-mode-map "RET" 'org-ctrl-c-ctrl-c)
(my-leader-def
"aa" 'org-agenda
"ao" 'org-switchb)
"aa" 'org-agenda
"ao" 'org-switchb)
(defun my/org-link-copy (&optional arg)
"Extract URL from org-mode link and add it to kill ring."
@ -1028,34 +1030,35 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(use-package ligature
:straight (:host github :repo "mickeynp/ligature.el")
:config
(ligature-set-ligatures '(
typescript-mode
js2-mode
vue-mode
svelte-mode
scss-mode
php-mode
python-mode
LaTeX-mode
markdown-mode
clojure-mode
go-mode
sh-mode
haskell-mode)
'("--" "---" "==" "===" "!=" "!==" "=!=" "=:=" "=/=" "<="
">=" "&&" "&&&" "&=" "++" "+++" "***" ";;" "!!" "??"
"?:" "?." "?=" "<:" ":<" ":>" ">:" "<>" "<<<" ">>>"
"<<" ">>" "||" "-|" "_|_" "|-" "||-" "|=" "||=" "##"
"###" "####" "#{" "#[" "]#" "#(" "#?" "#_" "#_(" "#:"
"#!" "#=" "^=" "<$>" "<$" "$>" "<+>" "<+" "+>" "<*>"
"<*" "*>" "</" "</>" "/>" "<!--" "<#--" "-->" "->" "->>"
"<<-" "<-" "<=<" "=<<" "<<=" "<==" "<=>" "<==>" "==>" "=>"
"=>>" ">=>" ">>=" ">>-" ">-" ">--" "-<" "-<<" ">->" "<-<"
"<-|" "<=|" "|=>" "|->" "<->" "<~~" "<~" "<~>" "~~" "~~>"
"~>" "~-" "-~" "~@" "[||]" "|]" "[|" "|}" "{|" "[<"
">]" "|>" "<|" "||>" "<||" "|||>" "<|||" "<|>" "..." ".."
".=" ".-" "..<" ".?" "::" ":::" ":=" "::=" ":?" ":?>"
"//" "///" "/*" "*/" "/=" "//=" "/==" "@_" "__"))
(ligature-set-ligatures
'(
typescript-mode
js2-mode
vue-mode
svelte-mode
scss-mode
php-mode
python-mode
js-mode
markdown-mode
clojure-mode
go-mode
sh-mode
haskell-mode)
'("--" "---" "==" "===" "!=" "!==" "=!=" "=:=" "=/=" "<="
">=" "&&" "&&&" "&=" "++" "+++" "***" ";;" "!!" "??"
"?:" "?." "?=" "<:" ":<" ":>" ">:" "<>" "<<<" ">>>"
"<<" ">>" "||" "-|" "_|_" "|-" "||-" "|=" "||=" "##"
"###" "####" "#{" "#[" "]#" "#(" "#?" "#_" "#_(" "#:"
"#!" "#=" "^=" "<$>" "<$" "$>" "<+>" "<+" "+>" "<*>"
"<*" "*>" "</" "</>" "/>" "<!--" "<#--" "-->" "->" "->>"
"<<-" "<-" "<=<" "=<<" "<<=" "<==" "<=>" "<==>" "==>" "=>"
"=>>" ">=>" ">>=" ">>-" ">-" ">--" "-<" "-<<" ">->" "<-<"
"<-|" "<=|" "|=>" "|->" "<->" "<~~" "<~" "<~>" "~~" "~~>"
"~>" "~-" "-~" "~@" "[||]" "|]" "[|" "|}" "{|" "[<"
">]" "|>" "<|" "||>" "<||" "|||>" "<|||" "<|>" "..." ".."
".=" ".-" "..<" ".?" "::" ":::" ":=" "::=" ":?" ":?>"
"//" "///" "/*" "*/" "/=" "//=" "/==" "@_" "__"))
(global-ligature-mode t))
(defun zoom-in ()
@ -1185,6 +1188,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:config
(add-hook 'typescript-mode-hook #'smartparens-mode)
(add-hook 'typescript-mode-hook #'rainbow-delimiters-mode)
(add-hook 'typescript-mode-hook #'hs-minor-mode)
(my/set-smartparens-indent 'typescript-mode))
(defun set-flycheck-eslint()
@ -1196,6 +1200,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
;; #'set-flycheck-eslint)
(add-hook 'js-mode-hook #'smartparens-mode)
(add-hook 'js-mode-hook #'hs-minor-mode)
(my/set-smartparens-indent 'js-mode)
(use-package jest-test-mode
@ -1238,6 +1243,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
(my/set-smartparens-indent 'svelte-mode))
(add-hook 'scss-mode-hook #'smartparens-mode)
(add-hook 'scss-mode-hook #'hs-minor-mode)
(my/set-smartparens-indent 'scss-mode)
(use-package php-mode
@ -1375,10 +1381,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
"s" 'langtool-server-stop
"d" 'langtool-check-done
"n" 'langtool-goto-next-error
"p" 'langtool-goto-previous-error
)
"p" 'langtool-goto-previous-error)
(add-hook 'python-mode-hook #'smartparens-mode)
(add-hook 'python-mode-hook #'hs-minor-mode)
(use-package lsp-java
:straight t
@ -1386,6 +1392,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:config
(setq lsp-java-jdt-download-url "https://download.eclipse.org/jdtls/milestones/0.57.0/jdt-language-server-0.57.0-202006172108.tar.gz")
(add-hook 'java-mode-hook #'smartparens-mode)
(add-hook 'java-mode-hook #'hs-minor-mode)
(my/set-smartparens-indent 'java-mode))
(use-package clojure-mode
@ -1406,7 +1413,8 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:mode "\\.go\\'"
:config
(my/set-smartparens-indent 'go-mode)
(add-hook 'go-mode-hook 'smartparens-mode))
(add-hook 'go-mode-hook #'smartparens-mode)
(add-hook 'go-mode-hook #'hs-minor-mode))
(use-package fish-mode
:straight t
@ -1433,6 +1441,7 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:mode "\\.json\\'"
:config
(add-hook 'json-mode #'smartparens-mode)
(add-hook 'json-mode #'hs-minor-mode)
(my/set-smartparens-indent 'json-mode))
(use-package yaml-mode
@ -1449,6 +1458,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
:mode "Dockerfile\\'"
:straight t)
;; (add-hook 'emacs-lisp-mode-hook #'smartparens-strict-mode)
(add-hook 'emacs-lisp-mode-hook #'aggressive-indent-mode)
(setq remote-file-name-inhibit-cache nil)
(setq tramp-default-method "ssh")
(setq vc-ignore-dir-regexp

View file

@ -1,124 +0,0 @@
(("Emacs-langtool" . "8276eccc5587bc12fd205ee58a7a982f0a136e41")
("a.el" . "3d341eb7813ee02b00ab28e11c915295bfd4b5a7")
("ace-window" . "c7cb315c14e36fded5ac4096e158497ae974bec9")
("activity-watch-mode" . "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc")
("aggressive-indent-mode" . "b0ec0047aaae071ad1647159613166a253410a63")
("all-the-icons-dired" . "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5")
("all-the-icons.el" . "19c8708b6ed9463e6c9a3bcce92e7e92d6260008")
("annalist.el" . "134fa3f0fb91a636a1c005c483516d4b64905a6d")
("auctex" . "384c4b989192087144512a528bcc1949c2ab3e5b")
("auto-dim-other-buffers.el" . "62c936d502f35d168b9e59a66c994d74a62ad2cf")
("avy" . "e92cb37457b43336b765630dbfbea8ba4be601fa")
("aweshell" . "31004ddfdf5b6f9dae0708e799a54ec592298840")
("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
("cfrs" . "7c42f2c82c7ae689f3ef291b066688c58ab96298")
("cider" . "ae03e85a0adcd301d220e7a500aec4d5a26fbfc7")
("clips-mode" . "dd38e2822640a38f7d8bfec4f69d8dd24be27074")
("clojure-mode" . "cccddea53b816c5d06c3f4fe0ba798b9f7047a63")
("company-box" . "ec8f44674dc10dd4d50785a1f97820b29d392ea2")
("company-mode" . "88001d794d963049339883216b6606de0a1209ea")
("conda.el" . "dce431b25f5a13af58cc7cacfa7968b5a888609c")
("counsel-projectile" . "06b03c1080d3ccc3fa9b9c41b1ccbcf13f058e4b")
("csv-mode" . "8da54e8b4ef9e5fe8a0afa147c625ced603dc0aa")
("dap-mode" . "aa15b9c49b7e09bb23f9a4ff7855122f0eb19976")
("dash.el" . "0e975782086020aa12863fdb658d6a3cc748a10c")
("dired-hacks" . "d1a2bda6aa8f890cb367297ed93aee6d3b5ba388")
("dired-plus" . "40881cbe37faa27c14ef47af0a0449bcbb2c38af")
("dired-single" . "98c2102429fcac6fbfdba9198c126eb1b3dcc4e5")
("dockerfile-mode" . "ed1d04c89cd8b53963f2dcae7cb3a46967e0abbf")
("doom-modeline" . "1d8d8f885d1e2cdde31c256e11fce95a5b1fcce3")
("edit-indirect" . "bdc8f542fe8430ba55f9a24a7910639d4c434422")
("editorconfig-emacs" . "048c553999c90db0b6066b3ec647a79f4af9985d")
("el-get" . "84dd1837f9ac80a329ab0c2de6859777f445f8ff")
("elisp-refs" . "b3634a4567c655a1cda51b217629849cba0ac6a7")
("emacs-async" . "d7e7f79ee42311a0187aa2ab4f4e2f8843fa28da")
("emacs-doom-themes" . "35b86f228f76ef4f782562c9d3188769e433b17b")
("emacs-emojify" . "cfa00865388809363df3f884b4dd554a5d44f835")
("emacs-fish" . "a7c953b1491ac3a3e00a7b560f2c9f46b3cb5c04")
("emacs-jupyter" . "6ce8d01e3a550a3268b415bf9d9b635d4dba5940")
("emacs-libvterm" . "e19da61668783239e47b1a7390fca10f38ceffa9")
("emacs-request" . "accd430ee706f5b10fb20003b06bd8209bcdaa82")
("emacs-web-server" . "22ce66ea43e0eadb9ec1d691a35d9695fc29cee6")
("emacs-websocket" . "34e11124fdd9d73e431499ba8a6b6a8023519664")
("emacs-which-key" . "c0608e812a8d1bc7aefeacdfaeb56a7272eabf44")
("emacs-zmq" . "eb4e01715cbf2f356a8ae5e678ffec3380a907dc")
("emacsmirror-mirror" . "cada5476fbb770834622564856d5789c63e41433")
("epl" . "78ab7a85c08222cd15582a298a364774e3282ce6")
("evil" . "881a9ef5b92678c420617bfd60434c99ffb924b6")
("evil-collection" . "334670e29d964c5f591f75ccbf52b7b5faf4daba")
("evil-commentary" . "2dab6ac34d1617971768ad219d73af48f7473fec")
("evil-magit" . "98c076fbeb6d2d7d71e02dc204ba3ad5d577abda")
("evil-numbers" . "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e")
("evil-org-mode" . "80ef38fb378541937f6ddfe836809e76eda1e355")
("evil-quickscope" . "37a20e4c56c6058abf186ad4013c155e695e876f")
("evil-surround" . "346d4d85fcf1f9517e9c4991c1efe68b4130f93a")
("f.el" . "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec")
("flycheck" . "01396a5eff9fa494285e0d3139838231c05e3948")
("frame-local" . "7ee1106c3bcd4022f48421f8cb1ef4f995da816e")
("general.el" . "a0b17d207badf462311b2eef7c065b884462cb7c")
("git-gutter" . "cca61a1c6b0c0fd6ecb1b0366711c618581eabb6")
("gnu-elpa-mirror" . "be9f76827527f058e83818ab53c29393ccd99315")
("go-mode.el" . "49a538028e63dbe20f428c52d91f09b70b564626")
("goto-chg" . "2af612153bc9f5bed135d25abe62f46ddaa9027f")
("haskell-mode" . "3a019e65b504861d7ea23afbfecd14e5ef63e846")
("helpful" . "0b6720145e1d1e037ec8658b83fddfad2c0ce923")
("highlight-indent-guides" . "cf352c85cd15dd18aa096ba9d9ab9b7ab493e8f6")
("ht.el" . "c4c1be487d6ecb353d07881526db05d7fc90ea87")
("hydra" . "2d553787aca1aceb3e6927e426200e9bb9f056f1")
("ivy-rich" . "7b9b7b20c3ead81da90232cd6707dfad3c1f1eb3")
("jest-test-mode" . "fb2bacab9475410c79e6e4ca344f093f7698466d")
("json-mode" . "0e819e519ae17a2686e0881c4ca51fa873fa9b83")
("json-reformat" . "8eb6668ed447988aea06467ba8f42e1f2178246f")
("json-snatcher" . "b28d1c0670636da6db508d03872d96ffddbc10f2")
("let-alist" . "6708ec0b2e6dff80ff5b64698aa009d9070a2ed2")
("ligature.el" . "63530a4eaa41830370b251a64a78a0733c29f779")
("lsp-haskell" . "7efbef3d206989faa8b691a4230a3ed872542187")
("lsp-java" . "93db10d0b521435824732e1e46ac1fcf05c9893f")
("lsp-mode" . "447088158d1d090af460cc55577307553c91c0f7")
("lsp-treemacs" . "3bae4a91e05d55d5ca92da272ffcd497f370e9df")
("lsp-ui" . "0ac3e12138a7eeaf764845d1e7e61b02769003ec")
("magit" . "db1c7ecc849b83429346c2328c45648cb89722f3")
("markdown-mode" . "051734091aba17a54af96b81beebdbfc84c26459")
("melpa" . "ececaeddf8d7d17ddd9bb20401ff96edb707c06f")
("mmm-mode" . "0d00cdf4d02cc166304f6967a20fa22e2eaf208b")
("no-littering" . "57357e15643158b4e0d9b3b4f70a82f5fc73178a")
("ob-async" . "de1cd6c93242a4cb8773bbe115b7be3d4dd6b97e")
("org" . "f6e41c1d14e7ae68be8f641e54719093ebf6ff18")
("org-latex-impatient" . "d8be05fd6857c72a1766e3fa9dafa1602ccf88e3")
("org-superstar-mode" . "9d64c42e5029910153ec74cb9b5747b074281140")
("ox-hugo" . "6805ccc23365620004034c18fbed22a8a07bd4dc")
("parseclj" . "eff941126859bc9e949eae5cd6c2592e731629f2")
("parseedn" . "90cfe3df51b96f85e346f336c0a0ee6bf7fee508")
("pfuture" . "d7926de3ba0105a36cfd00811fd6278aea903eef")
("php-mode" . "8cdc727e6d4eef81655b90574784e9540f407cda")
("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
("plantuml-mode" . "ea45a13707abd2a70df183f1aec6447197fc9ccc")
("posframe" . "3454a4cb9d218c38f9c5b88798dfb2f7f85ad936")
("projectile" . "f3f8a6505d50ca0f03f7deef99a1c8aa3bcd9e58")
("pythonic" . "e0e5cc882f2f1316268ec461a34d4be8abc313b7")
("queue" . "52206c0f78afc0dfb9a287cb928c1e725103336d")
("rainbow-delimiters" . "f43d48a24602be3ec899345a3326ed0247b960c6")
("s.el" . "43ba8b563bee3426cead0e6d4ddc09398e1a349d")
("sesman" . "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05")
("shrink-path.el" . "c14882c8599aec79a6e8ef2d06454254bb3e1e41")
("smartparens" . "fb1ce4b4013fe6f86dde9dd5bd5d4c032ab0d45b")
("snow.el" . "7ca25adc94148f182ac58c9f5d35f576a8a3131c")
("spinner" . "61f59fab44d22cd5add61a1baf3f0b88a5d829d7")
("ssass-mode" . "96f557887ad97a0066a60c54f92b7234b8407016")
("straight.el" . "e1390a933b6f5a15079d6dec91eac97a17aad10c")
("svelte-mode" . "25d0018036f44ff9bd685a1c9a76d8ba57c1024d")
("swiper" . "e005666df39ca767e6d5ab71b1a55d8c08395259")
("transient" . "9ca983bab26d1a8e189a8c44471d9575284b268d")
("treemacs" . "0952728fc40022ca7db8e7a58c95e41e8d5448f1")
("typescript.el" . "1043025d42602d560949955410d3afa2562130ee")
("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407")
("use-package" . "a7422fb8ab1baee19adb2717b5b47b9c3812a84c")
("visual-fill-column" . "5b08b9ae9da5b95e42e94e4c9ec01d63e8848ea2")
("vue-html-mode" . "1514939804bad558584feeb6298b38d22eadf64e")
("vue-mode" . "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71")
("wakatime-mode" . "5e6deddda7a70f4b79832e9e8b6636418812e162")
("with-editor" . "2848a90addae086b657605b84a7fbecf2c4c1c65")
("yaml-mode" . "fc5e1c58f94472944c4aa838f00f6adcac6fa992")
("yasnippet" . "5cbdbf0d2015540c59ed8ee0fcf4788effdf75b6")
("yasnippet-snippets" . "899c027f442587e0f8ef90761f58b27907ca64b4"))
:beta