1
0
Fork 0
mirror of https://github.com/Horhik/dotfiles.git synced 2024-11-22 08:21:27 +00:00

some updates in emacs config

This commit is contained in:
horhik 2021-05-12 16:31:24 +03:00
parent 88b04ed9f2
commit 31e62c8a49
7 changed files with 411 additions and 403 deletions

1
.gitignore vendored
View file

@ -10,3 +10,4 @@ home/pure_emacs/.emacs.d/org-roam.db
home/pure_emacs/.emacs.d/projectile-bookmarks.eld home/pure_emacs/.emacs.d/projectile-bookmarks.eld
home/pure_emacs/.emacs.d/recentf home/pure_emacs/.emacs.d/recentf
home/pure_emacs/.emacs.d/transient/ home/pure_emacs/.emacs.d/transient/
home/pure_emacs/.emacs.d/.org-id-locations

View file

@ -27,7 +27,7 @@
(defvar package-list (defvar package-list
'(use-package gruvbox-theme)) '(use-package doom-themes))
(dolist (p package-list) (dolist (p package-list)
(when (not (package-installed-p p)) (when (not (package-installed-p p))
@ -52,20 +52,20 @@
** Theme ** Theme
#+begin_src emacs-lisp #+begin_src emacs-lisp
(require 'use-package) (require 'use-package)
(use-package gruvbox-theme) (use-package doom-themes)
(setq use-package-always-ensure t) (setq use-package-always-ensure t)
(custom-set-variables (custom-set-variables
;; custom-set-variables was added by Custom. ;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(custom-safe-themes ; '(custom-safe-themes
'("6b5c518d1c250a8ce17463b7e435e9e20faa84f3f7defba8b579d4f5925f60c1" "75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default)) ; '("6b5c518d1c250a8ce17463b7e435e9e20faa84f3f7defba8b579d4f5925f60c1" "75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default))
'(package-selected-packages '(package-selected-packages
'(org-roam-server visual-fill-column org-bullets workgroups2 neotree treemacs-persp treemacs-magit treemacs-icons-dired treemacs-projectile treemacs-evil treemacs-all-the-icons ivy-rich which-key rainbow-delimiters highlight-parentheses org-roam general use-package))) '(org-roam-server visual-fill-column org-bullets workgroups2 neotree treemacs-persp treemacs-magit treemacs-icons-dired treemacs-projectile treemacs-evil treemacs-all-the-icons ivy-rich which-key rainbow-delimiters highlight-parentheses org-roam general use-package)))
(load-theme 'gruvbox-dark-hard) (load-theme 'doom-gruvbox)
#+end_src #+end_src
** Modeline ** Modeline
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -418,50 +418,6 @@
#+end_src #+end_src
* Org * Org
** Org roam
#+begin_src emacs-lisp
(use-package org-roam-server)
(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-server-mode :which-key "roam server "))
:custom
(org-roam-directory "~/Brain")
:config
(setq
org-roam-server-host "127.0.0.1"
org-roam-server-port 5034
org-roam-server-authenticate nil
org-roam-server-export-inline-images t
org-roam-server-serve-files nil
org-roam-server-served-file-extensions '("pdf" "mp4" "ogv")
org-roam-server-network-poll t
org-roam-server-network-arrows nil
org-roam-server-network-label-truncate t
org-roam-server-network-label-truncate-length 60
org-roam-server-network-label-wrap-length 20)
(require 'org-roam-protocol))
(require 'org-roam-protocol)
#+end_src
** Fonts ** Fonts
#+begin_src emacs-lisp #+begin_src emacs-lisp
@ -502,116 +458,117 @@
** Org mode ** Org mode
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun my/org-mode-setup() (defun my/org-mode-setup()
(auto-fill-mode 0) (auto-fill-mode 0)
(visual-line-mode 1) (visual-line-mode 1)
(setq evil-auto-indent 1) (setq evil-auto-indent 1)
(variable-pitch-mode t) (variable-pitch-mode t)
) )
(use-package org (use-package org
:hook ((org-mode . my/org-mode-setup) :hook ((org-mode . my/org-mode-setup)
(org-mode . variable-pitch-mode) (org-mode . variable-pitch-mode)
) )
:config (setq org-agenda-files `("~/Brain" "~/Brain/Tasks/Tasks.org")) :config (setq org-agenda-files `("~/Brain" "~/Brain/Tasks/Tasks.org"))
(org-bullets-mode t) (org-bullets-mode t)
(setq org-ellipsis " ▸" org-hide-emphasis-markers t org-src-fontify-natively t (org-indent-mode t)
org-src-tab-acts-natively t org-edit-src-content-indentation 2 org-hide-block-startup nil (setq org-ellipsis " ▸" org-hide-emphasis-markers t org-src-fontify-natively t
org-src-preserve-indentation nil org-startup-folded 'content org-cycle-separator-lines 2) org-src-tab-acts-natively t org-edit-src-content-indentation 2 org-hide-block-startup nil
(setq org-agenda-start-with-log-mode t) org-src-preserve-indentation nil org-startup-folded 'content org-cycle-separator-lines 2)
(setq org-log-done 'time) (setq org-agenda-start-with-log-mode t)
(setq org-log-into-drawer t) (setq org-log-done 'time)
(setq org-todo-keyword-faces '(("TODO" . org-warning) (setq org-log-into-drawer t)
("STARTED" . "yellow") (setq org-todo-keyword-faces '(("TODO" . org-warning)
("DREAM" . "pink") ("STARTED" . "yellow")
("IDEA" . "gold") ("DREAM" . "pink")
("ARTICLE" . "lightblue") ("IDEA" . "gold")
("CANCELED" . ("ARTICLE" . "lightblue")
(:foreground "blue" ("CANCELED" .
:weight bold)))) (:foreground "blue"
:weight bold))))
(setq org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d!)") (setq org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "|" "DONE(d!)")
(sequence "BACKLOG(b)" "PLAN(p)" "READY(r)" "ACTIVE(a)" "REVIEW(v)" (sequence "BACKLOG(b)" "PLAN(p)" "READY(r)" "ACTIVE(a)" "REVIEW(v)"
"WAIT(w@/!)" "HOLD(h)" "|" "COMPLETED(c)" "CANC(k@)") "WAIT(w@/!)" "HOLD(h)" "|" "COMPLETED(c)" "CANC(k@)")
(sequence "IDEA(i)" "DREAM(d)" "ARTICLE(a)" "|" "DONE(d!)"))) (sequence "IDEA(i)" "DREAM(d)" "ARTICLE(a)" "|" "DONE(d!)")))
(setq org-agenda-custom-commands '(("d" "Dashboard" ((agenda "" ((org-deadline-warning-days 7))) (setq org-agenda-custom-commands '(("d" "Dashboard" ((agenda "" ((org-deadline-warning-days 7)))
(todo "NEXT" ((org-agenda-overriding-header (todo "NEXT" ((org-agenda-overriding-header
"Next Tasks"))) "Next Tasks")))
(tags-todo "agenda/ACTIVE" (tags-todo "agenda/ACTIVE"
((org-agenda-overriding-header ((org-agenda-overriding-header
"Active Projects"))))) "Active Projects")))))
("n" "Next Tasks" ((todo "NEXT" ((org-agenda-overriding-header ("n" "Next Tasks" ((todo "NEXT" ((org-agenda-overriding-header
"Next Tasks"))))) "Next Tasks")))))
("i" "Ideas" ((todo "IDEA" ((org-agenda-overriding-header ("i" "Ideas" ((todo "IDEA" ((org-agenda-overriding-header
"Ideas "))))) "Ideas ")))))
("A" "Articles" ((todo "Article" ((org-agenda-overriding-header ("A" "Articles" ((todo "Article" ((org-agenda-overriding-header
"Article"))))) "Article")))))
("W" "Work Tasks" tags-todo "+work-email") ("W" "Work Tasks" tags-todo "+work-email")
("W" "Work Tasks" tags-todo "+work-email") ("W" "Work Tasks" tags-todo "+work-email")
("I" "ideas" tags-todo "+idea-article") ("I" "ideas" tags-todo "+idea-article")
;; Low-effort next actions ;; Low-effort next actions
("e" tags-todo "+TODO=\"NEXT\"+Effort<15&+Effort>0" ("e" tags-todo "+TODO=\"NEXT\"+Effort<15&+Effort>0"
((org-agenda-overriding-header "Low Effort Tasks") ((org-agenda-overriding-header "Low Effort Tasks")
(org-agenda-max-todos 20) (org-agenda-max-todos 20)
(org-agenda-files org-agenda-files))) (org-agenda-files org-agenda-files)))
("w" "Workflow Status" ((todo "WAIT" ("w" "Workflow Status" ((todo "WAIT"
((org-agenda-overriding-header ((org-agenda-overriding-header
"Waiting on External") "Waiting on External")
(org-agenda-files (org-agenda-files
org-agenda-files))) org-agenda-files)))
(todo "REVIEW" (todo "REVIEW"
((org-agenda-overriding-header ((org-agenda-overriding-header
"In Review") "In Review")
(org-agenda-files (org-agenda-files
org-agenda-files))) org-agenda-files)))
(todo "PLAN" (todo "PLAN"
((org-agenda-overriding-header ((org-agenda-overriding-header
"In Planning") "In Planning")
(org-agenda-todo-list-sublevels (org-agenda-todo-list-sublevels
nil) nil)
(org-agenda-files (org-agenda-files
org-agenda-files))) org-agenda-files)))
(todo "BACKLOG" (todo "BACKLOG"
((org-agenda-overriding-header ((org-agenda-overriding-header
"Project Backlog") "Project Backlog")
(org-agenda-todo-list-sublevels (org-agenda-todo-list-sublevels
nil) nil)
(org-agenda-files (org-agenda-files
org-agenda-files))) org-agenda-files)))
(todo "READY" (todo "READY"
((org-agenda-overriding-header ((org-agenda-overriding-header
"Ready for Work") "Ready for Work")
(org-agenda-files (org-agenda-files
org-agenda-files))) org-agenda-files)))
(todo "ACTIVE" (todo "ACTIVE"
((org-agenda-overriding-header ((org-agenda-overriding-header
"Active Projects") "Active Projects")
(org-agenda-files (org-agenda-files
org-agenda-files))) org-agenda-files)))
(todo "COMPLETED" (todo "COMPLETED"
((org-agenda-overriding-header ((org-agenda-overriding-header
"Completed Projects") "Completed Projects")
(org-agenda-files (org-agenda-files
org-agenda-files))) org-agenda-files)))
(todo "CANC" (todo "CANC"
((org-agenda-overriding-header ((org-agenda-overriding-header
"Cancelled Projects") "Cancelled Projects")
(org-agenda-files (org-agenda-files
org-agenda-files))))))) org-agenda-files)))))))
:general (general-nmap :prefix "SPC a" :general (general-nmap :prefix "SPC a"
:keymap 'org-agenda-mode-map :keymap 'org-agenda-mode-map
"a" 'org-agenda)) "a" 'org-agenda))
(use-package org-bullets (use-package org-bullets
:after org :after org
:hook :hook
((org-mode . org-bullets-mode) ((org-mode . org-bullets-mode)
) )
) )
#+end_src #+end_src
@ -640,4 +597,52 @@
#+end_src
** Org roam
#+begin_src emacs-lisp
(use-package org-roam-server)
(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-server-mode :which-key "roam server "))
:custom
(org-roam-directory "~/Brain")
:config
(setq
org-roam-server-host "127.0.0.1"
org-roam-server-port 5034
org-roam-server-authenticate nil
org-roam-server-export-inline-images t
org-roam-server-serve-files nil
org-roam-server-served-file-extensions '("pdf" "mp4" "ogv")
org-roam-server-network-poll t
org-roam-server-network-arrows nil
org-roam-server-network-label-truncate t
org-roam-server-network-label-truncate-length 60
org-roam-server-network-label-wrap-length 20)
(require 'org-roam-protocol)
(org-roam-server-mode t)
(server-start t)
)
(require 'org-roam-protocol)
#+end_src #+end_src

View file

@ -1,3 +1,19 @@
(add-to-list 'package-archives
'("melpa" . "http://melpa.org/packages/"))
(package-initialize)
(unless package-archive-contents
(package-refresh-contents))
(defvar package-list
'(use-package doom-themes))
(dolist (p package-list)
(when (not (package-installed-p p))
(package-install p)))
(require 'package) (require 'package)
(setq inhibit-startup-message t) (setq inhibit-startup-message t)
(menu-bar-mode -1) (menu-bar-mode -1)
@ -9,43 +25,29 @@
(global-visual-line-mode 1) (global-visual-line-mode 1)
(global-visual-line-mode) (global-visual-line-mode)
(add-to-list 'package-archives
'("melpa" . "http://melpa.org/packages/"))
(package-initialize)
(unless package-archive-contents
(package-refresh-contents))
(defvar package-list
'(use-package gruvbox-theme))
(dolist (p package-list)
(when (not (package-installed-p p))
(package-install p)))
(require 'use-package) (require 'use-package)
(use-package gruvbox-theme) (use-package doom-themes)
(setq use-package-always-ensure t) (setq use-package-always-ensure t)
(custom-set-variables (custom-set-variables
;; custom-set-variables was added by Custom. ;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(custom-safe-themes '(custom-safe-themes
'("6b5c518d1c250a8ce17463b7e435e9e20faa84f3f7defba8b579d4f5925f60c1" "75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default)) '("75b8719c741c6d7afa290e0bb394d809f0cc62045b93e1d66cd646907f8e6d43" default))
'(package-selected-packages '(package-selected-packages
'(org-roam-server visual-fill-column org-bullets workgroups2 neotree treemacs-persp treemacs-magit treemacs-icons-dired treemacs-projectile treemacs-evil treemacs-all-the-icons ivy-rich which-key rainbow-delimiters highlight-parentheses org-roam general use-package))) '(org-roam-server visual-fill-column org-bullets workgroups2 neotree treemacs-persp treemacs-magit treemacs-icons-dired treemacs-projectile treemacs-evil treemacs-all-the-icons ivy-rich which-key rainbow-delimiters highlight-parentheses org-roam general use-package)))
;; 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)
;; (custom-set-faces (load-theme 'doom-gruvbox)
;; ;; custom-set-faces was added by Custom.
;; ;; If you edit it by hand, you could mess it up, so be careful. (use-package doom-modeline
;; ;; Your init file should contain only one such instance. :init
;; ;; If there is more than one, they won't work right. (doom-modeline-mode 1))
;; )
;; Setting up use-package ;; Line numbers
(column-number-mode)
;; Default fonts ;; Default fonts
(add-to-list 'default-frame-alist '(font . "Mononoki Nerd Font" )) (add-to-list 'default-frame-alist '(font . "Mononoki Nerd Font" ))
@ -58,17 +60,7 @@
;; ☺️ ☻ 😃 😄 😅 😆 😊 😎 😇 😈 😏 🤣 🤩 🤪 🥳 😁 😀 😂 🤠 🤡 🤑 🤓 🤖 😗 😚 😘 😙 😉 🤗 😍 🥰 🤤 😋 🤔 🤨 🧐 🤭 🤫 😯 🤐 😌 😖 😕 😳 😔 🤥 🥴 😮 😲 🤯 😩 😫 🥱 😪 😴 😵 ☹️ 😦 😞 😥 😟 😢 😭 🤢 🤮 😷 🤒 🤕 🥵 🥶 🥺 😬 😓 😰 😨 😱 😒 😠 😡 😤 😣 😧 🤬 😸 😹 😺 😻 😼 😽 😾 😿 🙀 🙈 🙉 🙊 🤦 🤷 🙅 🙆 🙋 🙌 🙍 🙎 🙇 🙏 👯 💃 🕺 🤳 💇 💈 💆 🧖 🧘 🧍 🧎 👰 🤰 🤱 👶 🧒 👦 👧 👩 👨 🧑 🧔 🧓 👴 👵 👤 👥 👪 👫 👬 👭 👱 👳 👲 🧕 👸 🤴 🎅 🤶 🧏 🦻 🦮 🦯 🦺 🦼 🦽 🦾 🦿 🤵 👮 👷 💁 💂 🕴 🕵️ 🦸 🦹 🧙 🧚 🧜 🧝 🧞 🧛 🧟 👼 👿 👻 👹 👺 👽 👾 🛸 💀 ☠️ 🕱 🧠 🦴 👁 👀 👂 👃 👄 🗢 👅 🦷 🦵 🦶 💭 🗬 🗭 💬 🗨 🗩 💦 💧 💢 💫 💤 💨 💥 💪 🗲 🔥 💡 💩 💯 ;; ☺️ ☻ 😃 😄 😅 😆 😊 😎 😇 😈 😏 🤣 🤩 🤪 🥳 😁 😀 😂 🤠 🤡 🤑 🤓 🤖 😗 😚 😘 😙 😉 🤗 😍 🥰 🤤 😋 🤔 🤨 🧐 🤭 🤫 😯 🤐 😌 😖 😕 😳 😔 🤥 🥴 😮 😲 🤯 😩 😫 🥱 😪 😴 😵 ☹️ 😦 😞 😥 😟 😢 😭 🤢 🤮 😷 🤒 🤕 🥵 🥶 🥺 😬 😓 😰 😨 😱 😒 😠 😡 😤 😣 😧 🤬 😸 😹 😺 😻 😼 😽 😾 😿 🙀 🙈 🙉 🙊 🤦 🤷 🙅 🙆 🙋 🙌 🙍 🙎 🙇 🙏 👯 💃 🕺 🤳 💇 💈 💆 🧖 🧘 🧍 🧎 👰 🤰 🤱 👶 🧒 👦 👧 👩 👨 🧑 🧔 🧓 👴 👵 👤 👥 👪 👫 👬 👭 👱 👳 👲 🧕 👸 🤴 🎅 🤶 🧏 🦻 🦮 🦯 🦺 🦼 🦽 🦾 🦿 🤵 👮 👷 💁 💂 🕴 🕵️ 🦸 🦹 🧙 🧚 🧜 🧝 🧞 🧛 🧟 👼 👿 👻 👹 👺 👽 👾 🛸 💀 ☠️ 🕱 🧠 🦴 👁 👀 👂 👃 👄 🗢 👅 🦷 🦵 🦶 💭 🗬 🗭 💬 🗨 🗩 💦 💧 💢 💫 💤 💨 💥 💪 🗲 🔥 💡 💩 💯
;; Fallback for emojies ;; Fallback for emojies
(load-theme 'gruvbox-dark-hard)
(use-package doom-modeline
:init
(doom-modeline-mode 1))
;; Line numbers
(column-number-mode)
;; Enable line numbers for some modes
(dolist (mode '(text-mode-hook (dolist (mode '(text-mode-hook
prog-mode-hook prog-mode-hook
conf-mode-hook)) conf-mode-hook))
@ -80,151 +72,6 @@
(dolist (mode '(org-mode-hook)) (dolist (mode '(org-mode-hook))
(add-hook mode (lambda () (display-line-numbers-mode 0)))) (add-hook mode (lambda () (display-line-numbers-mode 0))))
;; (use-package emojify
;; :hook (after-init . global-emojify-mode)
;; :config
;; (setq emojify-emoji-set "twemoji-v2")
;; (setq emojify-set-emoji-styles 'image)
;; (setq emojify-display-style 'image))
;; Evil mode
(use-package undo-tree)
(use-package evil
:init
(setq evil-want-keybinding nil)
(setq evil-want-integration t)
(setq evil-want-C-u-scroll t)
(setq evil-want-C-i-jump nil)
(global-undo-tree-mode)
:config
(evil-set-undo-system 'undo-tree)
(evil-mode 1)
(define-key evil-insert-state-map (kbd "C-g") 'evil-normal-state)
(define-key evil-insert-state-map (kbd "C-h") 'evil-delete-backward-char-and-join)
;; Use visual line motions even outside of visual-line-mode buffers
(evil-global-set-key 'motion "j" 'evil-next-visual-line)
(evil-global-set-key 'motion "k" 'evil-previous-visual-line)
(evil-set-initial-state 'messages-buffer-mode 'normal)
(evil-set-initial-state 'dashboard-mode 'normal))
(use-package evil-collection
:after evil
:init
:config
(evil-collection-init))
(use-package counsel)
(use-package ivy
:diminish
:bind (
("M-x" . counsel-M-x)
("C-s" . swiper)
:map ivy-minibuffer-map
("TAB" . ivy-alt-done)
("C-f" . ivy-alt-done)
("C-l" . ivy-alt-done)
("C-j" . ivy-next-line)
("C-k" . ivy-previous-line)
:map ivy-switch-buffer-map
("C-k" . ivy-previous-line)
("C-l" . ivy-done)
("C-d" . ivy-switch-buffer-kill)
:map ivy-reverse-i-search-map
("C-k" . ivy-previous-line)
("C-d" . ivy-reverse-i-search-kill))
:init
(ivy-mode 1))
(use-package counsel-projectile
:config (counsel-projectile-mode))
;; Keybindings
(defun add-to-map(keys func)
"Add a keybinding in evil mode from keys to func."
(define-key evil-normal-state-map (kbd keys) func)
(define-key evil-motion-state-map (kbd keys) func))
;;(add-to-map "<SPC>" nil)
;;(add-to-map "<SPC> <SPC>" 'counsel-M-x)
;; (add-to-map "<SPC> f" 'lusty-file-explorer)
;; (add-to-map "<SPC> b" 'lusty-buffer-explorer)
;;(add-to-map "<SPC> o" 'treemacs)
;;(add-to-map "<SPC> s" 'save-buffer)
(defun open-file (file)
"just more shortest function for opening the file"
(interactive)
((lambda (file) (interactive)
(find-file (expand-file-name (format "%s" file)))) file ) )
(use-package general)
(general-evil-setup)
(general-nmap
:prefix "SPC"
;; dotfiles editing config
"SPC" '(counsel-M-x :which-key "M-x")
"o" '(treemacs :which-key "treemacs")
"f f" '(counsel-find-file :which-key "find-file")
"f r" '(counsel-buffer-or-recentf :which-key "recent files")
"b b" '(counsel-switch-buffer :which-key "switch buff")
"f e" '(lambda() (interactive) (find-file "~/.emacs.d/config.org") :which-key "config.org")
"f v" '(lambda() (interactive) (find-file "~/.config/nvim/init.vim" :which-key "neovim config" ))
"f d" '(lambda() (interactive) (find-file "~/dotfiles/home" :which-key "dotfiles dired" ))
"f a" '(lambda() (interactive) (find-file "~/.config/alacritty/alacritty.yml" :which-key "alacritty"))
"f b" '(lambda() (interactive) (find-file "~/Brain") :which-key "my brain")
)
;; Org roam
(use-package org-roam-server)
(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-server-mode :which-key "roam server "))
:custom
(org-roam-directory "~/Brain")
:config
(setq
org-roam-server-host "127.0.0.1"
org-roam-server-port 5034
org-roam-server-authenticate nil
org-roam-server-export-inline-images t
org-roam-server-serve-files nil
org-roam-server-served-file-extensions '("pdf" "mp4" "ogv")
org-roam-server-network-poll t
org-roam-server-network-arrows nil
org-roam-server-network-label-truncate t
org-roam-server-network-label-truncate-length 60
org-roam-server-network-label-wrap-length 20)
(require 'org-roam-protocol))
(require 'org-roam-protocol)
(use-package highlight-parentheses (use-package highlight-parentheses
:ensure t :ensure t
:init :init
@ -232,15 +79,6 @@
(show-paren-mode t)) ; (show-paren-mode t)) ;
(use-package rainbow-delimiters (use-package rainbow-delimiters
:hook (prog-mode . rainbow-delimiters-mode)) :hook (prog-mode . rainbow-delimiters-mode))
(use-package which-key
:init (which-key-mode)
:diminish which-key-mode
:config
(setq which-key-idle-delay 0.3))
(use-package ivy-rich
:init
(ivy-rich-mode 1))
(use-package all-the-icons) (use-package all-the-icons)
(use-package treemacs-all-the-icons) (use-package treemacs-all-the-icons)
@ -353,6 +191,170 @@
(use-package magit) (use-package magit)
(use-package workgroups2) (use-package workgroups2)
(treemacs-create-theme "Material"
:icon-directory (treemacs-join-path treemacs-dir "/home/horhik/.emacs.d/icons")
:config
(progn
(treemacs-create-icon :file "folder-core-open.png" :fallback "📁" :extensions (root-open))
(treemacs-create-icon :file "folder-core.png" :fallback "📁" :extensions (root-closed))
(treemacs-create-icon :file "folder-node-open.png" :fallback "📂" :extensions (dir-open))
(treemacs-create-icon :file "folder-node.png" :fallback "📁" :extensions (dir-closed))
(treemacs-create-icon :file "folder-test-open.png" :fallback "📂" :extensions ("tests"))
(treemacs-create-icon :file "folder-test.png" :fallback "📁" :extensions ("tests"))
(treemacs-create-icon :file "emacs.png" :fallback "💜" :extensions ("el" "elc" ".spacemacs" "doom" ))
(treemacs-create-icon :file "emacs.png" :fallback "💜" :extensions ("el" "elc"))
(treemacs-create-icon :file "markdown.png" :fallback "📖" :extensions ("md"))
(treemacs-create-icon :file "readme.png" :fallback "📖" :extensions ("readme.md" "README.md" "README" "readme"))
(treemacs-create-icon :file "editorconfig.png" :fallback "📖" :extensions ("editorconfig"))
(treemacs-create-icon :file "org.png" :fallback "🐴" :extensions ("org"))
(treemacs-create-icon :file "rust.png" :fallback "🐴" :extensions ("rs"))
(treemacs-create-icon :file "haskell.png" :fallback "🐴" :extensions ("hs" "haskell"))
(treemacs-create-icon :file "c.png" :fallback "🐴" :extensions ("c"))
(treemacs-create-icon :file "cpp.png" :fallback "🐴" :extensions ("cpp" "c++"))
(treemacs-create-icon :file "h.png" :fallback "🐴" :extensions ("h"))
(treemacs-create-icon :file "diff.png" :fallback "🐴" :extensions ("diff"))
(treemacs-create-icon :file "makefile.png" :fallback "🐴" :extensions ("mk" "make" "Makefile"))
(treemacs-create-icon :file "assembly.png" :fallback "🐴" :extensions ("bin" "so" "o"))
(treemacs-create-icon :file "document.png" :fallback "🐴" :extensions ("" "txt"))
(treemacs-create-icon :file "file.png" :fallback "🐴" :extensions (fallback))
(treemacs-create-icon :file "toml.png" :fallback "🗃️" :extensions ("toml"))
(treemacs-create-icon :file "json.png" :fallback "🗃️" :extensions ("json"))
(treemacs-create-icon :file "yaml.png" :fallback "🗃️" :extensions ("yml" "yaml"))
(treemacs-create-icon :file "vim.png" :fallback "🗃️" :extensions ("vim" "vi" "nvim"))
(treemacs-create-icon :file "video.png" :fallback "🗃️" :extensions ("mp4" "avi" "gif" "mpv"))
(treemacs-create-icon :file "audio.png" :fallback "🗃️" :extensions ("mp3" "ogg" "wav" ))
(treemacs-create-icon :file "image.png" :fallback "🗃️" :extensions ("png" "jpg"))
(treemacs-create-icon :file "svg.png" :fallback "🗃️" :extensions ("svg"))
(treemacs-create-icon :file "css.png" :fallback "🗃️" :extensions ("css"))
(treemacs-create-icon :file "console.png" :fallback "🗃️" :extensions ("bash" "sh"))
(treemacs-create-icon :file "certificate.png" :fallback "🗃️" :extensions ("cert" "LICENSE" "license" "gpl" "mit" "gpl3" "gplv3" "apache"))
(treemacs-create-icon :file "database.png" :fallback "🗃️" :extensions ("sqlite" "db" "sql"))
(treemacs-create-icon :file "lua.png" :fallback "🗃️" :extensions ("lua"))
(treemacs-create-icon :file "javascript.png" :fallback "🗃️" :extensions ("js" "javascript"))
(treemacs-create-icon :file "typescript.png" :fallback "🗃️" :extensions ("ts" "typescript"))
(treemacs-create-icon :file "react.png" :fallback "🗃️" :extensions ("jsx"))
(treemacs-create-icon :file "react_ts.png" :fallback "🗃️" :extensions ("tsx"))
(treemacs-create-icon :file "settings.png" :fallback "🗃️" :extensions ("config" "conf" "rc" "*rc"))
(treemacs-create-icon :file "sass.png" :fallback "🗃️" :extensions ("sass" "scss"))
(treemacs-create-icon :file "xml.png" :fallback "🗃️" :extensions ("xml"))
(treemacs-create-icon :file "less.png" :fallback "🗃️" :extensions ("less"))
(treemacs-create-icon :file "pdf.png" :fallback "🗃️" :extensions ("pdf"))
(treemacs-create-icon :file "tex.png" :fallback "🗃️" :extensions ("tex" "latex" ))
(treemacs-create-icon :file "log.png" :fallback "🗃️" :extensions ("log" ))
(treemacs-create-icon :file "word.png" :fallback "🗃️" :extensions ("docs" "docx" "word" ))
(treemacs-create-icon :file "powerpoint.png" :fallback "🗃️" :extensions ("ppt" "pptx" ))
(treemacs-create-icon :file "html.png" :fallback "🗃️" :extensions ("html"))
(treemacs-create-icon :file "zip.png" :fallback "🗃️" :extensions ("zip" "tar" "tar.xz" "xz" "xfv" "7z"))
(treemacs-create-icon :file "todo.png" :fallback "🗃️" :extensions ("TODO" "todo" "Tasks" ))
(treemacs-create-icon :file "webassembly" :fallback "🗃️" :extensions ("wasm" "webasm" "webassembly"))
(treemacs-create-icon :file "python" :fallback "🗃️" :extensions ("py" "python"))))
(treemacs-load-theme 'Material)
(use-package undo-tree)
(use-package evil
:init
(setq evil-want-keybinding nil)
(setq evil-want-integration t)
(setq evil-want-C-u-scroll t)
(setq evil-want-C-i-jump nil)
(global-undo-tree-mode)
:config
(evil-set-undo-system 'undo-tree)
(evil-mode 1)
(define-key evil-insert-state-map (kbd "C-g") 'evil-normal-state)
(define-key evil-insert-state-map (kbd "C-h") 'evil-delete-backward-char-and-join)
;; Use visual line motions even outside of visual-line-mode buffers
(evil-global-set-key 'motion "j" 'evil-next-visual-line)
(evil-global-set-key 'motion "k" 'evil-previous-visual-line)
(evil-set-initial-state 'messages-buffer-mode 'normal)
(evil-set-initial-state 'dashboard-mode 'normal))
(use-package evil-collection
:after evil
:init
:config
(evil-collection-init))
(use-package counsel)
(use-package ivy
:diminish
:bind (
("M-x" . counsel-M-x)
("C-s" . swiper)
:map ivy-minibuffer-map
("TAB" . ivy-alt-done)
("C-f" . ivy-alt-done)
("C-l" . ivy-alt-done)
("C-j" . ivy-next-line)
("C-k" . ivy-previous-line)
:map ivy-switch-buffer-map
("C-k" . ivy-previous-line)
("C-l" . ivy-done)
("C-d" . ivy-switch-buffer-kill)
:map ivy-reverse-i-search-map
("C-k" . ivy-previous-line)
("C-d" . ivy-reverse-i-search-kill))
:init
(ivy-mode 1))
(use-package counsel-projectile
:config (counsel-projectile-mode))
;; Keybindings
(defun add-to-map(keys func)
"Add a keybinding in evil mode from keys to func."
(define-key evil-normal-state-map (kbd keys) func)
(define-key evil-motion-state-map (kbd keys) func))
;;(add-to-map "<SPC>" nil)
;;(add-to-map "<SPC> <SPC>" 'counsel-M-x)
;; (add-to-map "<SPC> f" 'lusty-file-explorer)
;; (add-to-map "<SPC> b" 'lusty-buffer-explorer)
;;(add-to-map "<SPC> o" 'treemacs)
;;(add-to-map "<SPC> s" 'save-buffer)
(defun open-file (file)
"just more shortest function for opening the file"
(interactive)
((lambda (file) (interactive)
(find-file (expand-file-name (format "%s" file)))) file ) )
(use-package general)
(general-evil-setup)
(general-nmap
:prefix "SPC"
;; dotfiles editing config
"SPC" '(counsel-M-x :which-key "M-x")
"o" '(treemacs :which-key "treemacs")
"f f" '(counsel-find-file :which-key "find-file")
"f r" '(counsel-buffer-or-recentf :which-key "recent files")
"b b" '(counsel-switch-buffer :which-key "switch buff")
"f e" '(lambda() (interactive) (find-file "~/.emacs.d/config.org") :which-key "config.org")
"f v" '(lambda() (interactive) (find-file "~/.config/nvim/init.vim" :which-key "neovim config" ))
"f d" '(lambda() (interactive) (find-file "~/dotfiles/home" :which-key "dotfiles dired" ))
"f a" '(lambda() (interactive) (find-file "~/.config/alacritty/alacritty.yml" :which-key "alacritty"))
"f b" '(lambda() (interactive) (find-file "~/Brain") :which-key "my brain")
)
(use-package which-key
:init (which-key-mode)
:diminish which-key-mode
:config
(setq which-key-idle-delay 0.3))
(use-package ivy-rich
:init
(ivy-rich-mode 1))
(set-face-attribute 'variable-pitch nil (set-face-attribute 'variable-pitch nil
;; :font "Cantarell" ;; :font "Cantarell"
:font "Hack" :font "Hack"
@ -385,7 +387,6 @@
(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)
(defun my/org-mode-setup() (defun my/org-mode-setup()
(auto-fill-mode 0) (auto-fill-mode 0)
(visual-line-mode 1) (visual-line-mode 1)
@ -400,6 +401,7 @@
) )
:config (setq org-agenda-files `("~/Brain" "~/Brain/Tasks/Tasks.org")) :config (setq org-agenda-files `("~/Brain" "~/Brain/Tasks/Tasks.org"))
(org-bullets-mode t) (org-bullets-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)
@ -519,63 +521,46 @@
(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-server)
(treemacs-create-theme "Material" (use-package org-roam
:icon-directory (treemacs-join-path treemacs-dir "/home/horhik/.emacs.d/icons") :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-server-mode :which-key "roam server "))
:custom
(org-roam-directory "~/Brain")
:config :config
(progn (setq
(treemacs-create-icon :file "folder-core-open.png" :fallback "📁" :extensions (root-open)) org-roam-server-host "127.0.0.1"
(treemacs-create-icon :file "folder-core.png" :fallback "📁" :extensions (root-closed)) org-roam-server-port 5034
(treemacs-create-icon :file "folder-node-open.png" :fallback "📂" :extensions (dir-open)) org-roam-server-authenticate nil
(treemacs-create-icon :file "folder-node.png" :fallback "📁" :extensions (dir-closed)) org-roam-server-export-inline-images t
(treemacs-create-icon :file "folder-test-open.png" :fallback "📂" :extensions ("tests")) org-roam-server-serve-files nil
(treemacs-create-icon :file "folder-test.png" :fallback "📁" :extensions ("tests")) org-roam-server-served-file-extensions '("pdf" "mp4" "ogv")
(treemacs-create-icon :file "emacs.png" :fallback "💜" :extensions ("el" "elc" ".spacemacs" "doom" )) org-roam-server-network-poll t
(treemacs-create-icon :file "emacs.png" :fallback "💜" :extensions ("el" "elc")) org-roam-server-network-arrows nil
(treemacs-create-icon :file "markdown.png" :fallback "📖" :extensions ("md")) org-roam-server-network-label-truncate t
(treemacs-create-icon :file "readme.png" :fallback "📖" :extensions ("readme.md" "README.md" "README" "readme")) org-roam-server-network-label-truncate-length 60
(treemacs-create-icon :file "editorconfig.png" :fallback "📖" :extensions ("editorconfig")) org-roam-server-network-label-wrap-length 20)
(treemacs-create-icon :file "org.png" :fallback "🐴" :extensions ("org"))
(treemacs-create-icon :file "rust.png" :fallback "🐴" :extensions ("rs"))
(treemacs-create-icon :file "haskell.png" :fallback "🐴" :extensions ("hs" "haskell"))
(treemacs-create-icon :file "c.png" :fallback "🐴" :extensions ("c"))
(treemacs-create-icon :file "cpp.png" :fallback "🐴" :extensions ("cpp" "c++"))
(treemacs-create-icon :file "h.png" :fallback "🐴" :extensions ("h"))
(treemacs-create-icon :file "diff.png" :fallback "🐴" :extensions ("diff"))
(treemacs-create-icon :file "makefile.png" :fallback "🐴" :extensions ("mk" "make" "Makefile"))
(treemacs-create-icon :file "assembly.png" :fallback "🐴" :extensions ("bin" "so" "o"))
(treemacs-create-icon :file "document.png" :fallback "🐴" :extensions ("" "txt"))
(treemacs-create-icon :file "file.png" :fallback "🐴" :extensions (fallback))
(treemacs-create-icon :file "toml.png" :fallback "🗃️" :extensions ("toml"))
(treemacs-create-icon :file "json.png" :fallback "🗃️" :extensions ("json"))
(treemacs-create-icon :file "yaml.png" :fallback "🗃️" :extensions ("yml" "yaml"))
(treemacs-create-icon :file "vim.png" :fallback "🗃️" :extensions ("vim" "vi" "nvim"))
(treemacs-create-icon :file "video.png" :fallback "🗃️" :extensions ("mp4" "avi" "gif" "mpv"))
(treemacs-create-icon :file "audio.png" :fallback "🗃️" :extensions ("mp3" "ogg" "wav" ))
(treemacs-create-icon :file "image.png" :fallback "🗃️" :extensions ("png" "jpg"))
(treemacs-create-icon :file "svg.png" :fallback "🗃️" :extensions ("svg"))
(treemacs-create-icon :file "css.png" :fallback "🗃️" :extensions ("css"))
(treemacs-create-icon :file "console.png" :fallback "🗃️" :extensions ("bash" "sh"))
(treemacs-create-icon :file "certificate.png" :fallback "🗃️" :extensions ("cert" "LICENSE" "license" "gpl" "mit" "gpl3" "gplv3" "apache"))
(treemacs-create-icon :file "database.png" :fallback "🗃️" :extensions ("sqlite" "db" "sql"))
(treemacs-create-icon :file "lua.png" :fallback "🗃️" :extensions ("lua"))
(treemacs-create-icon :file "javascript.png" :fallback "🗃️" :extensions ("js" "javascript"))
(treemacs-create-icon :file "typescript.png" :fallback "🗃️" :extensions ("ts" "typescript"))
(treemacs-create-icon :file "react.png" :fallback "🗃️" :extensions ("jsx"))
(treemacs-create-icon :file "react_ts.png" :fallback "🗃️" :extensions ("tsx"))
(treemacs-create-icon :file "settings.png" :fallback "🗃️" :extensions ("config" "conf" "rc" "*rc"))
(treemacs-create-icon :file "sass.png" :fallback "🗃️" :extensions ("sass" "scss"))
(treemacs-create-icon :file "xml.png" :fallback "🗃️" :extensions ("xml"))
(treemacs-create-icon :file "less.png" :fallback "🗃️" :extensions ("less"))
(treemacs-create-icon :file "pdf.png" :fallback "🗃️" :extensions ("pdf"))
(treemacs-create-icon :file "tex.png" :fallback "🗃️" :extensions ("tex" "latex" ))
(treemacs-create-icon :file "log.png" :fallback "🗃️" :extensions ("log" ))
(treemacs-create-icon :file "word.png" :fallback "🗃️" :extensions ("docs" "docx" "word" ))
(treemacs-create-icon :file "powerpoint.png" :fallback "🗃️" :extensions ("ppt" "pptx" ))
(treemacs-create-icon :file "html.png" :fallback "🗃️" :extensions ("html"))
(treemacs-create-icon :file "zip.png" :fallback "🗃️" :extensions ("zip" "tar" "tar.xz" "xz" "xfv" "7z"))
(treemacs-create-icon :file "todo.png" :fallback "🗃️" :extensions ("TODO" "todo" "Tasks" ))
(treemacs-create-icon :file "webassembly" :fallback "🗃️" :extensions ("wasm" "webasm" "webassembly"))
(treemacs-create-icon :file "python" :fallback "🗃️" :extensions ("py" "python"))))
(treemacs-load-theme 'Material)
(require 'org-roam-protocol)
(org-roam-server-mode t)
(server-start t)
)
(require 'org-roam-protocol)

3
home/rss/.newsboat/urls Normal file
View file

@ -0,0 +1,3 @@
https://lukesmith.xyz/rss.xml
https://hnrss.org/frontpage
https://hnrss.org/newest

View file

@ -156,8 +156,8 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
, ((modm .|. controlMask .|. shiftMask, xK_h), namedScratchpadAction myScratchpads "htop") , ((modm .|. controlMask .|. shiftMask, xK_h), namedScratchpadAction myScratchpads "htop")
, ((modm .|. shiftMask , xK_a), namedScratchpadAction myScratchpads "anki") , ((modm .|. shiftMask , xK_a), namedScratchpadAction myScratchpads "anki")
, ((modm .|. shiftMask , xK_m), namedScratchpadAction myScratchpads "pulse") , ((modm .|. shiftMask , xK_m), namedScratchpadAction myScratchpads "pulse")
, ((modm .|. shiftMask , xK_n), namedScratchpadAction myScratchpads "notion")
, ((modm .|. shiftMask , xK_d), namedScratchpadAction myScratchpads "todoist") , ((modm .|. shiftMask , xK_d), namedScratchpadAction myScratchpads "todoist")
, ((modm .|. shiftMask , xK_n), namedScratchpadAction myScratchpads "rss_news")
, ((modm .|. controlMask, xK_e), namedScratchpadAction myScratchpads "emacs") , ((modm .|. controlMask, xK_e), namedScratchpadAction myScratchpads "emacs")
-- | Programs -- | Programs
@ -293,6 +293,7 @@ myScratchpads = [
, NS "pulse" spawnPulse findPulse managePulse , NS "pulse" spawnPulse findPulse managePulse
, NS "todoist" spawnTodoist findTodoist manageTodoist , NS "todoist" spawnTodoist findTodoist manageTodoist
, NS "emacs" spawnEmacs findEmacs manageEmacs , NS "emacs" spawnEmacs findEmacs manageEmacs
, NS "rss_news" spawnRSS findRSS manageRSS
] ]
where where
classTerm = "TerminalDropdown" classTerm = "TerminalDropdown"
@ -347,6 +348,19 @@ myScratchpads = [
t = (1 - h) / 2 -- bottom edge t = (1 - h) / 2 -- bottom edge
l = (1 - w) / 2 -- centered left/right l = (1 - w) / 2 -- centered left/right
classRSS = "RSSDropDown"
titleRSS = "rss@news"
spawnRSS = "alacritty -t rss@news -e newsboat"
findRSS = title =? titleRSS
manageRSS = customFloating $ W.RationalRect l t w h
where
h = 0.5 -- height, 50%
w = 0.5 -- width, 50%
t = (1 - h) / 2 -- bottom edge
l = (1 - w) / 2 -- centered left/right