diff --git a/emacs/custom.el b/emacs/custom.el index c9cf759..341b636 100644 --- a/emacs/custom.el +++ b/emacs/custom.el @@ -6,7 +6,7 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - '("2078837f21ac3b0cc84167306fa1058e3199bbd12b6d5b56e3777a4125ff6851" "81f53ee9ddd3f8559f94c127c9327d578e264c574cda7c6d9daddaec226f87bb" "3770d0ae70172461ee0a02edcff71b7d480dc54066e8960d8de9367d12171efb" "f64189544da6f16bab285747d04a92bd57c7e7813d8c24c30f382f087d460a33" "f079ef5189f9738cf5a2b4507bcaf83138ad22d9c9e32a537d61c9aae25502ef" "835d934a930142d408a50b27ed371ba3a9c5a30286297743b0d488e94b225c5f" default)) + '("81f53ee9ddd3f8559f94c127c9327d578e264c574cda7c6d9daddaec226f87bb" "3770d0ae70172461ee0a02edcff71b7d480dc54066e8960d8de9367d12171efb" "f64189544da6f16bab285747d04a92bd57c7e7813d8c24c30f382f087d460a33" "f079ef5189f9738cf5a2b4507bcaf83138ad22d9c9e32a537d61c9aae25502ef" "835d934a930142d408a50b27ed371ba3a9c5a30286297743b0d488e94b225c5f" default)) '(god-mode-alist '((nil . "C-") ("m" . "M-") ("M" . "C-M-"))) '(mac-option-modifier '(:ordinary meta :function meta :mouse meta)) '(mingus-mpd-host "192.168.178.67") @@ -18,7 +18,7 @@ ("Radio Rota" . "http://streamer.radiorota.cz:8000/rota64.ogg") ("anonradio" . "http://anonradio.net:8000/anonradio"))) '(package-selected-packages - '(realgud projectile dash async yasnippet ace-jump ace-jump-mode acme-theme async-status cape corfu deft dired-git dired-git-info doom-modeline doom-themes embark emojify eshell-toggle eshell-vterm fic-mode flycheck fzf git-lens git-link go-projectile go-scratch god-mode graphviz-dot-mode json-mode kotlin-mode ligature lsp-mode magit mastodon mingus mmm-mode multi-web-mode multifiles multiple-cursors multishell nerd-icons-completion nerd-icons-corfu nerd-icons-dired nerd-icons-ibuffer nlinum notmuch orderless org-ai org-context org-dashboard persistent-scratch php-mode plan9-theme plantuml-mode prescient project-explorer projectile-ripgrep protobuf-mode quelpa-use-package rego-mode scratch switch-window unicode-fonts vertico vterm-toggle wgrep which-key yaml-mode zenburn-theme zetteldeft)) + '(ob-go projectile dash async ace-jump ace-jump-mode acme-theme async-status cape corfu deft dired-git dired-git-info doom-modeline doom-themes embark emojify eshell-toggle eshell-vterm fic-mode flycheck fzf git-lens git-link go-projectile go-scratch god-mode graphviz-dot-mode json-mode kotlin-mode ligature lsp-mode magit mastodon mingus mmm-mode multi-web-mode multifiles multiple-cursors multishell nerd-icons-completion nerd-icons-corfu nerd-icons-dired nerd-icons-ibuffer nlinum notmuch orderless org-ai org-context org-dashboard persistent-scratch php-mode plan9-theme plantuml-mode prescient project-explorer projectile-ripgrep protobuf-mode quelpa-use-package rego-mode scratch switch-window unicode-fonts vertico vterm-toggle wgrep which-key yaml-mode zenburn-theme zetteldeft)) '(tab-width 4) '(tool-bar-mode nil) '(use-short-answers t)) diff --git a/emacs/init.el b/emacs/init.el index a321d4e..7646054 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -16,11 +16,6 @@ :url "https://github.com/quelpa/quelpa-use-package.git")) (require 'quelpa-use-package) - (quelpa - '(sink - :fetcher url - :url "https://raw.githubusercontent.com/alcah/sink.el/master/sink.el")) - ;; basic cfg (tool-bar-mode -1) (require 'server) @@ -59,23 +54,13 @@ (corfu-mode))) (with-eval-after-load 'lsp-mode (add-hook 'lsp-mode-hook #'lsp-enable-which-key-integration) - (add-hook 'lsp-mode-hook - (lambda () - (remove-hook 'before-save-hook #'lsp-format-buffer t) - (remove-hook 'before-save-hook #'lsp-organize-imports t))) (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]plz-out\\'")) (add-to-list 'auto-mode-alist - '("BUILD\\'" . python-mode)) - (setq lsp-clients-clangd-args - '("-j=2" - "--background-index" - "--completion-style=bundled" - "--pch-storage=memory" - "--header-insertion=never" - "--header-insertion-decorators=0")) - (global-set-key (kbd "C-c r") 'replace-regexp) - (global-set-key (kbd "C-c R") 'replace-string)) - + '("BUILD\\'" . python-mode)) + (global-set-key (kbd "C-c C-r") 'replace-regexp) + (global-set-key (kbd "C-c C-R") 'replace-string) + (global-set-key (kbd "C-`") 'vterm-toggle) + (global-set-key (kbd "C-") 'speedbar)) (use-package async :ensure t) (use-package async-status :ensure t) @@ -206,7 +191,7 @@ ;; org-mode ;; === -(use-package org :ensure t :defer t +(use-package org :ensure t :mode (("\\.org$" . org-mode)) :bind (("C-c C-o C-a" . org-agenda) ("C-c C-o C-c" . org-capture)) @@ -258,11 +243,9 @@ '((sequence "TODO(t)" "|" "DONE(d)"))) (setq org-hide-leading-stars nil org-startup-indented t) - (setq org-mouse-1-follows-link nil) - (org-babel-do-load-languages - 'org-babel-load-languages '((plantuml . t) - (dot . t) - (go . t)))) + (setq org-mouse-1-follows-link nil)) + +(use-package ob-go :ensure t :defer t) (use-package org-dashboard :ensure t :defer t :after (:all org)) @@ -338,7 +321,7 @@ ("SPC" . corfu-insert-separator)) :custom (corfu-cycle t) - (corfu-auto t) + (corfu-auto nil) (corfu-separator ?\s) (corfu-preselect 'prompt) (corfu-quit-at-boundary t) @@ -438,7 +421,6 @@ ;; coding ;; === -(use-package yasnippet :ensure t) (use-package fic-mode :ensure t :defer t) (use-package lsp-mode :ensure t :commands lsp @@ -452,13 +434,10 @@ (alist-get 'lsp-capf completion-category-defaults)) '(orderless))) :config - (setq lsp-prefer-flymake nil - c-c++-enable-clang-format-on-save nil) + (setq lsp-prefer-flymake nil) :hook - (prog-mode . lsp-mode) (lsp-completion-mode . my/lsp-mode-setup-completion)) - (use-package flycheck :ensure t :defer t) (use-package go-mode :ensure t :defer t :mode (("\\.go$" . go-mode)) @@ -476,12 +455,14 @@ (use-package graphviz-dot-mode :ensure t :defer t) (use-package protobuf-mode :ensure t :defer t) (use-package rego-mode :ensure t :defer t) -(use-package plantuml-mode :ensure t :defer t) +(use-package plantuml-mode :ensure t + :config + (setq plantuml-default-exec-mode 'jar + plantuml-jar-path "/usr/share/plantuml/plantuml.jar" + org-plantuml-jar-path (expand-file-name "/usr/share/plantuml/plantuml.jar")) + (org-babel-do-load-languages '((plantuml . t)))) (use-package kotlin-mode :ensure t :defer t) -(use-package realgud :ensure t :defer t) -(add-hook 'realgud-short-key-mode-hook - (lambda () - (local-set-key "\C-c" realgud:shortkey-mode-map))) + ;; search & narrow @@ -515,3 +496,16 @@ :bind (("C-c SPC" . 'ace-jump-mode) ("C-x SPC" . 'ace-jump-mode-pop-mark))) +;; antisocial +;; === + +;; (use-package mastodon :ensure t :defer t) +;; (setq mastodon-instance-url "https://mastodon.sdf.org" +;; mastodon-active-user "me@lkn.uber.space") + +(with-eval-after-load 'org + (org-babel-do-load-languages 'org-babel-load-languages + '((go . t) + (dot . t) + (plantuml . t) +)))