diff --git a/bundle/bundle--defaults.el b/bundle/bundle--defaults.el index 882a417c..92c92fdc 100644 --- a/bundle/bundle--defaults.el +++ b/bundle/bundle--defaults.el @@ -10,10 +10,6 @@ (display-time-mode 1) (global-prettify-symbols-mode 1) -(when (eq emacs-major-version 27) - (when (display-graphic-p) - (tab-bar-mode 1))) - ;; Cursor and mouse (column-number-mode 1) (mouse-wheel-mode 1) @@ -70,10 +66,9 @@ (setq default-frame-alist '((font . "Fira Code-11") (alpha . 100) - (undecorated . t) - (width . 85) + (width . 94) (height . 70) - (fullscreen . fullscreen))) + (fullscreen . maximized))) ;; Mode line (setq-default mode-line-format diff --git a/bundle/bundle--hooks.el b/bundle/bundle--hooks.el index 31b61b60..6ccde35b 100644 --- a/bundle/bundle--hooks.el +++ b/bundle/bundle--hooks.el @@ -3,12 +3,6 @@ (add-hook 'write-file-hooks 'delete-trailing-whitespace) (add-hook 'diary-list-entries-hook 'diary-include-other-diary-files) (add-hook 'diary-mark-entries-hook 'diary-mark-included-diary-files) -(defun me/org-mode () - "My custom configuration for 'org-mode'." - ;(olivetti-mode) - (require 'olivetti) - (olivetti-set-width 82)) -(add-hook 'nov-mode-hook 'me/org-mode) (add-hook 'org-mode-hook 'turn-on-auto-fill) (add-hook 'rst-mode-hook 'turn-on-orgstruct) (add-hook 'newsticker-mode-hook 'imenu-add-menubar-index) diff --git a/bundle/bundle--keys.el b/bundle/bundle--keys.el index c9467f97..2a037a58 100644 --- a/bundle/bundle--keys.el +++ b/bundle/bundle--keys.el @@ -9,3 +9,5 @@ (global-set-key (kbd "M-i") 'imenu) (global-set-key (kbd "C-c n") 'newsticker-start) (global-set-key (kbd "M-o") 'ace-window) +(global-set-key (kbd "M-[") 'tab-bar-history-back) +(global-set-key (kbd "M-]") 'tab-bar-history-forward) diff --git a/bundle/bundle--package.el b/bundle/bundle--package.el index 5cf59d9e..ff9b854f 100644 --- a/bundle/bundle--package.el +++ b/bundle/bundle--package.el @@ -34,9 +34,12 @@ There are two things you can do about this warning: :init (ivy-mode 1)) +(use-package olivetti + :custom (olivetti-body-width 82)) + (use-package nov - :config - (setq nov-text-width 80)) + :config (setq nov-text-width nil nov-variable-pitch nil) + :hook (nov-mode . olivetti-mode)) (use-package projectile :init @@ -47,7 +50,15 @@ There are two things you can do about this warning: (define-key projectile-mode-map (kbd "s-p") 'projectile-command-map) (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) -(use-package elpy) +(use-package elpy + :config (setq elpy-modules + '(elpy-module-autodoc + elpy-module-company + elpy-module-eldoc + elpy-module-pyvenv + elpy-module-yasnippet) + elpy-test-pytest-runner-command '("pytest"))) + (use-package pyvenv :init (pyvenv-mode 1)) @@ -92,13 +103,11 @@ There are two things you can do about this warning: (use-package slime :config (setq inferior-lisp-program (executable-find "sbcl"))) - - (use-package org :config (setq org-agenda-dim-blocked-tasks nil org-agenda-inhibit-startup nil - org-agenda-span 6 + org-agenda-span 14 org-agenda-start-on-weekday nil org-agenda-include-diary t org-babel-shell-names (quote ("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")) @@ -126,6 +135,7 @@ There are two things you can do about this warning: ("screen" . shell-script) ("shell" . sh) ("C" . c) + ("sqlite" . sql) ("plantuml" . plantuml))) org-use-property-inheritance nil org-export-with-sub-superscripts nil diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el index 7d966116..03b0004d 100644 --- a/bundle/custom_gnu.el +++ b/bundle/custom_gnu.el @@ -9,28 +9,24 @@ '(ansi-color-names-vector ["#212526" "#ff4b4b" "#b4fa70" "#fce94f" "#729fcf" "#e090d7" "#8cc4ff" "#eeeeec"]) '(backup-directory-alist '(("." . "~/.backup_filez"))) - '(custom-enabled-themes '(nord)) + '(custom-enabled-themes '(atom-one-dark)) '(custom-safe-themes - '("37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "06bf0822aa77ea498bbd6038b59ad96fca43b272b49b18ab024218881ba134d1" "6e933f1668e124ec17fc7b6547f65ba760e06efb568a6c8091c600c67827e592" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default)) + '("9e39a8334e0e476157bfdb8e42e1cea43fad02c9ec7c0dbd5498cf02b9adeaf1" "fe36e4da2ca97d9d706e569024caa996f8368044a8253dc645782e01cd68d884" "1fbd63256477789327fe429bd318fb90a8a42e5f2756dd1a94805fc810ae1b62" "7bc40a2e714b4872ad5cd07f992eb8e06ef5e01a8877488b9ffc3067463ca721" "37768a79b479684b0756dec7c0fc7652082910c37d8863c35b702db3f16000f8" "06bf0822aa77ea498bbd6038b59ad96fca43b272b49b18ab024218881ba134d1" "6e933f1668e124ec17fc7b6547f65ba760e06efb568a6c8091c600c67827e592" "7f6d4aebcc44c264a64e714c3d9d1e903284305fd7e319e7cb73345a9994f5ef" default)) '(delete-selection-mode nil) '(diary-file "~/Documents/diary/diary") - '(elpy-modules - '(elpy-module-company elpy-module-eldoc elpy-module-flymake elpy-module-folding elpy-module-pyvenv elpy-module-yasnippet elpy-module-django elpy-module-autodoc elpy-module-sane-defaults)) - '(elpy-test-pytest-runner-command '("pytest")) '(fci-rule-color "#4C566A") '(gnus-init-file "~/.emacs.d/.gnus.el") + '(hl-paren-colors '("#B9F" "#B8D" "#B7B" "#B69" "#B57" "#B45" "#B33" "#B11")) '(initial-buffer-choice "~/Documents/journal/notes.org") - '(nov-text-width nil) - '(nov-variable-pitch nil) - '(olivetti-body-width 73) + '(olivetti-body-width 82 nil nil "Customized with use-package olivetti") '(org-modules '(ol-bbdb ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m orgtbl-sqlinsert)) '(org-plantuml-jar-path "~/.local/bin/plantuml.jar") '(package-enable-at-startup t) '(package-selected-packages - '(geiser all-the-icons-ivy all-the-icons-dired powershell forge request all-the-icons-ibuffer all-the-icons-ivy-rich all-the-icons-ivy-rich-mode all-the-icons-ibuffer-mode ox-reveal csv-mode gnuplot eglot projectile elpy color-theme-sanityinc-tomorrow nov markdown-mode markdown-preview-mode olivetti web-mode js2-mode slime flymake-racket racket-mode yaml-mode lua-mode nordless-theme use-package colorless-themes nord-theme toc-org ace-window htmlize ivy magit)) - '(projectile-completion-system 'ivy) - '(scroll-bar-mode nil)) + '(parse-csv csv atom-one-dark-theme arjen-grey-theme arc-dark-theme geiser all-the-icons-ivy all-the-icons-dired powershell forge request all-the-icons-ibuffer all-the-icons-ivy-rich all-the-icons-ivy-rich-mode all-the-icons-ibuffer-mode ox-reveal csv-mode gnuplot eglot projectile elpy color-theme-sanityinc-tomorrow nov markdown-mode markdown-preview-mode olivetti web-mode js2-mode slime flymake-racket racket-mode yaml-mode lua-mode nordless-theme use-package colorless-themes nord-theme toc-org ace-window htmlize ivy magit)) + '(scroll-bar-mode nil) + '(tab-bar-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -38,8 +34,4 @@ ;; If there is more than one, they won't work right. '(highlight-indentation-current-column-face ((t (:inherit hl-line)))) '(highlight-indentation-face ((t (:inherit hl-line)))) - '(tab-bar ((t (:inherit mode-line-inactive)))) - '(tab-bar-tab ((t (:inherit mode-line-highlight)))) - '(tab-bar-tab-inactive ((t (:inherit tab-bar)))) - '(tab-line ((t nil))) '(variable-pitch ((t (:height 1.2 :family "Roboto Condensed")))))