diff --git a/.gitignore b/.gitignore index 4bef897..aaff588 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ emacs.desktop /url/ /undo-fu-session/ /..emacs.d-tabspaces-session.el +/easysession \ No newline at end of file diff --git a/early-init.el b/early-init.el index 0fa62de..38b2c2c 100644 --- a/early-init.el +++ b/early-init.el @@ -41,6 +41,6 @@ ;; (push '(ns-appearance . light) default-frame-alist)) ;; Prevent flash of unstyled mode line -;; (setq mode-line-format nil) +(setq mode-line-format nil) (provide 'early-init) diff --git a/init.el b/init.el index 8199b29..761f305 100644 --- a/init.el +++ b/init.el @@ -12,17 +12,11 @@ (require 'init-utils) (require 'init-completion) (require 'init-input) - -;; (require 'init-meow) - (require 'init-edit) (require 'init-window) (require 'init-bindings) -;; (require 'init-dashboard) - -(require 'init-workspace) (require 'init-dired) (require 'init-llm) @@ -42,6 +36,8 @@ (require 'init-rust) (require 'init-ocaml) +(require 'init-workspace) + (provide 'init) ;;; Code: ;;; alskdjasd diff --git a/lisp/init-org.el b/lisp/init-org.el index 63ebb28..3e6b70f 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -6,7 +6,6 @@ ;; "* TODO %?\n%i\n%a" :prepend t)))) (use-package org - :defer :ensure (org :repo "https://code.tecosaur.net/tec/org-mode.git/" :branch "dev") :hook (org-mode . org-cdlatex-mode) @@ -82,7 +81,7 @@ the element after the #+HEADER: tag." (when mod (insert mod) (forward-line)) (when text (insert text)))) - + ;; (org-capture-init) (add-to-list 'org-modules 'org-habit) (setq org-directory "~/org/") @@ -119,6 +118,7 @@ the element after the #+HEADER: tag." (setq org-highlight-latex-and-related '(native script entities))) (use-package org-modern + :after org :hook (org-mode . org-modern-mode) :hook (org-agenda-finalize . org-modern-agenda) :init @@ -261,7 +261,6 @@ the element after the #+HEADER: tag." (use-package org-roam :ensure t - :defer :custom (org-roam-directory (file-truename "~/org/roam")) :bind (("C-c n l" . org-roam-buffer-toggle) diff --git a/lisp/init-tex.el b/lisp/init-tex.el index e4199fe..403ff3e 100644 --- a/lisp/init-tex.el +++ b/lisp/init-tex.el @@ -9,7 +9,8 @@ :hook (LaTeX-mode . visual-line-mode) :hook (LaTeX-mode . turn-on-reftex) :bind (:map LaTeX-mode-map - ("C-S-e" . latex-math-from-calc)) + ("C-S-e" . latex-math-from-calc) + ("C-c x" . TeX-clean)) :custom (TeX-auto-save t) (TeX-parse-self t) diff --git a/lisp/init-ui.el b/lisp/init-ui.el index 1d757d2..3562d9d 100644 --- a/lisp/init-ui.el +++ b/lisp/init-ui.el @@ -4,6 +4,16 @@ ;; (setq-default line-height 0.16) ;; (setq-local default-text-properties '(line-spacing 0.1 line-height 1.1)) + + +;; Suppress GUI features +(setq use-file-dialog nil + use-dialog-box nil + inhibit-startup-screen t + inhibit-startup-echo-area-message user-login-name + inhibit-default-init t + initial-scratch-message nil) + (setq-default cursor-in-non-selected-windows nil) (setq highlight-nonselected-windows nil) @@ -21,7 +31,7 @@ (use-package standard-themes :demand t :config - (modus-themes-load-theme 'standard-wombat)) + (modus-themes-load-theme 'standard-light)) ;; (use-package doric-themes ;; :demand t @@ -68,7 +78,9 @@ (setq doom-modeline-support-imenu t doom-modeline-height 30 doom-modeline-buffer-file-name-style 'buffer-name - doom-modeline-enable-word-count t)) + doom-modeline-enable-word-count t + doom-modeline-project-detection 'projectile + doom-modeline-project-name t)) (use-package hide-mode-line :autoload turn-off-hide-mode-line-mode @@ -78,14 +90,6 @@ embark-collect-mode lsp-ui-imenu-mode pdf-annot-list-mode) . turn-on-hide-mode-line-mode))) -;; Suppress GUI features -(setq use-file-dialog nil - use-dialog-box nil - inhibit-startup-screen t - inhibit-startup-echo-area-message user-login-name - inhibit-default-init t - initial-scratch-message nil) - (unless (daemonp) (advice-add #'display-startup-echo-area-message :override #'ignore)) @@ -102,7 +106,7 @@ (set-face-attribute 'fixed-pitch nil :font "Sarasa Term SC-22") (add-to-list 'default-frame-alist '(height . 53)) - (add-to-list 'default-frame-alist '(width . 120))) + (add-to-list 'default-frame-alist '(width . 90))) ('gnu/linux ; Linux (including Debian) (set-face-attribute 'variable-pitch nil :font "Sarasa Mono TC Nerd Font-14") ; 20 * 1.5 @@ -110,10 +114,12 @@ (add-to-list 'default-frame-alist '(width . 90)))) (use-package mixed-pitch + :diminish :hook org-mode :hook LaTeX-mode) (use-package diff-hl + :diminish :hook (elpaca-after-init global-diff-hl-mode) :hook (elpaca-after-init diff-hl-dired-mode) :hook (elpaca-after-init diff-hl-flydiff-mode)) @@ -157,6 +163,8 @@ :diminish :hook elpaca-after-init) -(use-package spacious-padding) +(use-package spacious-padding + :diminish + :hook elpaca-after-init) (provide 'init-ui) diff --git a/lisp/init-workspace.el b/lisp/init-workspace.el index ea001ef..e407ee4 100644 --- a/lisp/init-workspace.el +++ b/lisp/init-workspace.el @@ -12,30 +12,40 @@ (global-set-key (kbd "C-x C-b") #'ibuffer) -(use-package beframe - :hook elpaca-after-init - :bind (("C-x b" . beframe-switch-buffer) - ("C-x C-b" . beframe-buffer-menu) - ("C-x f" . other-frame-prefix)) - :config - (define-key global-map (kbd "C-c b") #'beframe-prefix-map)) +;; (use-package beframe +;; :hook elpaca-after-init +;; :bind (("C-x b" . beframe-switch-buffer) +;; ("C-x C-b" . beframe-buffer-menu) +;; ("C-x f" . other-frame-prefix)) +;; :config +;; (define-key global-map (kbd "C-c b") #'beframe-prefix-map)) -(use-package desktop - :ensure nil - :demand t - :init - (setq desktop-dirname (expand-file-name user-emacs-directory) - desktop-path (list desktop-dirname) - desktop-save t - desktop-files-not-to-save "^$" ;reload tramp paths - desktop-load-locked-desktop nil - desktop-restore-eager 4) - :config - (desktop-save-mode 1)) (use-package eyebrowse :hook elpaca-after-init :custom (eyebrowse-new-workspace t)) +;; (use-package desktop +;; :ensure nil +;; :demand t +;; :init +;; (setq desktop-dirname (expand-file-name user-emacs-directory) +;; desktop-path (list desktop-dirname) +;; desktop-save t +;; desktop-files-not-to-save "^$" ;reload tramp paths +;; desktop-load-locked-desktop nil +;; desktop-restore-eager 4) +;; :config +;; (desktop-save-mode 1)) + +(use-package easysession + :demand t + :custom + (easysession-switch-to-save-session t) + (easysession-switch-to-exclude-current nil) + :config + (setq easysession-setup-load-session t) + (easysession-setup)) + (provide 'init-workspace)