From 4e39d3db9d5196668b942a19a167b9a30d643ad8 Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Sat, 13 Mar 2021 16:34:18 +0100 Subject: [PATCH] Add orgmode --- files/.config/polybar/config | 34 +++++++++++++++---------------- files/init.el | 39 +++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 18 deletions(-) diff --git a/files/.config/polybar/config b/files/.config/polybar/config index a95962a..2d9cfd4 100644 --- a/files/.config/polybar/config +++ b/files/.config/polybar/config @@ -78,28 +78,28 @@ pin-workspaces = true wrapping-scroll = false format = -ws-icon-0 = 1;󰅬 -ws-icon-1 = 2;󰒋 -ws-icon-2 = 3;󰈹 -ws-icon-3 = 4;󰙯 -ws-icon-4 = 5;󰓇 -ws-icon-5 = 6;󰇮 -ws-icon-6 = 7;七 -ws-icon-7 = 8;八 -ws-icon-8 = 9;九 -ws-icon-9 = 10;十 - -#ws-icon-0 = 1;一 -#ws-icon-1 = 2;二 -#ws-icon-2 = 3;三 -#ws-icon-3 = 4;四 -#ws-icon-4 = 5;五 -#ws-icon-5 = 6;六 +#ws-icon-0 = 1;󰅬 +#ws-icon-1 = 2;󰒋 +#ws-icon-2 = 3;󰈹 +#ws-icon-3 = 4;󰙯 +#ws-icon-4 = 5;󰓇 +#ws-icon-5 = 6;󰇮 #ws-icon-6 = 7;七 #ws-icon-7 = 8;八 #ws-icon-8 = 9;九 #ws-icon-9 = 10;十 +ws-icon-0 = 1;一 +ws-icon-1 = 2;二 +ws-icon-2 = 3;三 +ws-icon-3 = 4;四 +ws-icon-4 = 5;五 +ws-icon-5 = 6;六 +ws-icon-6 = 7;七 +ws-icon-7 = 8;八 +ws-icon-8 = 9;九 +ws-icon-9 = 10;十 + label-focused = "%icon%" label-focused-overline = ${colors.accent} label-focused-foreground = ${colors.foreground} diff --git a/files/init.el b/files/init.el index aa7f469..6e3b194 100644 --- a/files/init.el +++ b/files/init.el @@ -55,6 +55,7 @@ (use-package doom-modeline :ensure t :init (doom-modeline-mode 1) + :custom ((doom-modeline-height 10))) (use-package all-the-icons @@ -151,6 +152,36 @@ :map minibuffer-local-map ("C-r" . 'counsel-minibuffer-history))) +(use-package org + :ensure t + ;; M-LEFT M-RIGHT deindent indent node + ;; M-UP M-DOWN move node up down + ;; Tab fold/unfold + ;; M-S-RET Insert new TODO + :general + (vim-leader-def 'normal 'global + "ohj" 'org-forward-heading-same-level ;; org header j" + "ohk" 'org-backward-heading-same-level ;; org header k + "or" 'org-meta-return ;; org return, insert new entry + "otr" 'org-todo ;; org todo rotate + "opk" 'org-priority-up ;; org prio k + "opj" 'org-priority-down ;; org prip j + "oci" 'org-clock-in + "oco" 'org-clock-out + "oy" 'org-cycle) ;; Org-cYcle + :config + (setq org-format-latex-options (plist-put org-format-latex-options :scale 1.5)) + :init + (setq org-todo-keywords '((sequence "TODO" "PROGRESS" "FEEDBACK" "|" "DONE" "DELEGATED"))) + (setq org-log-done 'time)) + +(use-package org-bullets + :ensure t + :after org + :hook (org-mode . org-bullets-mode) + :custom + (org-bullets-bullet-list '("◉" "○" "●" "○" "●" "○" "●"))) + ;; Development ;; giiiiiiiiit @@ -300,13 +331,19 @@ (haskell-mode . lsp) (haskell-literate-mode . lsp)) +;; ipython notebook +(use-package ein + :ensure t + :config + (setq ein:output-area-inlined-images t)) + (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(package-selected-packages - '(fill-column-indicator lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package))) + '(org-bullets ein fill-column-indicator lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful.