diff options
author | Aryadev Chavali <aryadev@aryadevchavali.com> | 2024-06-23 21:34:32 +0100 |
---|---|---|
committer | Aryadev Chavali <aryadev@aryadevchavali.com> | 2024-06-23 21:35:00 +0100 |
commit | 0beb166d473584fa4d3877267b58253e8f87ef6b (patch) | |
tree | 325e6c05e88bb7aa10a0ec3081da857685add7e3 /Emacs | |
parent | be2bb62baffe6cdaed7e4470505641afaee62a79 (diff) | |
download | dotfiles-0beb166d473584fa4d3877267b58253e8f87ef6b.tar.gz dotfiles-0beb166d473584fa4d3877267b58253e8f87ef6b.tar.bz2 dotfiles-0beb166d473584fa4d3877267b58253e8f87ef6b.zip |
(Emacs|SXHkD)~Some small fixes
Diffstat (limited to 'Emacs')
-rw-r--r-- | Emacs/.config/emacs/config.org | 6 | ||||
-rw-r--r-- | Emacs/.config/emacs/early-init.el | 10 | ||||
-rw-r--r-- | Emacs/.config/emacs/init.el | 107 |
3 files changed, 63 insertions, 60 deletions
diff --git a/Emacs/.config/emacs/config.org b/Emacs/.config/emacs/config.org index ad42f8b..d550aac 100644 --- a/Emacs/.config/emacs/config.org +++ b/Emacs/.config/emacs/config.org @@ -33,7 +33,7 @@ code: ;; and when the configuration is compiled again. ;; To propagate edits from this file to the literate document, call -;; (org-babel-detangle) while in the file. +;; (org-babel-detangle). ;;; Code: #+end_src @@ -559,7 +559,9 @@ Setup the evil package, with some opinionated keybindings: "M-y" #'yank-pop "T" nil) - (nmmap + (general-def + :keymaps 'override + :states '(normal motion visual) :infix "T" "w" #'transpose-words "c" #'transpose-chars diff --git a/Emacs/.config/emacs/early-init.el b/Emacs/.config/emacs/early-init.el index 6992846..af45062 100644 --- a/Emacs/.config/emacs/early-init.el +++ b/Emacs/.config/emacs/early-init.el @@ -1,4 +1,4 @@ -;;; early-init.el --- My custom early-init.el -*- lexical-binding: t; -*- +;;; early-init.el --- What Emacs loads before init.el -*- lexical-binding: t; -*- ;; Copyright (C) 2022 Aryadev Chavali @@ -19,7 +19,7 @@ ;;; Commentary: ;; Sets up some variables and graphical configuration to make Emacs -;; less janky looking while loading +;; less janky looking while loading. ;;; Code: (setq gc-cons-threshold most-positive-fixnum @@ -31,6 +31,10 @@ native-comp-always-compile nil native-comp-async-report-warnings-errors 'silent) +;; don't use x resources lol +(advice-add #'x-apply-session-resources :override #'ignore) +;; turn off the menu bar, tool bar, scroll bar, fringes +;; also set the transparency (active inactive) (setq-default default-frame-alist '((menu-bar-lines . 0) (tool-bar-lines . 0) @@ -39,5 +43,3 @@ (right-fringe . 0) (alpha . (90 80)))) (scroll-bar-mode -1) - -(advice-add #'x-apply-session-resources :override #'ignore) diff --git a/Emacs/.config/emacs/init.el b/Emacs/.config/emacs/init.el index eb1c3ac..828402f 100644 --- a/Emacs/.config/emacs/init.el +++ b/Emacs/.config/emacs/init.el @@ -24,70 +24,69 @@ ;; Before doing anything else, make gc-cons-threshold ridiculously ;; high. This makes it so we have as few pauses during init as ;; possible. -(let ((gc-cons-threshold most-positive-fixnum)) - ;; Straight - (setq straight-disable-native-compile nil - straight-use-package-by-default nil - straight-check-for-modifications 'live) - - (defvar bootstrap-version) - (let ((bootstrap-file - (expand-file-name - "straight/repos/straight.el/bootstrap.el" - (or (bound-and-true-p straight-base-dir) - user-emacs-directory))) - (bootstrap-version 7)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage)) - - (setq use-package-enable-imenu-support t - use-package-always-demand nil - use-package-always-defer nil - use-package-hook-name-suffix nil - use-package-compute-statistics t) - - (straight-use-package 'use-package) - (straight-use-package 'org) - (straight-use-package 'no-littering) - - (setq no-littering-etc-directory (expand-file-name ".config/" user-emacs-directory) - no-littering-var-directory (expand-file-name ".local/" user-emacs-directory) - custom-file (no-littering-expand-etc-file-name "custom.el")) - - (load-file custom-file) +;; Straight +(setq straight-disable-native-compile nil + straight-use-package-by-default nil + straight-check-for-modifications 'live) + +(defvar bootstrap-version) +(let ((bootstrap-file + (expand-file-name + "straight/repos/straight.el/bootstrap.el" + (or (bound-and-true-p straight-base-dir) + user-emacs-directory))) + (bootstrap-version 7)) + (unless (file-exists-p bootstrap-file) + (with-current-buffer + (url-retrieve-synchronously + "https://raw.githubusercontent.com/radian-software/straight.el/develop/install.el" + 'silent 'inhibit-cookies) + (goto-char (point-max)) + (eval-print-last-sexp))) + (load bootstrap-file nil 'nomessage)) + +(setq use-package-enable-imenu-support t + use-package-always-demand nil + use-package-always-defer nil + use-package-hook-name-suffix nil + use-package-compute-statistics t) + +(straight-use-package 'use-package) +(straight-use-package 'org) +(straight-use-package 'no-littering) + +(setq no-littering-etc-directory (expand-file-name ".config/" user-emacs-directory) + no-littering-var-directory (expand-file-name ".local/" user-emacs-directory) + custom-file (no-littering-expand-etc-file-name "custom.el")) + +(load-file custom-file) ;;; Load literate - (load-file (concat user-emacs-directory "elisp/literate.el")) +(load-file (concat user-emacs-directory "elisp/literate.el")) - ;; Compile on Emacs quit - (add-hook - 'kill-emacs-hook - #'+literate/compile-config) +;; Compile on Emacs quit +(add-hook + 'kill-emacs-hook + #'+literate/compile-config) - (+literate/load-config) +(+literate/load-config) - (when (daemonp) - (require 'general) - (require 'evil) - (require 'ivy) - (require 'counsel) - (require 'notmuch) - (require 'company) - (require 'org) - (require 'eglot))) +(when (daemonp) + (require 'general) + (require 'evil) + (require 'ivy) + (require 'counsel) + (require 'notmuch) + (require 'company) + (require 'org) + (require 'eglot)) (setq gc-cons-threshold (* 100 1024 1024) ; ~100MiB - read-process-output-max 5242880 ; ~5MiB + read-process-output-max (* 5 1024 1024) ; ~5MiB ;; FIXME: Problem with memory-report after running Emacs for a ;; bit, causes a Lisp nesting error, so I just set it up really ;; high so it doesn't reach that. - max-lisp-eval-depth 5000) + max-lisp-eval-depth 999999) (provide 'init) ;;; init.el ends here |