From 6156f86dd5797de5ea4f912b70d38963c6cf4ad4 Mon Sep 17 00:00:00 2001 From: jdlugosz963 Date: Sun, 2 Jul 2023 15:07:07 +0200 Subject: New Emacs config and change location of Emacs home dir. --- .emacs.d/.gitignore | 9 +++ .emacs.d/init.el | 122 +++++++++++++++++++++++++++++ .emacs.d/jd/jd-apps.el | 87 +++++++++++++++++++++ .emacs.d/jd/jd-custom.el | 31 ++++++++ .emacs.d/jd/jd-dev.el | 173 +++++++++++++++++++++++++++++++++++++++++ .emacs.d/jd/jd-exwm.el | 171 ++++++++++++++++++++++++++++++++++++++++ .emacs.d/jd/jd-gym.el | 120 ++++++++++++++++++++++++++++ .emacs.d/jd/jd-keys.el | 115 +++++++++++++++++++++++++++ .emacs.d/jd/jd-mu4e.el | 79 +++++++++++++++++++ .emacs.d/jd/jd-org.el | 198 +++++++++++++++++++++++++++++++++++++++++++++++ .emacs.d/jd/jd-ui.el | 102 ++++++++++++++++++++++++ 11 files changed, 1207 insertions(+) create mode 100644 .emacs.d/.gitignore create mode 100755 .emacs.d/init.el create mode 100755 .emacs.d/jd/jd-apps.el create mode 100755 .emacs.d/jd/jd-custom.el create mode 100755 .emacs.d/jd/jd-dev.el create mode 100755 .emacs.d/jd/jd-exwm.el create mode 100755 .emacs.d/jd/jd-gym.el create mode 100755 .emacs.d/jd/jd-keys.el create mode 100755 .emacs.d/jd/jd-mu4e.el create mode 100755 .emacs.d/jd/jd-org.el create mode 100755 .emacs.d/jd/jd-ui.el (limited to '.emacs.d') diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore new file mode 100644 index 0000000..d3d6223 --- /dev/null +++ b/.emacs.d/.gitignore @@ -0,0 +1,9 @@ +auto-save-list/ +eln-cache/ +elpa/ +eshell/ +transient/ +ido.last +projectile-bookmarks.eld +projects +session.* \ No newline at end of file diff --git a/.emacs.d/init.el b/.emacs.d/init.el new file mode 100755 index 0000000..d4fc30a --- /dev/null +++ b/.emacs.d/init.el @@ -0,0 +1,122 @@ +;;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + +(setq gc-cons-threshold (* 50 1000 1000)) + +(defvar jd/manifest-list + nil + "List that contain Emacs packages for GNU/Guix." ) + +(defvar jd/exwm-p + (or (not (null (getenv "JD_EXWM"))) + (and (seq-contains command-line-args "exwm" #'string-match) + t)) + "Is non-nil when Emacs is run as a window manager.") + +(defvar jd/guix-p + (and (eq system-type 'gnu/linux) + (file-exists-p "/etc/os-release") + (with-temp-buffer + (insert-file-contents "/etc/os-release") + (search-forward "ID=guix" nil t)) + t) + "Is non-nil when Emacs packages are installed by GNU/Guix package manager.") + +(defun jd/add-package-to-manifest (guix-package-name) + "Add GUIX-PACKAGE-NAME to jd/manifest-list." + (unless (member guix-package-name jd/manifest-list) + (setq jd/manifest-list + (cons guix-package-name jd/manifest-list)))) + +(add-to-list 'load-path (concat user-emacs-directory "/jd")) + +(defun jd/display-startup-time () + (message "Emacs loaded in %s with %d garbage collections." + (format "%.2f seconds" + (float-time + (time-subtract after-init-time before-init-time))) + gcs-done)) + +(defun jd-emacs/startup () + "This procedure will run after Emacs startup." + (electric-pair-mode 1) + (global-company-mode 1) + (jd/display-startup-time)) + +(add-hook 'emacs-startup-hook #'jd-emacs/startup) + +(setq user-full-name "Jakub Dlugosz" + user-mail-address "jdlugosz963@gmail.com") + +(setq backup-directory-alist '(("." . "~/.cache/emacs/backup")) + backup-by-copying t + version-control t + delete-old-versions t + kept-new-versions 20 + kept-old-versions 5) + +;; (setq user-emacs-directory "~/.cache/emacs") + +(require 'package) +(setq package-archives '(("melpa" . "https://melpa.org/packages/") + ("org" . "https://orgmode.org/elpa/") + ("gnu-devel" . "https://elpa.gnu.org/devel/") + ("elpa" . "https://elpa.gnu.org/packages/"))) +(package-initialize) + +(unless package-archive-contents + (package-refresh-contents)) + +(jd/add-package-to-manifest "emacs-use-package") +(unless jd/guix-p + (unless (package-installed-p 'use-package) + (package-install 'use-package))) + +(require 'use-package) + +(setq use-package-always-ensure (not jd/guix-p)) + +(defmacro jd/use-package (package-name + guix-package-name + &rest body) + `(progn + ,(when guix-package-name + `(jd/add-package-to-manifest ,guix-package-name)) + (use-package ,package-name ,@body))) + +(defun jd/manifest-generate-to-file (file-name) + "Generate GNU/Guix Emacs manifest to output file provided in: FILE-NAME." + (interactive + (list (read-from-minibuffer "Output file: " ))) + (with-temp-file file-name + (insert + (with-temp-buffer + (insert (format ";; This file is auto-generated by Emacs function: jd/manifest-generate-to-file\n%s" + `(specifications->manifest + '(,@(mapcar #'(lambda (guix-package-name) + (concat "\"" + guix-package-name + "\"\n")) + jd/manifest-list))))) + (pp-buffer) + (buffer-string))))) + +(jd/add-package-to-manifest "emacs") +(jd/add-package-to-manifest "emacs-guix") + +(require 'jd-keys) +(require 'jd-ui) +(require 'jd-org) +(require 'jd-dev) +(require 'jd-apps) +(require 'jd-custom) +(require 'jd-mu4e) + +(when jd/exwm-p + (require 'jd-exwm)) + +(setq gc-cons-threshold (* 2 1000 1000)) + +;;; init.el ends here diff --git a/.emacs.d/jd/jd-apps.el b/.emacs.d/jd/jd-apps.el new file mode 100755 index 0000000..5064ff9 --- /dev/null +++ b/.emacs.d/jd/jd-apps.el @@ -0,0 +1,87 @@ +;;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + +;; (defun jd/open-new-vterm (&optional jd/vterm-buffer-name) +;; (interactive) +;; (let ((buffer-name (generate-new-buffer-name vterm-buffer-name))) +;; (when jd/vterm-buffer-name +;; (setq buffer-name jd/vterm-buffer-name)) +;; (switch-to-buffer buffer-name) +;; (vterm-mode))) + + +(jd/use-package vterm "emacs-vterm" + :init + (add-to-list 'project-switch-commands '(project-vterm "Vterm") t) + (add-to-list 'project-kill-buffer-conditions '(major-mode . vterm-mode)) + (setq vterm-copy-exclude-prompt t) + :config + (setq vterm-buffer-name "vterm") + ;; (evil-set-initial-state 'vterm-mode 'emacs) + (setq vterm-tramp-shells (append '(("ssh" "/bin/bash")) vterm-tramp-shells)) + + (jd/leader-key-def "ot" '(jd/open-new-vterm :which-key "Open terminal in current window"))) + +(jd/use-package all-the-icons-dired "emacs-all-the-icons-dired" + :hook (dired-mode . all-the-icons-dired-mode)) + +;; (jd/use-package dired-ranger nil) + +(jd/use-package dired nil + :ensure nil + :commands (dired dired-jump) + :custom ((dired-listing-switches "-agho --group-directories-first")) + :config + ;; (evil-collection-define-key 'normal 'dired-mode-map + ;; "y" 'dired-ranger-copy + ;; "p" 'dired-ranger-paste + ;; "X" 'dired-ranger-move + ;; "h" 'dired-up-directory + ;; "t" 'dired-create-empty-file + ;; "T" 'dired-toggle-marks + ;; "l" 'dired-find-file) + (setq dired-kill-when-opening-new-dired-buffer t) + ;; (evil-define-key 'normal dired-mode-map (kbd "q") 'kill-current-buffer) + ) + +;; (jd/use-package emms "emacs-emms" +;; :config +;; (require 'emms-setup) +;; (emms-all) +;; (emms-standard) +;; (emms-default-players) +;; (emms-mode-line-disable) +;; (setq emms-browser-covers 'emms-browser-cache-thumbnail-async) +;; (emms-add-directory-tree "~/Documents/Music/")) + +(jd/use-package pdf-tools "emacs-pdf-tools") + +(jd/use-package elfeed "emacs-elfeed" + :config + (setq elfeed-feeds + '(("https://www.reddit.com/r/emacs.rss" emacs) + ("https://www.reddit.com/r/gnu.rss" gnu) + ("https://stallman.org/rss/rss.xml" stallman) + ("https://news.ycombinator.com/rss" hacker-news)))) + +;; (jd/use-package langtool +;; :config +;; (setq langtool-language-tool-jar "/home/jakub/Documents/LanguageTool-6.0/languagetool-commandline.jar") +;; (setq langtool-default-language "pl-PL")) + +;; (jd/leader-key-def +;; "l" '(:ignore t :which-key "langtool") +;; "lc" 'langtool-check-buffer +;; "ld" 'langtool-check-done +;; "li" 'langtool-interactive-correction) + +(jd/use-package mastodon "emacs-mastodon" + :config + (setq mastodon-active-user "jdlugosz963" + mastodon-instance-url "https://fosstodon.org/")) + +(provide 'jd-apps) + +;;; jd-apps.el ends here diff --git a/.emacs.d/jd/jd-custom.el b/.emacs.d/jd/jd-custom.el new file mode 100755 index 0000000..96d13c6 --- /dev/null +++ b/.emacs.d/jd/jd-custom.el @@ -0,0 +1,31 @@ +;;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + +(defun jd/generete-qr-from-clipboard () + (interactive) + (let ((clipboard-value (x-get-clipboard)) + (clipboard-file-path "/tmp/clipboard_value.txt") + (clipboard-out-image "/tmp/qr.png")) + (with-temp-file clipboard-file-path + (insert clipboard-value)) + (shell-command (concat + "qrencode -o " + clipboard-out-image + " < " + clipboard-file-path)) + (find-file clipboard-out-image))) + +(setq erc-nick "bobbma" + erc-user-full-name "Jakub Dlugosz" + erc-notify-list '("akuleszaa")) + +(defun hipis-znc () + (interactive) + (erc :server "195.74.91.18" + :port "6697")) + +(provide 'jd-custom) + +;;; jd-custom.el ends here diff --git a/.emacs.d/jd/jd-dev.el b/.emacs.d/jd/jd-dev.el new file mode 100755 index 0000000..d69313e --- /dev/null +++ b/.emacs.d/jd/jd-dev.el @@ -0,0 +1,173 @@ +;;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + +(setq c-default-style "linux" + c-basic-offset 8) + +(setq gdb-many-windows t) + +(jd/use-package lsp-mode "emacs-lsp-mode" + :commands (lsp lsp-deferred) + :init + (setq lsp-headerline-breadcrumb-enable nil) + (setq lsp-diagnostics-provider :none) + (setq lsp-modeline-diagnostics-enable nil) + (setq lsp-keymap-prefix "C-c l") + :config + (lsp-enable-which-key-integration t)) + +(jd/use-package lsp-ivy "emacs-lsp-ivy" + :after lsp) + +(jd/use-package paredit "emacs-paredit") +;; (jd/use-package evil-paredit "emacs-evil-paredit" +;; :config +;; (defun jd/lisp-mode-setup () +;; (rainbow-delimiters-mode) +;; (evil-paredit-mode) +;; (paredit-mode)) +;; (add-hook 'emacs-startup-hook +;; (lambda () +;; (add-hook 'scheme-mode-hook 'jd/lisp-mode-setup) +;; (add-hook 'emacs-lisp-mode-hook 'jd/lisp-mode-setup) +;; (add-hook 'clojure-mode-hook 'jd/lisp-mode-setup) +;; (add-hook 'lisp-mode-hook 'jd/lisp-mode-setup))) +;; (evil-define-key 'normal paredit-mode-map (kbd "g h") 'paredit-forward-barf-sexp) +;; (evil-define-key 'normal paredit-mode-map (kbd "g l") 'paredit-forward-slurp-sexp) +;; (evil-define-key 'normal paredit-mode-map (kbd "g H") 'paredit-backward-slurp-sexp) +;; (evil-define-key 'normal paredit-mode-map (kbd "g L") 'paredit-backward-barf-sexp)) +(jd/use-package rainbow-delimiters "emacs-rainbow-delimiters") + +(jd/use-package geiser "emacs-geiser") +(jd/use-package geiser-guile "emacs-geiser-guile") + +;; (defun jd/python-mode-setup () +;; (let ((project-venv-path (concat (projectile-project-root) "venv/"))) +;; (when (projectile--directory-p project-venv-path) +;; (pyvenv-activate project-venv-path) +;; (pyvenv-mode)))) + +;; (jd/use-package python-mode ;;TODO: find alternative +;; :hook (python-mode . lsp-deferred) +;; :hook (python-mode . jd/python-mode-setup) +;; :config +;; (add-to-list 'auto-mode-alist '("\\.py\\'" . python-mode))) + +(jd/use-package pyvenv "emacs-pyvenv" + :after python-mode) + +(jd/use-package typescript-mode "emacs-typescript-mode" + :mode ("\\.ts\\'") + :config + (setq typescript-indent-level 2)) + +;; (defun jd/activate-tide-mode () +;; (when (and (stringp buffer-file-name) +;; (string-match "\\.[tj]sx?\\'" buffer-file-name)) +;; (tide-setup) +;; (tide-hl-identifier-mode))) + +(jd/use-package tide "emacs-tide" + :after (typescript-mode company web-mode)) + +(jd/use-package flycheck "emacs-flycheck" + :hook ((after-init . global-flycheck-mode))) + +(jd/use-package web-mode "emacs-web-mode" + :hook ((web-mode . jd/activate-tide-mode)) + :mode + ("\\.ejs\\'" "\\.hbs\\'" "\\.html\\'" "\\.php\\'" "\\.[jt]sx?\\'") + :config + (setq web-mode-content-types-alist '(("jsx" . "\\.[jt]sx?\\'"))) + (setq web-mode-markup-indent-offset 2) + (setq web-mode-css-indent-offset 2) + (setq web-mode-code-indent-offset 2) + (setq web-mode-script-padding 2) + (setq web-mode-block-padding 2) + (setq web-mode-style-padding 2) + (setq web-mode-enable-auto-pairing t) + (setq web-mode-enable-auto-closing t) + (setq web-mode-enable-current-element-highlight t)) + +(jd/use-package yaml-mode "emacs-yaml-mode") + +(jd/use-package docker "emacs-docker" + :config + (jd/leader-key-def + "d" '(:ignore t :which-key "Docker") + "dc" '(docker-containers :which-key "Docker containers") + "dd" '(docker :which-key "Docker"))) + +(jd/use-package company "emacs-company" + :after lsp-mode + :hook (lsp-mode . company-mode) + :bind (:map company-active-map + ("" . company-complete-selection)) + (:map lsp-mode-map + ("" . company-indent-or-complete-common)) + :custom + (company-minimum-prefix-length 1) + (company-idle-delay 0.0) + :config + (global-company-mode)) + +(jd/use-package company-box "emacs-company-box" + :hook (company-mode . company-box-mode)) + +(jd/use-package projectile "emacs-projectile" + :diminish projectile-mode + :init + (when (file-directory-p "~/Documents/code") + (setq projectile-project-search-path '("~/Documents/code/"))) + :custom ((projectile-Completion-system 'ivy)) + :config + (setq projectile-switch-project-action #'projectile-dired) + (projectile-mode) + + (jd/leader-key-def + "p" '(projectile-command-map :which-key "Project") + "p " '() + "SPC" '(projectile-find-file :which-key "Find file in project"))) + +(jd/use-package neotree "emacs-neotree" + :init + (setq neo-theme 'icons) + :config + + ;; (evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter) + ;; (evil-define-key 'normal neotree-mode-map (kbd "C-RET") 'neotree-quick-look) + ;; (evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide) + ;; (evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter) + ;; (evil-define-key 'normal neotree-mode-map (kbd "g") 'neotree-refresh) + ;; (evil-define-key 'normal neotree-mode-map (kbd "A") 'neotree-stretch-toggle) + ;; (evil-define-key 'normal neotree-mode-map (kbd "H") 'neotree-hidden-file-toggle) + + (jd/leader-key-def + "op" '(jd/neotree-project-dir :which-key "Open neotree")) + + (defun jd/neotree-project-dir () + "Open NeoTree using the git root." + (interactive) + (let ((project-dir (projectile-project-root)) + (file-name (buffer-file-name))) + (neotree-toggle) + (if project-dir + (if (neo-global--window-exists-p) + (progn + (neotree-dir project-dir) + (neotree-find file-name))) + (message "Could not find git project root."))))) + +(jd/use-package magit "emacs-magit" + :custom + (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1) + + (jd/leader-key-def + "g" '(:ignore t :which-key "Git") + "gg" '(magit-status-here :which-key "Magit status"))) + +(provide 'jd-dev) + +;;; jd-dev.el ends here diff --git a/.emacs.d/jd/jd-exwm.el b/.emacs.d/jd/jd-exwm.el new file mode 100755 index 0000000..5e95a63 --- /dev/null +++ b/.emacs.d/jd/jd-exwm.el @@ -0,0 +1,171 @@ +;;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + + +(jd/use-package exwm "emacs-exwm" + :config + (defun jd/exwm-update-class () + (exwm-workspace-rename-buffer exwm-class-name)) + + (defun jd-exwm/run-in-background (command) + (let ((command-parts (split-string command "[ ]+"))) + (apply #'call-process `(,(car command-parts) nil 0 nil ,@(cdr command-parts))))) + + (defun jd-exwm/restart-process (program-name) + (call-process "killall" nil nil nil program-name) + (jd-exwm/run-in-background program-name)) + + (defun jd-exwm/exwm-init-hook () + (jd-exwm/run-in-background "nitrogen --restore") + (start-process-shell-command "xinput" nil "xinput set-prop 'ETPS/2 Elantech Touchpad' 'Synaptics Tap Action' 1 1 1 2 1") + (start-process-shell-command "syndaemon" nil "syndaemon -i 0.8 -K -R -d") + + (jd-exwm/restart-process "polybar") + (jd-exwm/restart-process "nm-applet") + (jd-exwm/restart-process "redshift-gtk -l 54.37:18.6") + (jd-exwm/restart-process "blueman-applet")) + + (defun jd-exwm/exwm-update-title () + (exwm-workspace-rename-buffer exwm-title)) + + (defun jd-exwm/configure-window-by-class () + (interactive) + (pcase exwm-class-name + ("firefox" (exwm-workspace-move-window 2)) + ("Brave" (exwm-workspace-move-window 2)) + ("qutebrowser" (exwm-workspace-move-window 2)) + ("discord" (exwm-workspace-move-window 5)) + ("obs" (exwm-workspace-move-window 5)) + ("Virt-manager" (exwm-workspace-move-window 4)))) + + (setq exwm-workspace-number 10) + + ;; (add-hook 'exwm-init-hook #'jd-exwm/exwm-init-hook) + (add-hook 'exwm-update-class-hook #'jd/exwm-update-class) + (add-hook 'exwm-update-title-hook #'jd-exwm/exwm-update-title) + (add-hook 'exwm-manage-finish-hook #'jd-exwm/configure-window-by-class) + + (require 'exwm-randr) + (setq exwm-randr-workspace-monitor-plist '(9 "eDP-1" 0 "eDP-1")) + (exwm-randr-enable) + + (setq exwm-input-simulation-keys + '(([?\C-b] . [left]) + ([?\C-f] . [right]) + ([?\C-p] . [up]) + ([?\C-n] . [down]) + ([?\C-a] . [home]) + ([?\C-e] . [end]) + ([?\C-k] . [S-end delete]) + ([?\M-w] . [C-c]) + ([?\C-y] . [C-v]) + ([?\C-v] . [next]) + ([?\C-\M-v] . [prior]) + )) + + (setq exwm-input-prefix-keys + '(?\C-x + ?\C-u + ?\C-h + ?\M-x + ?\M-` + ?\M-& + ?\M-: + ?\C-\M-j + ?\C-\ )) + + (define-key exwm-mode-map [?\C-q] 'exwm-input-send-next-key) + (exwm-input-set-key (kbd "s-p") 'counsel-linux-app) + + (setq exwm-input-global-keys + `(([?\s-R] . exwm-reset) + + + ([?\s-r] . (lambda (command) + (interactive (list (read-shell-command "$ "))) + (start-process-shell-command command nil command))) + + ([?\s-W] . exwm-workspace-move-window) + ([?\s-w] . exwm-workspace-switch) + + ,@(mapcar (lambda (i) + `(,(kbd (format "s-%d" i)) . + (lambda () + (interactive) + (exwm-workspace-switch-create ,i)))) + (number-sequence 0 9)))) + + (exwm-enable)) + +(jd/use-package desktop-environment "emacs-desktop-environment" + :after exwm + :custom + (desktop-environment-brightness-small-increment "2%+") + (desktop-environment-brightness-small-decrement "2%-") + (desktop-environment-brightness-normal-increment "5%+") + (desktop-environment-brightness-normal-decrement "5%-") + + :config + (defun jd/dunst-show-history () + (interactive) + (start-process-shell-command "dunstctl" nil "dunstctl history-pop")) + + (defun jd/dunst-close () + (interactive) + (start-process-shell-command "dunstctl" nil "dunstctl close")) + + (defun jd/dunst-close-all () + (interactive) + (start-process-shell-command "dunstctl" nil "dunstctl close-all")) + + (jd/leader-key-def + "d" '(nil :which-key "dunst") + "dh" '(jd/dunst-show-history :which-key "show history") + "dc" '(jd/dunst-close :which-key "close") + "da" '(jd/dunst-close-all :which-key "close all")) + + (desktop-environment-mode)) + +(set-frame-parameter (selected-frame) 'alpha '(90 . 90)) +(add-to-list 'default-frame-alist `(alpha . (90 . 90))) +(set-frame-parameter (selected-frame) 'fullscreen 'maximized) +(add-to-list 'default-frame-alist '(fullscreen . maximized)) + +(defun jd-exwm/get-color (ATTRIBUTE) + (face-attribute 'default ATTRIBUTE)) + +(defun theme-to-xresources () + (interactive) + (require 'term) + (with-temp-buffer + (insert "! Generated by theme-to-xresources\n") + (dolist (spec + '(("emacs.background" :background "E6") + ("emacs.foreground" :foreground ""))) + (let ((color (jd-exwm/get-color (cadr spec)))) + (insert (format "%s: #%s%s\n" + (car spec) + (caddr spec) + (string-remove-prefix "#" color)))) + jd + (write-region (point-min) (point-max) "~/.Xresources"))) + (call-process "xrdb" nil nil nil "-merge" (expand-file-name "~/.Xresources"))) + +(defun jd/theme-sync () + (interactive) + (theme-to-xresources) + (setq org-confirm-babel-evaluate nil) + (org-babel-tangle-file "~/dotfiles/Desktop.org") + (setq org-confirm-babel-evaluate 't) + (call-process "killall" nil nil nil "dunst") ;; TODO: prevent clear notification history + (jd-exwm/restart-process "polybar")) + +;; (add-hook 'jd/load-theme-hook #'jd/theme-sync) +;; (add-hook 'exwm-init-hook #'jd/theme-sync) + +(provide 'jd-exwm) + +;;; jd-exwm.el ends here + diff --git a/.emacs.d/jd/jd-gym.el b/.emacs.d/jd/jd-gym.el new file mode 100755 index 0000000..2602e3e --- /dev/null +++ b/.emacs.d/jd/jd-gym.el @@ -0,0 +1,120 @@ +;;; jd-gym.el --- Gym workout manager. +;;; Commentary: +;; It will be a gym workout manager in the future. +;;; code: + +(require 'emacsql-sqlite) + +(defconst jd-gym/db--tables-schema + '((workout-plans + [(id integer :primary-key :autoincrement) + (name text)]) + + (workouts + [(id integer :primary-key :autoincrement) + (workout-plan-id integer :not-null) + (day integer :not-null) + (month integer :not-null) + (year integer :not-null)] + (:foreign-key [workout-plan-id] :references workout-plans [id] :on-delete :cascade)) + + (muscle-part + [(id integer :primary-key :autoincrement) + (name text :not-null)]) + + (exercises + [(id integer :primary-key :autoincrement) + (name text :not-null) + (muscle-part-id integer :not-null)] + (:foreign-key [muscle-part-id] :references muscle-part [id] :on-delete :cascade)) + + (workout-plan-exercise-map + [(id integer :primary-key :autoincrement) + (week-day integer :not-null) + (workout-plan-id integer :not-null) + (exercise-id integer :not-null)] + (:foreign-key [workout-plan-id] :references workout-plans [id] :on-delete :cascade) + (:foreign-key [exercise-id] :references exercises [id] :on-delete :cascade)) + + (workout-sets + [(id integer :primary-key :autoincrement) + (reps integer :not-null) + (weight integer :not-null) + (workout-plan-exercise-map-id integer :not-null) + (comment text)] + (:foreign-key [workout-plan-exercise-map-id] :references workout-plan-exercise-map [id] :on-delete :cascade)))) + +(defconst jd-gym/db--test-data + '((workout-plans + ([nil "Push pull"])) + (workouts + ([nil 1 3 1 2023])) + (muscle-part + ([nil "glutes"] + [nil "chest"])) + (exercises + ([nil "Bench press" 2] + [nil "RDL" 1])) + (workout-plan-exercise-map + ([nil 0 1 1] ; Monday, Push pull, Bench press + [nil 1 1 2] ; Tuesday, Push pull, RDL + [nil 3 1 1] ; Thursday, Push pull, Bench press + [nil 4 1 2] ; Friday, Push pull, RDL + )) + (workout-sets + ([nil 7 70 1 "New PR!"] + [nil 8 110 2 "It was hard!"])))) + +(defun jd-gym/db--test-data-insert () + "Insert test data to jd-gym database." + (mapc (lambda (table) + (let ((table-name (car table)) + (table-data (cdr table))) + (emacsql jd-gym/db--conn [:insert :into $i1 + :values $v2] + table-name table-data))) + jd-gym/db--test-data)) + +(defvar jd-gym/db-path "~/Documents/Gym/gym.sqlite" + "Path can be relative or absolute.") + +(defvar jd-gym/db--conn nil + "Store connection to jd-gym database.") + +(defun jd-gym/db--conn-p () + "Check if jd-gym is connected to db." + (and (emacsql-sqlite-connection-p jd-gym/db--conn) + (emacsql-live-p jd-gym/db--conn))) + +(defun jd-gym/db--connect () + "Connect to db if there is no connection yet." + (unless (jd-gym/db--conn-p) + (setq jd-gym/db--conn (emacsql-sqlite jd-gym/db-path)))) + +(defun jd-gym/db--close () + "Close db connection." + (when (jd-gym/db--conn-p) + (emacsql-close jd-gym/db--conn))) + +(defun jd-gym/db--init () + "Initialize database structure." + (when (jd-gym/db--conn-p) + (emacsql jd-gym/db--conn [:pragma (= foreign_keys ON)]) + (emacsql jd-gym/db--conn "PRAGMA foreign_keys=ON") + (mapc (lambda (table) + (let ((table-name (car table)) + (table-schema (cdr table))) + (emacsql jd-gym/db--conn [:create-table $i1 $S2] table-name table-schema))) + jd-gym/db--tables-schema))) + +(defun jd-gym/db () + "Entrypoint to jd-gym db." + (unless (file-exists-p jd-gym/db-path) + (jd-gym/db--close) + (jd-gym/db--connect) ; Restart connection + (jd-gym/db--init))) + + +(provide 'jd-gym) + +;;; jd-gym.el ends here diff --git a/.emacs.d/jd/jd-keys.el b/.emacs.d/jd/jd-keys.el new file mode 100755 index 0000000..7c0d6b2 --- /dev/null +++ b/.emacs.d/jd/jd-keys.el @@ -0,0 +1,115 @@ +;;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + +;; (jd/use-package evil "emacs-evil" +;; :init +;; (setq evil-want-integration t) +;; (setq evil-want-keybinding nil) +;; (setq evil-want-C-u-scroll t) +;; (setq evil-want-Y-yank-to-eol t) +;; (setq evil-want-C-i-jump nil) +;; (setq evil-undo-system 'undo-tree) +;; (setq evil-kill-on-visual-paste nil) +;; :config +;; (evil-set-initial-state 'exwm-mode 'emacs) +;; (evil-mode 1)) + +(jd/use-package general "emacs-general" + :config + (general-create-definer jd/leader-key-def + :keymaps '(normal insert visual emacs) + :prefix "SPC" + :global-prefix "C-z") + + (general-create-definer jd/ctrl-c-keys + :prefix "C-c") + + ;; (jd/leader-key-def + ;; "w" 'evil-window-map + ;; "wr" '(hydra-resize-window/body :which-key "Rezize window") + ;; "wd" '(evil-window-delete :which-key "Window delete")) + + (jd/leader-key-def + "ou" '(undo-tree-visualize :which-key "Open")) + + ;; remove . key + ;; (define-key evil-normal-state-map (kbd ".") '()) + (jd/leader-key-def + "f" '(:ignore t :which-key "Files") + "fs" '(save-buffer :which-key "File save") + "." '(find-file :which-key "Find file") + "ff" '(find-file :which-key "Find file")) + + (jd/leader-key-def + "e" '(:ignore t :which-key "Eval") + "eb" '(eval-buffer :which-key "Eval buffer") + "ee" '(eval-defun :which-key "Eval defun")) + + (jd/leader-key-def + :keymaps '(visual) + "er" '(eval-region :which-key "Eval region")) + + (defun jd/kill-other-buffers () + (interactive) + (mapc 'kill-buffer (cdr (buffer-list (current-buffer))))) + + (jd/leader-key-def + "bK" '(jd/kill-other-buffers :which-key "Kill other buffers") + "bk" '(kill-current-buffer :which-key "Kill buffer") + "bB" '(ibuffer :which-key "Open ibuffer"))) + + +(jd/use-package hydra "emacs-hydra" + ;; :defer t + :config + (defun jd/text-scale-increase () + (interactive) + (let ((old-face-attribute (face-attribute 'default :height))) + (set-face-attribute 'default nil :height (+ old-face-attribute 10)))) + + (defun jd/text-scale-decrease () + (interactive) + (let ((old-face-attribute (face-attribute 'default :height))) + (set-face-attribute 'default nil :height (- old-face-attribute 10)))) + + ;; (defhydra hydra-resize-window (:timeout 4) + ;; ("h" evil-window-decrease-width "<") + ;; ("l" evil-window-increase-width ">") + ;; ("k" evil-window-decrease-height "^") + ;; ("j" evil-window-increase-height "v") + ;; ("q" nil "finished" :exit t)) + + (defhydra hydra-text-scale-global (:timeout 4) + "scale text" + ("j" jd/text-scale-increase "in") + ("k" jd/text-scale-decrease "out") + ("q" nil "finished" :exit t)) + + (defhydra hydra-text-scale (:timeout 4) + "scale text" + ("j" text-scale-increase "in") + ("k" text-scale-decrease "out") + ("q" nil "finished" :exit t)) + + (jd/leader-key-def + "tS" '(hydra-text-scale-global/body :which-key "Scale text") + "ts" '(hydra-text-scale/body :which-key "Scale text"))) + + +(jd/use-package undo-tree "emacs-undo-tree" + :diminish + :config + (setq undo-tree-auto-save-history nil) + (global-undo-tree-mode 1)) + +;; (jd/use-package evil-collection "emacs-evil-collection" +;; :after evil +;; :config +;; (evil-collection-init)) + + +(provide 'jd-keys) + +;;; jd-keys.el ends here diff --git a/.emacs.d/jd/jd-mu4e.el b/.emacs.d/jd/jd-mu4e.el new file mode 100755 index 0000000..e97c4fc --- /dev/null +++ b/.emacs.d/jd/jd-mu4e.el @@ -0,0 +1,79 @@ +(when (not jd/guix-p) + (add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e")) + +(jd/use-package htmlize "emacs-htmlize") + +; (jd/add-package-to-manifest "mbsync") ;; TODO: Define guix mbsync package? + +(jd/use-package mu4e "mu" + :defer 10 + :ensure nil + :config + (require 'org-mu4e) + + (setq mu4e-mu-binary "/usr/local/bin/mu") + (setq mu4e-update-interval (* 10 60)) + (setq mu4e-get-mail-command "mbsync -a") + (setq mu4e-maildir "~/Mail") + + (setq mu4e-completing-read-function #'ivy-completing-read) + + (setq mu4e-change-filenames-when-moving t) + + (setq mu4e-contexts + `(,(make-mu4e-context + :name "Abaks" + :match-func (lambda (msg) (when msg + (string-prefix-p "/abaks" (mu4e-message-field msg :maildir)))) + :vars '( + (user-full-name . "Jakub Dlugosz") + (user-mail-address . "jakub@abaks.pl") + (mu4e-sent-folder . "/abaks/Sent Items") + (mu4e-trash-folder . "/abaks/Trash") + (mu4e-drafts-folder . "/abaks/Drafts") + (mu4e-refile-folder . "/abaks/Archive") + (smtpmail-local-domain . "pl") + (smtpmail-smtp-server . "smtp.abaks.pl") + (mu4e-sent-messages-behavior . sent) + )) + ,(make-mu4e-context + :name "Gmail" + :match-func (lambda (msg) (when msg + (string-prefix-p "/gmail" (mu4e-message-field msg :maildir)))) + :vars '( + (user-full-name . "Jakub Dlugosz") + (user-mail-address . "jdlugosz963@gmail.com") + (mu4e-sent-folder . "/gmail/\[Gmail\]/Wys\&AUI-ane") + (mu4e-trash-folder . "/gmail/\[Gmail\]/Kosz") + (mu4e-drafts-folder . "/gmail/\[Gmail\]/Wersje\ robocze") + (mu4e-refile-folder . "/gmail/Archive") + (smtpmail-local-domain . "com") + (smtpmail-smtp-server . "smtp.gmail.com") + (mu4e-sent-messages-behavior . sent) + )))) + + (setq mail-user-agent 'mu4e-user-agent + mail-host-address nil + message-send-mail-function 'smtpmail-send-it + smtpmail-smtp-service 465 + smtpmail-stream-type 'ssl) + + (setq mu4e-compose-signature (concat + "Pozdrawiam,\n" + "Jakub Długosz")) + + (mu4e t)) + +(jd/use-package mu4e-alert "emacs-mu4e-alert" + :defer 20 + :config + (mu4e-alert-set-default-style 'libnotify) + (mu4e-alert-enable-mode-line-display) + (mu4e-alert-enable-notifications) + + (jd/leader-key-def + "m" '(:ignore t :which-key "mail") + "mm" 'mu4e + "mc" 'mu4e-compose-new)) + +(provide 'jd-mu4e) diff --git a/.emacs.d/jd/jd-org.el b/.emacs.d/jd/jd-org.el new file mode 100755 index 0000000..cd05d72 --- /dev/null +++ b/.emacs.d/jd/jd-org.el @@ -0,0 +1,198 @@ +;;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + +(defvar jd/org-home "~/Documents/Org") +(defvar jd/org-roam-home (concat jd/org-home "/roam")) +(defvar jd/org-roam-daily-home (concat jd/org-home "/roam/daily")) + +(defun jd/org-mode-init () + (org-indent-mode) + (variable-pitch-mode 1) + (visual-line-mode 1)) + +(defun jd-emacs/org-insert-date (&optional date) + (let ((d (or date "+0d"))) + (org-insert-time-stamp (org-read-date nil t d)))) + +(jd/use-package org "emacs-org" + :pin org + :commands (org-capture org-agenda) + :hook (org-mode . jd/org-mode-init) + :config + (setq org-directory (file-truename "~/Documents/Org/")) + (setq org-mobile-inbox-for-pull (concat org-directory "flagged.org")) + (setq org-mobile-directory "~/Dropbox/Apps/MobileOrg") + (setq org-agenda-files + '("Tasks.org")) + (setq org-ellipsis " ▾") + (setq org-agenda-start-with-log-mode t) + (setq org-log-done 'time) + (setq org-log-into-drawer t) + (setq org-return-follows-link t) + (setq org-capture-templates + `(("t" "Tasks / Projects") + ("tt" "Task" entry (file+olp "Tasks.org" "Inbox") + "* TODO %?\n %t\n %a\n %i" :empty-lines 1) + ("tT" "Task for tomorow" entry (file+olp "Tasks.org" "Inbox") + "* TODO %?\n %t\n SCHEDULED: %(jd-emacs/org-insert-date \"+1d\")>\n %a\n %i" :empty-lines 1) + + ("m" "Metrics Capture") + ("mm" "Metrics" table-line (file+headline "Metrics.org" "Metrics") + "| %U | %^{Weight} | %^{Waist} | %^{Notes} |" :kill-buffer t) + ("sh" "School Homework" entry (file+olp "school/todo(jd-emacs/org-insert-date \"1\").org")))) + + (setq org-latex-listings 'minted + org-latex-packages-alist '(("" "minted")) + org-latex-pdf-process + '("pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f" + "pdflatex -shell-escape -interaction nonstopmode -output-directory %o %f")) + (require 'org-tempo) + + (jd/leader-key-def + "o" '(:ignore t :which-key "Open/Org") + "oc" '(org-capture :which-key "Open org-capture") + "oop" '(org-mobile-pull :which-key "Org mobile pull") + "ooP" '(org-mobile-push :which-key "Org mobile push") + "oa" '(org-agenda :which-key "Open org-agenda")) + + (defun jd/org-font-setup () + ;; Replace list hyphen with dot + (font-lock-add-keywords 'org-mode + '(("^ *\\([-]\\) " + (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•-")))))) + + ;; Set faces for heading levels + (dolist (face '((org-level-1 . 1.3) + (org-level-2 . 1.2) + (org-level-3 . 1.1) + (org-level-4 . 1.0) + (org-level-5 . 1.0) + (org-level-6 . 1.0) + (org-level-7 . 1.0) + (org-level-8 . 1.0))) + (set-face-attribute (car face) nil :font "Terminus" :weight 'Bold :height (cdr face))) + + ;; Ensure that anything that should be fixed-pitch in Org files appears that way + (set-face-attribute 'org-block nil :font "Terminus" :inherit 'fixed-pitch :height 100) + (set-face-attribute 'org-table nil :inherit 'fixed-pitch) + (set-face-attribute 'org-formula nil :inherit 'fixed-pitch) + (set-face-attribute 'org-code nil :inherit '(shadow fixed-pitch)) + (set-face-attribute 'org-table nil :font "Terminus" :inherit '(shadow fixed-pitch)) + (set-face-attribute 'org-verbatim nil :inherit '(shadow fixed-pitch)) + (set-face-attribute 'org-special-keyword nil :inherit '(font-lock-comment-face fixed-pitch)) + (set-face-attribute 'org-meta-line nil :inherit '(font-lock-comment-face fixed-pitch)) + (set-face-attribute 'org-checkbox nil :inherit 'fixed-pitch) + (set-face-attribute 'line-number nil :inherit 'fixed-pitch) + (set-face-attribute 'line-number-current-line nil :inherit 'fixed-pitch)) + + (with-eval-after-load 'org (jd/org-font-setup)) + + (defun jd-emacs/org-timer-stop () + (start-process-shell-command "notify-send" nil "notify-send Zakonczono odliczanie")) + + + (add-hook 'org-timer-stop-hook #'jd-emacs/org-timer-stop) + + (defun jd/org-tempo-setup () + (add-to-list 'org-structure-template-alist '("s" . "src")) + (add-to-list 'org-structure-template-alist '("sql" . "src sql")) + (add-to-list 'org-structure-template-alist '("sh" . "src sh")) + (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp")) + (add-to-list 'org-structure-template-alist '("li" . "src lisp")) + (add-to-list 'org-structure-template-alist '("sc" . "src scheme")) + (add-to-list 'org-structure-template-alist '("ts" . "src typescript")) + (add-to-list 'org-structure-template-alist '("py" . "src python")) + (add-to-list 'org-structure-template-alist '("go" . "src go")) + (add-to-list 'org-structure-template-alist '("yaml" . "src yaml"))) + + (with-eval-after-load 'org-tempo (jd/org-tempo-setup)) + + (org-babel-do-load-languages + 'org-babel-load-languages + '((emacs-lisp . t) + (python . t))) + + (defun jd/org-babel-tangle-config () + (when (string-equal (file-name-directory (buffer-file-name)) + (expand-file-name "~/dotfiles/")) + ;; 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 #'jd/org-babel-tangle-config))) + + (defun jd/org-mode-visual-fill () + (setq visual-fill-column-width 100 + visual-fill-column-center-text t) + (visual-fill-column-mode 1))) + +;; (jd/use-package evil-org "emacs-evil-org" +;; :after org +;; :hook (org-mode . (lambda () evil-org-mode)) +;; :config +;; (require 'evil-org-agenda) +;; (evil-org-agenda-set-keys)) + +(jd/use-package visual-fill-column "emacs-visual-fill-column" + :hook (org-mode . jd/org-mode-visual-fill)) + +(jd/use-package org-superstar "emacs-org-superstar" + :hook (org-mode . org-superstar-mode) + :init + (setq org-superstar-special-todo-items t) + (setq org-superstar-remove-leading-stars t) + (setq org-superstar-headline-bullets-list '("◉" "○" "●" "○" "●" "○" "●"))) + +; (jd/add-package-to-manifest "emacs-emacsql-sqlite3") +(jd/use-package org-roam "emacs-org-roam" + :custom + (org-roam-directory (file-truename jd/org-roam-home)) + :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)) + :bind-keymap + ("C-c n d" . org-roam-dailies-map) + :config + (defun jd/org-roam-filter-by-tag (tag-name) + (lambda (node) + (member tag-name (org-roam-node-tags node)))) + + (defun jd/org-roam-list-notes-by-tag (tag-name) + (mapcar #'org-roam-node-file + (seq-filter + (jd/org-roam-filter-by-tag tag-name) + (org-roam-node-list)))) + + (defun jd/org-roam-refreshagenda-list () + (interactive) + (setq org-agenda-files (org-roam-list-files))) + + (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag))) + (setq org-roam-capture-templates + '(("a" "workstuff" plain (file (concat org-roam-directory "/work")) + :target (file+head "work/%<%Y%m%d%H%M%S>-${slug}.org" + "#+title: ${title}\n") :unnarrowed t) + ("b" "research" plain (file "~/Documents/roam/study/templates/research.org") + :target (file+head "study/%<%Y%m%d%H%M%S>-${slug}.org" + "#+title: ${title}\n") :unnarrowed t) + ("s" "School" plain nil + :target (file+head + "school/%<%Y%m%d%H%M%S>-${slug}.org" + "#+title: ${title}\n") + :unnarrowed t) + ("d" "default" plain nil + :target (file+head "%<%Y%m%d%H%M%S>-${slug}.org" + "#+title: ${title}\n") :unnarrowed t) + )) + + (org-roam-db-autosync-mode)) + +(provide 'jd-org) + +;;; jd-org.el ends here diff --git a/.emacs.d/jd/jd-ui.el b/.emacs.d/jd/jd-ui.el new file mode 100755 index 0000000..4c8e04b --- /dev/null +++ b/.emacs.d/jd/jd-ui.el @@ -0,0 +1,102 @@ + +;; Dotfiles --- Jakub Dlugosz emacs config +;;; Commentary: + +;;; Code: + +(setq inhibit-startup-message t) +(setq visible-bell t) +(scroll-bar-mode -1) +(tool-bar-mode -1) +(tooltip-mode -1) +(menu-bar-mode -1) +(set-fringe-mode 10) + +(set-face-attribute 'default nil :font "Terminus" :height 100) + +(add-hook 'prog-mode-hook 'menu-bar--display-line-numbers-mode-relative) + +(global-set-key (kbd "") 'keyboard-escape-quit) + +(global-prettify-symbols-mode 1) + +(defalias 'yes-or-no-p 'y-or-n-p) + +(jd/use-package doom-themes "emacs-doom-themes" + :config + ;; (load-theme 'manoj-black t) + ) + +(load-theme 'manoj-dark t) + +(jd/use-package diminish "emacs-diminish") + +(jd/use-package hl-todo "emacs-hl-todo" + :init + (setq hl-todo-keyword-faces + '(("TODO" . "#FF0000") + ("FIXME" . "#FF0000") + ("DEBUG" . "#A020F0"))) + :config + (global-hl-todo-mode 1)) + +(defun jd/switch-buffer () + (interactive) + (let ((completion-regexp-list '("\\`[^*]" + "\\`\\([^T]\\|T\\($\\|[^A]\\|A\\($\\|[^G]\\|G\\($\\|[^S]\\|S.\\)\\)\\)\\).*"))) + (call-interactively 'counsel-switch-buffer))) + +(defvar jd/load-theme-hook nil) +(defun jd/load-theme () + (interactive) + (counsel-load-theme) + (run-hooks 'jd/load-theme-hook)) + +(jd/use-package ivy "emacs-ivy" + :diminish + :bind + (("C-s" . swiper) + ;; :map ivy-minibuffer-map + ;; ("C-k" . ivy-previous-line) + ;; ("C-j" . ivy-next-line) + ;; :map ivy-switch-buffer-map + ;; ("C-k" . ivy-previous-line) + ) + :config + (ivy-mode 1)) + +(jd/use-package counsel "emacs-counsel" + :config + (counsel-mode 1) + + (jd/leader-key-def + "t" '(:ignore t :which-key "Toggle") + "tT" '(toggle-truncate-lines :which-key "Toggle truncate lines") + "tt" '(jd/load-theme :which-key "Choose theme")) + + (jd/leader-key-def + "bb" '(jd/switch-buffer :which-key "Buffer switch") + "ba" '(counsel-switch-buffer :which-key "Buffer switch") + "b" '(:ignore t :which-key "Buffer") + "," '(counsel-switch-buffer :which-key "Buffer switch"))) + +(jd/use-package which-key "emacs-which-key" + :diminish + :config + (which-key-mode) + (setq which-key-idle-delay 0.3)) + +(jd/use-package all-the-icons "emacs-all-the-icons") + +(jd/use-package doom-modeline "emacs-doom-modeline" + ; :init (doom-modeline-mode 0) + :custom ((doom-modeline-height 15))) + +(jd/use-package beacon "emacs-beacon" + :config + (beacon-mode 1)) + + +(provide 'jd-ui) + +;;; jd-ui.el ends here -- cgit v1.2.3