diff options
| -rw-r--r-- | .emacs.d/init.el | 237 | ||||
| -rw-r--r-- | .emacs.d/snippets/all-the-icons-dired.el (renamed from .emacs.d/lisp/all-the-icons-dired.el) | 0 | ||||
| -rw-r--r-- | .emacs.d/snippets/anki-editor.el (renamed from .emacs.d/lisp/anki-editor.el) | 0 | ||||
| -rw-r--r-- | .emacs.d/snippets/exwm-holyK-firefox.el (renamed from .emacs.d/lisp/exwm-holyK-firefox.el) | 24 | ||||
| -rw-r--r-- | .emacs.d/snippets/functions.el (renamed from .emacs.d/lisp/functions.el) | 0 | ||||
| -rw-r--r-- | .emacs.d/snippets/keys.el (renamed from .emacs.d/lisp/keys.el) | 5 | ||||
| -rw-r--r-- | .emacs.d/snippets/workspaces.el (renamed from .emacs.d/lisp/workspaces.el) | 0 |
7 files changed, 57 insertions, 209 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index e0f0842..b4b369d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -3,10 +3,12 @@ ;;; Code: (require 'package) -(add-to-list 'load-path "~/.emacs.d/lisp/") -(add-to-list 'load-path "/home/apollo/.guix-profile/share/emacs/site-lisp") +(add-to-list 'load-path "~/dotfiles/.emacs.d/snippets") +(add-to-list 'load-path "~/.guix-profile/share/emacs/site-lisp") (add-to-list 'load-path "~/dotfiles") + +(setq custom-file (concat user-emacs-directory "/custom.el")) (guix-emacs-autoload-packages) @@ -96,6 +98,8 @@ to be installed.") (load "all-the-icons-dired.el") (load "secret") (load "exwm-holyK-firefox") +(load-file custom-file) ;; Load custom.el + ;; if you are using guix, emacs-exwm will look for ~/.exwm.el ;; in case we are not using guix we are gonna load it anyway here, just to get the ;; transperancy and other modifications @@ -147,33 +151,33 @@ to be installed.") :height apollo/default-font-size :weight 'regular) -;Dashboard settings -;(use-package dashboard - (dashboard-setup-startup-hook) - - (setq dashboard-items '((recents . 5) - (bookmarks . 5))) - (setq initial-buffer-choice (lambda () (get-buffer-create "*dashboard*"))) - (setq dashboard-item-names '(("Recent Files:" . "Recent Files:") - ("Bookmarks:" . "Study:"))) - ;; Set the banner - (setq dashboard-startup-banner "~/dotfiles/pictures/medicine/plague-doctor-s.png") - ;; Set the title - (setq dashboard-banner-logo-title "Is that a flying flower?") - ;; (setq dashboard-init-info "Bring me your sick and wounded!") - ;; Content is not centered by default. To center, set - (setq dashboard-set-init-info t) - (setq dashboard-center-content t) - (setq dashboard-set-navigator t) - (setq dashboard-set-heading-icons t) - (setq dashboard-set-file-icons t) - (setq dashboard-show-shortcuts nil) - (setq dashboard-set-footer t) - (setq dashboard-footer-messages '("Welcome to the Church Of Emacs")) - (setq dashboard-footer-icon (all-the-icons-octicon "broadcast" - :height 1.15 - :v-adjust -0.05 - :face 'font-lock-keyword-face)) +;; Dashboard settings +(require 'dashboard) +(dashboard-setup-startup-hook) + +(setq dashboard-items '((recents . 5) + (bookmarks . 5))) +(setq initial-buffer-choice (lambda () (get-buffer-create "*dashboard*"))) +(setq dashboard-item-names '(("Recent Files:" . "Recent Files:") + ("Bookmarks:" . "Study:"))) +;; Set the banner +(setq dashboard-startup-banner "~/dotfiles/pictures/medicine/plague-doctor-s.png") +;; Set the title +(setq dashboard-banner-logo-title "Is that a flying flower?") +;; (setq dashboard-init-info "Bring me your sick and wounded!") +;; Content is not centered by default. To center, set +(setq dashboard-set-init-info t) +(setq dashboard-center-content t) +(setq dashboard-set-navigator t) +(setq dashboard-set-heading-icons t) +(setq dashboard-set-file-icons t) +(setq dashboard-show-shortcuts nil) +(setq dashboard-set-footer t) +(setq dashboard-footer-messages '("Welcome to the Church Of Emacs")) +(setq dashboard-footer-icon (all-the-icons-octicon "broadcast" + :height 1.15 + :v-adjust -0.05 + :face 'font-lock-keyword-face)) (defvar eshell-path-env (getenv "~/.local/bin")) @@ -238,166 +242,12 @@ to be installed.") - - -;; (apollo/leader-keys -;; "t" '(:ignore t :which-key "toggles") -;; "tt" '(counsel-load-theme :which-key "choose theme")) - - - -;; (apollo/leader-keys -;; "g" '(:ignore t :which-key "Git") -;; "gs" '(magit-status :which-key "status")) - -;; (apollo/leader-keys -;; "f" '(counsel-find-file :which-key "Find File")) - -(defun apollo/org-mode-setup () - (setq evil-auto-indent nil) - (apollo/org-theme-dracula)) - -(use-package org - :hook (org-mode . apollo/org-mode-setup) - :config - (setq org-directory "~/org/" - org-agenda-files '("~/org/agenda.org" - "~/org/med.org") - org-default-notes-file (expand-file-name "notes.org" org-directory) - org-ellipsis " ▼ " - org-log-done 'time - org-hide-emphasis-markers nil ;change to t to hide emphasis markers - org-table-convert-region-max-lines 20000 - org-todo-keywords ; This overwrites the default Doom org-todo-keywords - '((sequence - "TODO(t)" ; A task that is ready to be tackled - "BLOG(b)" ; Blog writing assignments - "GYM(g)" ; Things to accomplish at the gym - "WAIT(w)" ; Something is holding up this task - "|" ; The pipe necessary to separate "active" states and "inactive" states - "DONE(d)" ; Task has been completed - "CANCELLED(c)" ))) - (setq org-agenda-start-log-mode t) - (setq org-log-done 'time) - (setq org-log-into-drawer t)) - -;; Use either org-bullets or org-superstar - ;; (use-package org-bullets - ;; :after org - ;; :hook (org-mode . org-bullets-mode) - ;; :custom -;; (org-bullets-bullet-list '("●" "○" "●" "○" "●" "●" ))) - - ;; (use-package org-superstar - ;; :after org - ;; :hook (org-mode . org-superstar-mode) - ;; :config - ;; (setq - ;; org-superstar-headline-bullets-list '("◉" "●" "○" "●" "○" "●" "◆") - ;; org-superstar-itembullet-alist '((?+ . ?➤) (?- . ?✦))) ; changes +/- symbols in item lists -;; ) - -(use-package org-modern - :after org - :hook (org-mode . org-modern-mode)) - -(defun apollo/org-theme-darkone () - "My custom org theme for doom themes" - (interactive) - (dolist - (face - '((org-level-1 1.70 "#51afef" ultra-bold) - (org-level-2 1.55 "#7FBCD2" extra-bold) - (org-level-3 1.40 "#da8548" bold) - (org-level-4 1.20 "#da8548" semi-bold) - (org-level-5 1.20 "#5699af" normal) - (org-level-6 1.20 "#a9a1e1" normal) - (org-level-7 1.10 "#46d9ff" normal) - (org-level-8 1.00 "#ff6c6b" normal))) - (set-face-attribute (nth 0 face) nil - :font "Jetbrains Mono" - :weight (nth 3 face) - :height (nth 1 face) - :foreground (nth 2 face))) - (set-face-attribute 'org-table nil - :font "Jetbrains Mono" - :weight 'normal - :height 1.0 - :foreground "#A66CFF")) - -(defun apollo/org-theme-dracula () - "Enable Dracula theme for Org headers." - (interactive) - (dolist - (face - '((org-level-1 1.7 "#8be9fd" ultra-bold) - (org-level-2 1.6 "#bd93f9" extra-bold) - (org-level-3 1.5 "#50fa7b" bold) - (org-level-4 1.4 "#ff79c6" semi-bold) - (org-level-5 1.3 "#9aedfe" normal) - (org-level-6 1.2 "#caa9fa" normal) - (org-level-7 1.1 "#5af78e" normal) - (org-level-8 1.0 "#ff92d0" normal))) - (set-face-attribute (nth 0 face) nil - :font "JetBrains Mono" - :weight (nth 3 face) - :height (nth 1 face) - :foreground (nth 2 face))) - (set-face-attribute 'org-table nil - :font "JetBrains Mono" - :weight 'normal - :height 1.0 - :foreground "#bfafdf")) - -(defun apollo/org-mode-visual () - (interactive) - (setq visual-fill-column-width 100 - visual-fill-column-center-text t) - (visual-fill-column-mode 1)) -(defun apollo/org-mode-visual-undo () - (interactive) - (setq visual-fill-column-width 2000 - visual-fill-column-center-text nil) - (visual-fill-column-mode 1)) - -(defadvice org-edit-src-code (around set-buffer-file-name activate compile) - (let ((file-name (buffer-file-name))) ;; (1) - ad-do-it ;; (2) - (setq buffer-file-name file-name))) ;; (3) - -(org-babel-do-load-languages - 'org-babel-load-languages - '((emacs-lisp . t) - (python . t))) - -(require 'org-tempo) -(add-to-list 'org-structure-template-alist '("sh" . "src shell")) -(add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp")) -(add-to-list 'org-structure-template-alist '("py" . "src python")) - -;; Automatically tangle our Emacs.org config file when we save it -(defun apollo/org-babel-tangle-config () - (when (string-equal (buffer-file-name) - (expand-file-name "~/.emacs.d/emacs.org" - "~/.config/qtile/README.org")) - ;; Dynamic scoping to the rescue - (let ((org-confirm-babel-evaluate nil)) - (org-babel-tangle)))) - -(add-hook 'org-mode-hook (lambda () (add-hook 'after-save-hook #'apollo/org-babel-tangle-config))) - - - ;Developer +;;; Developer ;;Essentials (electric-pair-mode 1) (setq sgml-quick-keys 'close) -;;html -;(add-hook 'html-mode-hook #'lsp-deferred) - - - ;;emacs-lisp (setq tab-always-indent 'complete) @@ -617,21 +467,4 @@ to be installed.") mastodon-active-user "apo11o") -(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. - '(auth-source-save-behavior nil) - '(custom-safe-themes - '("2f8eadc12bf60b581674a41ddc319a40ed373dd4a7c577933acaff15d2bf7cc6" "7e377879cbd60c66b88e51fad480b3ab18d60847f31c435f15f5df18bdb18184" "991ca4dbb23cab4f45c1463c187ac80de9e6a718edc8640003892a2523cb6259" "5b9a45080feaedc7820894ebbfe4f8251e13b66654ac4394cb416fef9fdca789" "ae426fc51c58ade49774264c17e666ea7f681d8cae62570630539be3d06fd964" "4fda8201465755b403a33e385cf0f75eeec31ca8893199266a6aeccb4adedfa4" "da75eceab6bea9298e04ce5b4b07349f8c02da305734f7c0c8c6af7b5eaa9738" "2853dd90f0d49439ebd582a8cbb82b9b3c2a02593483341b257f88add195ad76" "570263442ce6735821600ec74a9b032bc5512ed4539faf61168f2fdf747e0668" "8d8207a39e18e2cc95ebddf62f841442d36fcba01a2a9451773d4ed30b632443" "251ed7ecd97af314cd77b07359a09da12dcd97be35e3ab761d4a92d8d8cf9a71" "d824f0976625bb3bb38d3f6dd10b017bdb4612f27102545a188deef0d88b0cd9" "fa1b2c364b1d058d0611caa5f5c9b2e8cdd0eca519ef88af2de2a2728bbf8070" "803aaddee599b43da31fb0fd8fae0fa58b4ef7617c673f07201e3463a3099957" "21055a064d6d673f666baaed35a69519841134829982cbbb76960575f43424db" "2c613514f52fb56d34d00cc074fe6b5f4769b4b7f0cc12d22787808addcef12c" "3325e2c49c8cc81a8cc94b0d57f1975e6562858db5de840b03338529c64f58d1" "512ce140ea9c1521ccaceaa0e73e2487e2d3826cc9d287275550b47c04072bc4" "6945dadc749ac5cbd47012cad836f92aea9ebec9f504d32fe89a956260773ca4" "05626f77b0c8c197c7e4a31d9783c4ec6e351d9624aa28bc15e7f6d6a6ebd926" "49acd691c89118c0768c4fb9a333af33e3d2dca48e6f79787478757071d64e68" "60ada0ff6b91687f1a04cc17ad04119e59a7542644c7c59fc135909499400ab8" "545ab1a535c913c9214fe5b883046f02982c508815612234140240c129682a68" "ce4234c32262924c1d2f43e6b61312634938777071f1129c7cde3ebd4a3028da" "c865644bfc16c7a43e847828139b74d1117a6077a845d16e71da38c8413a5aaa" "680f62b751481cc5b5b44aeab824e5683cf13792c006aeba1c25ce2d89826426" "631c52620e2953e744f2b56d102eae503017047fb43d65ce028e88ef5846ea3b" "2dd4951e967990396142ec54d376cced3f135810b2b69920e77103e0bcedfba9" "a138ec18a6b926ea9d66e61aac28f5ce99739cf38566876dc31e29ec8757f6e2" "683b3fe1689da78a4e64d3ddfce90f2c19eb2d8ab1bab1738a63d8263119c3f4" "2dc03dfb67fbcb7d9c487522c29b7582da20766c9998aaad5e5b63b5c27eec3f" "830596655dc39879096d9b7772768de6042fb5a4293c6b90c98a9b98bce96e4a" "7dc296b80df1b29bfc4062d1a66ee91efb462d6a7a934955e94e786394d80b71" "0ce768d3ea6d809292d12b22a5ff6de65e24a8d527e4e0885cf87640f42dff7d" "02f57ef0a20b7f61adce51445b68b2a7e832648ce2e7efb19d217b6454c1b644" "e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2" "5586a5db9dadef93b6b6e72720205a4fa92fd60e4ccfd3a5fa389782eab2371b" "1aa4243143f6c9f2a51ff173221f4fd23a1719f4194df6cef8878e75d349613d" "7a4784fc0c0c853c578132e81a757a0f9b3e675fdd7e56303f3ee1fb8d7ae2a3" "8d3ef5ff6273f2a552152c7febc40eabca26bae05bd12bc85062e2dc224cde9a" "aec7b55f2a13307a55517fdf08438863d694550565dee23181d2ebd973ebd6b8" "7a424478cb77a96af2c0f50cfb4e2a88647b3ccca225f8c650ed45b7f50d9525" "944d52450c57b7cbba08f9b3d08095eb7a5541b0ecfb3a0a9ecd4a18f3c28948" "3199be8536de4a8300eaf9ce6d864a35aa802088c0925e944e2b74a574c68fd0" "443e2c3c4dd44510f0ea8247b438e834188dc1c6fb80785d83ad3628eadf9294" "554c2be54aecbbd3a6317906ada2e8f25f50f8d6bf3d9c22e3b30e3700d0bbd1" "5f128efd37c6a87cd4ad8e8b7f2afaba425425524a68133ac0efd87291d05874" "bf948e3f55a8cd1f420373410911d0a50be5a04a8886cabe8d8e471ad8fdba8e" "fb2c27e7ad4a81c2f57bceeca0faeb1c84fb7a167c097b998e2a1ea314455fd6" "47f3e55e4e3d570d5513d4cc58047dc059bd6ab3d135c796c4ccbfb77d4eb88b" "1070069a4671554a2c00b8375485896c1aa8144f5b8d99b86845069351770ee9" "e8483bc21cf667971eabdbb01203e3a471de1b59a4e532368b7a20f5665d686a" "b7bf7b95fb796614f0b36a7c4906a93db75ad0c6146f336c7ed085f6fceef93d" "05b767a3f3a37ac46353fd88f194934d82eb6c3644c3b8da883752f57513e7aa" default)) - '(package-selected-packages - '(pandoc org-anki eshell-vterm snow eshell-prompt-extras mastodon geiser-guile flycheck-guile ox-jekyll-md exwm-evil-firefox eshell-syntax-highlighting simple-httpd simplte-httpd greek-polytonic darktooth-theme org-drill circe rcirc-color emms dashboard pdf-tools desktop-environment which-key use-package typescript-mode the-matrix-theme telega sudo-edit rjsx-mode rainbow-delimiters pyvenv python-mode paredit org-superstar org-modern monkeytype magit lsp-ui json-mode helpful general flycheck exwm-mff exwm-firefox-core elfeed-goodies doom-themes doom-modeline dap-mode counsel corfu consult company-box alsamixer all-the-icons-ivy-rich))) - -(custom-set-faces - ;; custom-set-faces 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. - ) -(put 'upcase-region 'disabled nil) + diff --git a/.emacs.d/lisp/all-the-icons-dired.el b/.emacs.d/snippets/all-the-icons-dired.el index d2a8763..d2a8763 100644 --- a/.emacs.d/lisp/all-the-icons-dired.el +++ b/.emacs.d/snippets/all-the-icons-dired.el diff --git a/.emacs.d/lisp/anki-editor.el b/.emacs.d/snippets/anki-editor.el index 70a0270..70a0270 100644 --- a/.emacs.d/lisp/anki-editor.el +++ b/.emacs.d/snippets/anki-editor.el diff --git a/.emacs.d/lisp/exwm-holyK-firefox.el b/.emacs.d/snippets/exwm-holyK-firefox.el index 30eff56..5c0fa33 100644 --- a/.emacs.d/lisp/exwm-holyK-firefox.el +++ b/.emacs.d/snippets/exwm-holyK-firefox.el @@ -1,12 +1,21 @@ ;;; exwm-holyK-firefox --- Emacs keybinding implemention of exwm-firefox-core -;;; Author: Thanos Apollo +;; Author: Thanos Apollo +;; URL: -- +;; Version: 1.0 +;; Package-Requires: ((emacs "24.4") (exwm "0.16") (exwm-firefox-core "1.0")) +;; Keywords: extensions + ;;; Commentary: + +;; This package implements exwm-firefox-core to allow navigation and editing in firefox +;; using default-like Emacs keybindings + ;;; Code: (require 'exwm-firefox-core) (defvar exwm-firefox-class-names - '("firefox-default" "firefox" "Firefox" "Nightly" "Icecat") + '("firefox-default" "firefox" "Firefox" "Nightly" "Icecat" "Iceweasel") "The class name used for detecting if current buffer is a firefox browser.") (define-minor-mode exwm-firefox-holyK-mode @@ -17,20 +26,23 @@ (define-key map (kbd "C-p") 'exwm-firefox-core-up) (define-key map (kbd "C-f") 'exwm-firefox-core-tab-next) (define-key map (kbd "C-b") 'exwm-firefox-core-tab-previous) - (define-key map (kbd "C-s") 'exwm-firefox-core-find) (define-key map (kbd "C-y") 'exwm-firefox-core-paste) + (define-key map (kbd "C-c C-f") 'exwm-firefox-core-find) (define-key map (kbd "C-c C-c") 'exwm-firefox-core-copy) (define-key map (kbd "C-c C-n") 'exwm-firefox-core-tab-new) (define-key map (kbd "C-c C-k") 'exwm-firefox-core-tab-close) + (define-key map (kbd "C-c C-d") 'exwm-firefox-core-tab-close) + (define-key map (kbd "C-c C-b") 'exwm-firefox-core-history-back) + (define-key map (kbd "C-c C-f") 'exwm-firefox-core-history-forward) map)) -(defun exwm-firefox-holyK-activate-if-firefox () +(defun holyK-activate-if-firefox () "Activates firefox-holyK-mode mode when buffer is firefox. Firefox variant can be assigned in 'exwm-firefox-class-names`" (interactive) (if (member exwm-class-name exwm-firefox-class-names) (list (exwm-firefox-holyK-mode 1) - (setq-local exwm-input-line-mode-passthrough nil) + (setq-local exwm-input-line-mode-passthrough nil)) ;;if exwm-input-line-mode-passthroug t mouse will stop working properly - ))) + )) diff --git a/.emacs.d/lisp/functions.el b/.emacs.d/snippets/functions.el index 30cfa60..30cfa60 100644 --- a/.emacs.d/lisp/functions.el +++ b/.emacs.d/snippets/functions.el diff --git a/.emacs.d/lisp/keys.el b/.emacs.d/snippets/keys.el index e8a5b74..51f4cd4 100644 --- a/.emacs.d/lisp/keys.el +++ b/.emacs.d/snippets/keys.el @@ -56,7 +56,10 @@ (general-does :keymaps 'eshell-mode-map "n" 'eshell-new) - +;;org +(general-does + :keymaps 'org-mode-map + "3" 'org-insert-image-size-300) ;;pdf-tools ;;Add pdf-isearch-minor-mode hook, otherwise isearch will be buggy diff --git a/.emacs.d/lisp/workspaces.el b/.emacs.d/snippets/workspaces.el index ffdf993..ffdf993 100644 --- a/.emacs.d/lisp/workspaces.el +++ b/.emacs.d/snippets/workspaces.el |