1
0
Fork 0
mirror of https://github.com/Horhik/dotfiles.git synced 2024-11-24 00:51:39 +00:00

update pure_emacs config

This commit is contained in:
Horhik 2022-08-04 19:29:07 +03:00
parent 7334f9cb09
commit 97f826cdbd
3 changed files with 247 additions and 225 deletions

View file

@ -18,7 +18,10 @@
(setq max-lisp-eval-depth 10000) (setq max-lisp-eval-depth 10000)
(require 'package) (require 'package)
(add-to-list 'package-archives (add-to-list 'package-archives
'("melpa" . "http://stable.melpa.org/packages/")) '("melpa" . "http://melpa.org/packages/") t)
(add-to-list 'package-archives
'("melpa" . "http://melpa.org/packages/") t)
(package-initialize) (package-initialize)
@ -27,13 +30,30 @@
(defvar package-list (defvar package-list
'(use-package doom-themes)) '(gruvbox-theme))
(dolist (p package-list) (dolist (p package-list)
(when (not (package-installed-p p)) (when (not (package-installed-p p))
(package-install p))) (package-install p)))
(defvar bootstrap-version)
(let ((bootstrap-file
(expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
(bootstrap-version 5))
(unless (file-exists-p bootstrap-file)
(with-current-buffer
(url-retrieve-synchronously
"https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
'silent 'inhibit-cookies)
(goto-char (point-max))
(eval-print-last-sexp)))
(load bootstrap-file nil 'nomessage))
(setq package-enable-at-startup nil)
(setq straight-use-package-by-default t)
(straight-use-package 'org)
(straight-use-package 'use-package)
#+end_src #+end_src
#+RESULTS: #+RESULTS:
@ -53,6 +73,7 @@
(global-visual-line-mode) (global-visual-line-mode)
#+end_src #+end_src
#+RESULTS: #+RESULTS:
: t : t
@ -68,10 +89,10 @@
;; '("75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default)) ;; '("75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default))
;; '(package-selected-packages ;; '(package-selected-packages
;; '(neotree treemacs-persp spaceline-all-the-icons all-the-icons-ivy-rich all-the-icons-ivy treemacs-the-icons dired-icon treemacs-magit treemacs-projectile nlinum linum-mode unicode-fonts ewal-doom-themes ivy-rich which-key counsel org-roam treemacs-evil treemacs-all-the-icons treemacs use-package general gruvbox-theme flycheck-rust cargo linum-relative ac-racer lusty-explorer doom-modeline doom-themes rainbow-delimiters evil-mc rustic lsp-mode avy))) ;; '(neotree treemacs-persp spaceline-all-the-icons all-the-icons-ivy-rich all-the-icons-ivy treemacs-the-icons dired-icon treemacs-magit treemacs-projectile nlinum linum-mode unicode-fonts ewal-doom-themes ivy-rich which-key counsel org-roam treemacs-evil treemacs-all-the-icons treemacs use-package general gruvbox-theme flycheck-rust cargo linum-relative ac-racer lusty-explorer doom-modeline doom-themes rainbow-delimiters evil-mc rustic lsp-mode avy)))
(use-package doom-themes (use-package gruvbox-theme
:ensure t :ensure t
) )
(load-theme 'doom-gruvbox t) (load-theme 'gruvbox-dark-hard t)
;; (use-package gruvbox-theme ;; (use-package gruvbox-theme
;; :ensure t ;; :ensure t
@ -283,10 +304,7 @@
:ensure t :ensure t
:config (treemacs-set-scope-type 'Perspectives)) :config (treemacs-set-scope-type 'Perspectives))
(use-package neotree
:ensure t
:init
(setq neo-theme (if (display-graphic-p) 'icons 'arrow)))
(org-babel-do-load-languages (org-babel-do-load-languages
'org-babel-load-languages 'org-babel-load-languages
@ -294,7 +312,6 @@
(use-package magit) (use-package magit)
(use-package workgroups2)
#+end_src #+end_src
@ -420,15 +437,12 @@
:config :config
(setq which-key-idle-delay 0.3)) (setq which-key-idle-delay 0.3))
(use-package all-the-icons-ivy-rich
:ensure t
:init (all-the-icons-ivy-rich-mode 1))
(use-package ivy-rich ;; (use-package ivy-rich
:init ;; :init
(ivy-rich-mode 1)) ;; (ivy-rich-mode 1))
;;
#+end_src #+end_src
@ -445,8 +459,8 @@
(company-minimum-prefix-length 1) (company-minimum-prefix-length 1)
(company-idle-delay 0.0)) (company-idle-delay 0.0))
(use-package company-box ;;(use-package company-box
:hook (company-mode . company-box-mode)) ;; :hook (company-mode . company-box-mode))
#+end_src #+end_src
** Popup ** Popup
@ -630,6 +644,55 @@
#+RESULTS: #+RESULTS:
: t : t
** Org roam
#+begin_src emacs-lisp
(use-package org-roam
:straight
(:host github :repo "org-roam/org-roam" :branch "main" :files ("*.el" "out"))
:after org
:ensure t
:custom
(org-roam-directory (file-truename "~/Documents/KB/"))
:bind (("C-c n l" . org-roam-buffer-toggle)
("C-c n f" . org-roam-node-find)
("C-c n g" . org-roam-graph)
("C-c n i" . org-roam-node-insert)
("C-c n c" . org-roam-capture)
;; Dailies
("C-c n j" . org-roam-dailies-capture-today))
:config
;; If you're using a vertical completion framework, you might want a more informative completion interface
(setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
(org-roam-db-autosync-mode)
;; If using org-roam-protocol
(require 'org-roam-protocol))
; (setq org-roam-v2-ack t)
(setq org-roam-directory (file-truename "~/Documents/KB"))
#+end_src
: org-roam-protocol
*** org-roam-ui
#+begin_src emacs-lisp
(use-package org-roam-ui
:straight
(:host github :repo "org-roam/org-roam-ui" :branch "main" :files ("*.el" "out"))
:after org-roam
normally we'd recommend hooking orui after org-roam, but since org-roam does not have
a hookable mode anymore, you're advised to pick something yourself
if you don't care about startup time, use
:hook (after-init . org-roam-ui-mode)
:config
(setq org-roam-ui-sync-theme t
org-roam-ui-follow t
org-roam-ui-update-on-save t
org-roam-ui-open-on-start t))
#+end_src
** Org mode ** Org mode
*** Org agenda commands *** Org agenda commands
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -686,18 +749,22 @@
:defer t :defer t
) )
(use-package org (use-package org
:straight
(:host github :repo "https://git.savannah.gnu.org/cgit/emacs/elpa.git" :branch "main" :files ("*.el" "out"))
;:demand t
;:load-path "~/.emacs.d/elpa/org-9.5.4/"
:hook ((org-mode . my/org-mode-setup) :hook ((org-mode . my/org-mode-setup)
(org-mode . variable-pitch-mode) (org-mode . variable-pitch-mode)
(org-mode . org-indent-mode) (org-mode . org-indent-mode)
(org-mode . prettify-symbols-mode) (org-mode . prettify-symbols-mode)
) )
:config (setq org-agenda-files `("~/Notes/GTD")) :config (setq org-agenda-files `("~/Documents/GTD"))
(display-line-numbers-mode 0) (display-line-numbers-mode 0)
(org-bullets-mode t) ;(org-bullets-mode t)
(org-indent-mode t) ;(org-indent-mode t)
(setq org-ellipsis " ▸" org-hide-emphasis-markers t org-src-fontify-natively t ;(setq org-ellipsis " ▸" org-hide-emphasis-markers t org-src-fontify-natively t
org-src-tab-acts-natively t org-edit-src-content-indentation 2 org-hide-block-startup nil ; org-src-tab-acts-natively t org-edit-src-content-indentation 2 org-hide-block-startup nil
org-src-preserve-indentation nil org-startup-folded 'content org-cycle-separator-lines 2) ; org-src-preserve-indentation nil org-startup-folded 'content org-cycle-separator-lines 2)
(setq org-agenda-start-with-log-mode t) (setq org-agenda-start-with-log-mode t)
(setq org-log-done 'time) (setq org-log-done 'time)
(setq org-log-into-drawer t) (setq org-log-into-drawer t)
@ -765,60 +832,6 @@
#+RESULTS: #+RESULTS:
: ((json . src json) (yaml . src yaml) (py . src python) (ts . src typescript) (sc . src scheme) (el . src emacs-lisp) (sh . src sh) (a . export ascii) (c . center) (C . comment) (e . example) (E . export) (h . export html) (l . export latex) (q . quote) (s . src) (v . verse)) : ((json . src json) (yaml . src yaml) (py . src python) (ts . src typescript) (sc . src scheme) (el . src emacs-lisp) (sh . src sh) (a . export ascii) (c . center) (C . comment) (e . example) (E . export) (h . export html) (l . export latex) (q . quote) (s . src) (v . verse))
** Org roam
#+begin_src emacs-lisp
(use-package org-roam
:ensure t
:hook
(after-init . org-roam-mode)
:general (general-nmap
:prefix "SPC r"
;; Org-roam keymap
"d" '(org-roam-dailies-find-today :which-key "roam today")
"t a" '(org-roam-tag-add :which-key "roam add tag")
"t d" '(org-roam-tag-delete :which-key "roam delete tag")
"a a" '(org-roam-alias-add :which-key "roam add alias")
"f f" '(org-roam-find-file :which-key "roam findgfile ")
"g" '(org-roam-graph-show :which-key "roam graph ")
"b b" '(org-roam-buffer-toggle-display :which-key "roam buffer toggle ")
"b s" '(org-roam-buffer-activate :which-key "roam buffer show ")
"b h" '(org-roam-buffer-deactivate :which-key "roam buffer hide ")
"s" '(org-roam-ui-mode :which-key "roam ui "))
:custom
(org-roam-directory (file-truename "~/org-notes"))
:config
(org-roam-db-autosync-mode)
(require 'org-roam-protocol)
(server-start t)
)
(setq org-roam-v2-ack t)
(setq org-roam-directory (file-truename "~/org-notes"))
(require 'org-roam-protocol)
#+end_src
: org-roam-protocol
*** org-roam-ui
#+begin_src emacs-lisp-no
(use-package websocket
:after org-roam
)
(use-package simple-httpd
:after org-roam
)
(require 'websocket)
(require 'simple-httpd)
(add-to-list 'load-path "~/.emacs.d/private/org-roam-ui")
(load-library "org-roam-ui")
#+end_src
* Languages * Languages
** Flycheck ** Flycheck
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -911,7 +924,7 @@
#+end_src #+end_src
** Rust ** Rust
#+begin_src emacs-lisp #+begin_src aemacs-lisp
(use-package rust-mode (use-package rust-mode
:config :config
(setq rust-format-on-save t) (setq rust-format-on-save t)

View file

@ -1,7 +1,10 @@
(setq max-lisp-eval-depth 10000) (setq max-lisp-eval-depth 10000)
(require 'package) (require 'package)
(add-to-list 'package-archives (add-to-list 'package-archives
'("melpa" . "http://stable.melpa.org/packages/")) '("melpa" . "http://melpa.org/packages/") t)
(add-to-list 'package-archives
'("melpa" . "http://melpa.org/packages/") t)
(package-initialize) (package-initialize)
@ -10,12 +13,31 @@
(defvar package-list (defvar package-list
'(use-package doom-themes)) '(gruvbox-theme))
(dolist (p package-list) (dolist (p package-list)
(when (not (package-installed-p p)) (when (not (package-installed-p p))
(package-install p))) (package-install p)))
(defvar bootstrap-version)
(let ((bootstrap-file
(expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory))
(bootstrap-version 5))
(unless (file-exists-p bootstrap-file)
(with-current-buffer
(url-retrieve-synchronously
"https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el"
'silent 'inhibit-cookies)
(goto-char (point-max))
(eval-print-last-sexp)))
(load bootstrap-file nil 'nomessage))
(setq package-enable-at-startup nil)
(setq straight-use-package-by-default t)
(straight-use-package 'org)
(straight-use-package 'use-package)
(require 'package) (require 'package)
(setq inhibit-startup-message t) (setq inhibit-startup-message t)
(menu-bar-mode -1) (menu-bar-mode -1)
@ -37,10 +59,10 @@
;; '("75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default)) ;; '("75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default))
;; '(package-selected-packages ;; '(package-selected-packages
;; '(neotree treemacs-persp spaceline-all-the-icons all-the-icons-ivy-rich all-the-icons-ivy treemacs-the-icons dired-icon treemacs-magit treemacs-projectile nlinum linum-mode unicode-fonts ewal-doom-themes ivy-rich which-key counsel org-roam treemacs-evil treemacs-all-the-icons treemacs use-package general gruvbox-theme flycheck-rust cargo linum-relative ac-racer lusty-explorer doom-modeline doom-themes rainbow-delimiters evil-mc rustic lsp-mode avy))) ;; '(neotree treemacs-persp spaceline-all-the-icons all-the-icons-ivy-rich all-the-icons-ivy treemacs-the-icons dired-icon treemacs-magit treemacs-projectile nlinum linum-mode unicode-fonts ewal-doom-themes ivy-rich which-key counsel org-roam treemacs-evil treemacs-all-the-icons treemacs use-package general gruvbox-theme flycheck-rust cargo linum-relative ac-racer lusty-explorer doom-modeline doom-themes rainbow-delimiters evil-mc rustic lsp-mode avy)))
(use-package doom-themes (use-package gruvbox-theme
:ensure t :ensure t
) )
(load-theme 'doom-gruvbox t) (load-theme 'gruvbox-dark-hard t)
;; (use-package gruvbox-theme ;; (use-package gruvbox-theme
;; :ensure t ;; :ensure t
@ -216,10 +238,7 @@
:ensure t :ensure t
:config (treemacs-set-scope-type 'Perspectives)) :config (treemacs-set-scope-type 'Perspectives))
(use-package neotree
:ensure t
:init
(setq neo-theme (if (display-graphic-p) 'icons 'arrow)))
(org-babel-do-load-languages (org-babel-do-load-languages
'org-babel-load-languages 'org-babel-load-languages
@ -227,7 +246,6 @@
(use-package magit) (use-package magit)
(use-package workgroups2)
(treemacs-create-theme "Material" (treemacs-create-theme "Material"
:icon-directory (treemacs-join-path treemacs-dir "/home/horhik/.emacs.d/icons") :icon-directory (treemacs-join-path treemacs-dir "/home/horhik/.emacs.d/icons")
@ -332,14 +350,12 @@
:config :config
(setq which-key-idle-delay 0.3)) (setq which-key-idle-delay 0.3))
(use-package all-the-icons-ivy-rich
:ensure t
:init (all-the-icons-ivy-rich-mode 1))
(use-package ivy-rich ;; (use-package ivy-rich
:init ;; :init
(ivy-rich-mode 1)) ;; (ivy-rich-mode 1))
;;
(use-package company (use-package company
:after lsp-mode :after lsp-mode
@ -352,8 +368,8 @@
(company-minimum-prefix-length 1) (company-minimum-prefix-length 1)
(company-idle-delay 0.0)) (company-idle-delay 0.0))
(use-package company-box ;;(use-package company-box
:hook (company-mode . company-box-mode)) ;; :hook (company-mode . company-box-mode))
;; (use-package ivy-postframe ;; (use-package ivy-postframe
;; :init ;; :init
@ -511,6 +527,43 @@
(set-face-attribute 'org-column-title nil :background nil) (set-face-attribute 'org-column-title nil :background nil)
(setq org-src-fontify-natively t) (setq org-src-fontify-natively t)
(use-package org-roam
:straight
:ensure t
:custom
(org-roam-directory (file-truename "~/Documents/KB/"))
:bind (("C-c n l" . org-roam-buffer-toggle)
("C-c n f" . org-roam-node-find)
("C-c n g" . org-roam-graph)
("C-c n i" . org-roam-node-insert)
("C-c n c" . org-roam-capture)
;; Dailies
("C-c n j" . org-roam-dailies-capture-today))
:config
;; If you're using a vertical completion framework, you might want a more informative completion interface
(setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag)))
(org-roam-db-autosync-mode)
;; If using org-roam-protocol
(require 'org-roam-protocol))
; (setq org-roam-v2-ack t)
(setq org-roam-directory (file-truename "~/Documents/KB"))
(use-package org-roam-ui
:straight
(:host github :repo "org-roam/org-roam-ui" :branch "main" :files ("*.el" "out"))
:after org-roam
;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
;; a hookable mode anymore, you're advised to pick something yourself
;; if you don't care about startup time, use
;; :hook (after-init . org-roam-ui-mode)
:config
(setq org-roam-ui-sync-theme t
org-roam-ui-follow t
org-roam-ui-update-on-save t
org-roam-ui-open-on-start t))
(setq org-agenda-settings '( (setq org-agenda-settings '(
("d" "Dashboard 📜" ("d" "Dashboard 📜"
( (
@ -560,19 +613,20 @@
(use-package pdf-tools (use-package pdf-tools
:defer t :defer t
) )
(use-package org (use-package org :demand t
:load-path "~/.emacs.d/elpa/org-9.5.4/"
:hook ((org-mode . my/org-mode-setup) :hook ((org-mode . my/org-mode-setup)
(org-mode . variable-pitch-mode) (org-mode . variable-pitch-mode)
(org-mode . org-indent-mode) (org-mode . org-indent-mode)
(org-mode . prettify-symbols-mode) (org-mode . prettify-symbols-mode)
) )
:config (setq org-agenda-files `("~/Notes/GTD")) :config (setq org-agenda-files `("~/Documents/GTD"))
(display-line-numbers-mode 0) (display-line-numbers-mode 0)
(org-bullets-mode t) ;(org-bullets-mode t)
(org-indent-mode t) ;(org-indent-mode t)
(setq org-ellipsis "" org-hide-emphasis-markers t org-src-fontify-natively t ;(setq org-ellipsis " ▸" org-hide-emphasis-markers t org-src-fontify-natively t
org-src-tab-acts-natively t org-edit-src-content-indentation 2 org-hide-block-startup nil ; org-src-tab-acts-natively t org-edit-src-content-indentation 2 org-hide-block-startup nil
org-src-preserve-indentation nil org-startup-folded 'content org-cycle-separator-lines 2) ; org-src-preserve-indentation nil org-startup-folded 'content org-cycle-separator-lines 2)
(setq org-agenda-start-with-log-mode t) (setq org-agenda-start-with-log-mode t)
(setq org-log-done 'time) (setq org-log-done 'time)
(setq org-log-into-drawer t) (setq org-log-into-drawer t)
@ -626,39 +680,6 @@
(add-to-list 'org-structure-template-alist '("yaml" . "src yaml")) (add-to-list 'org-structure-template-alist '("yaml" . "src yaml"))
(add-to-list 'org-structure-template-alist '("json" . "src json")) (add-to-list 'org-structure-template-alist '("json" . "src json"))
(use-package org-roam
:ensure t
:hook
(after-init . org-roam-mode)
:general (general-nmap
:prefix "SPC r"
;; Org-roam keymap
"d" '(org-roam-dailies-find-today :which-key "roam today")
"t a" '(org-roam-tag-add :which-key "roam add tag")
"t d" '(org-roam-tag-delete :which-key "roam delete tag")
"a a" '(org-roam-alias-add :which-key "roam add alias")
"f f" '(org-roam-find-file :which-key "roam findgfile ")
"g" '(org-roam-graph-show :which-key "roam graph ")
"b b" '(org-roam-buffer-toggle-display :which-key "roam buffer toggle ")
"b s" '(org-roam-buffer-activate :which-key "roam buffer show ")
"b h" '(org-roam-buffer-deactivate :which-key "roam buffer hide ")
"s" '(org-roam-ui-mode :which-key "roam ui "))
:custom
(org-roam-directory (file-truename "~/org-notes"))
:config
(org-roam-db-autosync-mode)
(require 'org-roam-protocol)
(server-start t)
)
(setq org-roam-v2-ack t)
(setq org-roam-directory (file-truename "~/org-notes"))
(require 'org-roam-protocol)
(use-package flycheck (use-package flycheck
:init :init
;;(flycheck-c/c++-clang-executable "c/c++-clang" "~/code/competitive/clang++") ;;(flycheck-c/c++-clang-executable "c/c++-clang" "~/code/competitive/clang++")
@ -733,17 +754,6 @@
;; (add-hook 'lsp-mode-hook #'direnv-update-environment) ;; (add-hook 'lsp-mode-hook #'direnv-update-environment)
(use-package nix-mode) (use-package nix-mode)
(use-package rust-mode
:config
(setq rust-format-on-save t)
(add-hook 'rust-mode-hook
(lambda () (setq indent-tabs-mode nil)))
)
(use-package rustic
:config
(setq rustic-lsp-server 'rls)
)
(use-package mastodon (use-package mastodon
:config :config
(setq mastodon-instance-url "https://mastodon.ml") (setq mastodon-instance-url "https://mastodon.ml")

@ -1 +0,0 @@
Subproject commit 9ad111d2102c24593f6ac012206bb4b2c9c6c4e1