diff --git a/.config/emacs/.gitignore b/.config/emacs/.gitignore deleted file mode 100644 index d054492..0000000 --- a/.config/emacs/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -eln-cache -.cask -elpa -auto-save-list diff --git a/.config/emacs/CHANGELOG.md b/.config/emacs/CHANGELOG.md deleted file mode 100644 index 4ef510f..0000000 --- a/.config/emacs/CHANGELOG.md +++ /dev/null @@ -1,43 +0,0 @@ -# Unreleased - -- Add support for early-init.el -- Change installation from `~/.emacs` to `~/.emacs.d` -- Allow .emacs-profiles and .emacs-profile to be stored in $XDG\_CONFIG\_HOME/chemacs -- Allow loading a literal profile from the cli (e.g. `emacs --with-profile '((user-emacs-directory . "/path/to/config"))'` works) - -# 1.0 (2020-10-01 / 4dad0684) - -- Only load `custom-file` when it is different from `init-file` (prevent double loading of `init-file`) -- Fixes to the install script for OS X -- Documentation fixes -- Introduce `chemacs-version` variable -- start keeping a CHANGELOG - -# 0.6 (2020-02-23 / 71e30878) - -- NixOS support in installation script -- Add Powershell installation script - -# 0.5 (2020-01-14 / 4c279476) - -- First class support for straight.el -- Documentation fixes - -# 0.4 (2018-10-01 / 68382d50) - -- Support GNU style `--with-profile=profilename` (so with equal sign) - -# 0.3 (2018-09-30 / 1140501d) - -- Allow selection of default profile using `~/.emacs-profile` - -# 0.2 (2018-06-06 / 1f5601a9) - -- Add installer script -- Improve documentation -- Improve support for older Emacsen -- Document how to use with Doom - -# 0.1 (2018-05-18 / 8500636a) - -- Initial release diff --git a/.config/emacs/README.org b/.config/emacs/README.org deleted file mode 100644 index 72a02b3..0000000 --- a/.config/emacs/README.org +++ /dev/null @@ -1,276 +0,0 @@ -#+BEGIN_SRC - ___ ___ ___ ___ ___ ___ ___ - / /\ /__/\ / /\ /__/\ / /\ / /\ / /\ - / /:/ \ \:\ / /:/_ | |::\ / /::\ / /:/ / /:/_ - / /:/ \__\:\ / /:/ /\ | |:|:\ / /:/\:\ / /:/ / /:/ /\ - / /:/ ___ ___ / /::\ / /:/ /:/_ __|__|:|\:\ / /:/~/::\ / /:/ ___ / /:/ /::\ - /__/:/ / /\ /__/\ /:/\:\ /__/:/ /:/ /\ /__/::::| \:\ /__/:/ /:/\:\ /__/:/ / /\ /__/:/ /:/\:\ - \ \:\ / /:/ \ \:\/:/__\/ \ \:\/:/ /:/ \ \:\~~\__\/ \ \:\/:/__\/ \ \:\ / /:/ \ \:\/:/~/:/ - \ \:\ /:/ \ \::/ \ \::/ /:/ \ \:\ \ \::/ \ \:\ /:/ \ \2.0 /:/ - \ \:\/:/ \ \:\ \ \:\/:/ \ \:\ \ \:\ \ \:\/:/ \__\/ /:/ - \ \::/ \ \:\ \ \::/ \ \:\ \ \:\ \ \::/ /__/:/ - \__\/ \__\/ \__\/ \__\/ \__\/ \__\/ \__\/ - - 222222222222222 - 2:::::::::::::::22 - 2::::::222222:::::2 - 2222222 2:::::2 - 2:::::2 - 2:::::2 - 2222::::2 - 22222::::::22 - 22::::::::222 - 2:::::22222 - 2:::::2 - 2:::::2 - 2:::::2 222222 - 2::::::2222222:::::2 - 2::::::::::::::::::2 - 22222222222222222222 - -#+END_SRC - -* Chemacs - -Chemacs 2 is an Emacs profile switcher, it makes it easy to run multiple Emacs -configurations side by side. - -Think of it as a bootloader for Emacs. - -** Differences from Chemacs 1 - -Emacs intialization used to have a single entry point, either =~/.emacs= or -=~/.emacs.d/init.el=. More recent Emacsen have introduced a second startup -script, =~/.emacs.d/early-init.el=, which runs earlier in the boot process, and -can be used for things that should happen very early on, like tweaking the GC, -or disabling UI elements. - -Chemacs 2 supports =early-init.el=, Chemacs 1 does not. This does also imply -that Chemacs 2 needs to be installed as =~/.emacs.d= (a directory), rather than -simply linking it to =~/.emacs= (a single file). - -** Rationale - -Emacs configuration is either kept in a =~/.emacs= file or, more commonly, in a -=~/.emacs.d= directory. These paths are hard-coded. If you want to try out -someone else's configuration, or run different distributions like Prelude or -Spacemacs, then you either need to swap out =~/.emacs.d=, or run Emacs with a -different =$HOME= directory set. - -This last approach is quite common, but has some real drawbacks, since now -packages will no longer know where your actual home directory is. - -All of these makes trying out different Emacs configurations and distributions -needlessly cumbersome. - -Various approaches to solving this have been floated over the years. There's an -Emacs patch around that adds an extra command line option, and various examples -of how to add a command line option in userspace from Emacs Lisp. - -Chemacs tries to implement this idea in a user-friendly way, taking care of the -various edge cases and use cases that come up. - -** Installation - -Clone the Chemacs 2 repository as =$HOME/.emacs.d=. Note that if you already -have an Emacs setup in =~/.emacs.d= you need to move it out of the way first. If -you have an =~/.emacs= startup script then move that out of the way as well. - -#+BEGIN_SRC shell - [ -f ~/.emacs ] && mv ~/.emacs ~/.emacs.bak - [ -d ~/.emacs.d ] && mv ~/.emacs.d ~/.emacs.default - git clone https://github.com/plexus/chemacs2.git ~/.emacs.d -#+END_SRC - -Note that this is different from Chemacs 1. Before Chemacs installed itself as -=~/.emacs= and you could have your own default setup in =~/.emacs.d=. This -approach no longer works because of =~/.emacs.d/early-init.el=, so Chemacs 2 -needs to be installed as =~/.emacs.d=. - -Next you will need to create a =~/.emacs-profiles.el= file, for details see -below. - -#+begin_src emacs-lisp - (("default" . ((user-emacs-directory . "~/.emacs.default")))) -#+end_src - -** Usage - -Chemacs adds an extra command line option to Emacs, =--with-profile=. Profiles -are configured in =~/.emacs-profiles.el=. - -If no profile is given at the command line then the environment variable -CHEMACS_PROFILE is used. If this environment variables isn't set then the -=default= profile is used. - -#+BEGIN_SRC shell -$ emacs --with-profile my-profile -#+END_SRC - -There is an option for using profile that is not preconfigured in =~/.emacs-profiles.el=. To accomplish that you can directly provide the profile via the command line, like so -#+BEGIN_SRC shell -$ emacs --with-profile '((user-emacs-directory . "/path/to/config"))' -#+END_SRC -This method supports all the profile options given below. - -** .emacs-profiles.el - -This file contains an association list, with the keys/cars being the profile -names, and the values/cdrs their configuration. - -The main thing to configure is the =user-emacs-directory= - -#+BEGIN_SRC emacs-lisp - (("default" . ((user-emacs-directory . "~/.emacs.default"))) - ("spacemacs" . ((user-emacs-directory . "~/spacemacs")))) -#+END_SRC - -Chemacs will set this to be the =user-emacs-directory= in use, and load -=init.el= from that directory. - -Other things you can configure - -- =custom-file= : The file where Customize stores its customizations. If this - isn't configured, and the =custom-file= variable is still unset after loading - the profile's =init.el=, then this will get set to the profile's =init.el= -- =server-name= : Sets the =server-name= variable, so you can distinguish multiple - instances with =emacsclient -s =. -- =env= An association list of environment variables. These will get set before - loading the profile, so they can influence the initialization, and they are - visible to any subprocesses spawned from Emacs. -- =straight-p= Enable the [[https://github.com/raxod502/straight.el][Straight]] - functional package manager. - -Store =.emacs-profiles.el= together with your dotfiles. If you're not yet keeping -a version controlled directory of dotfiles, then check out -[[https://github.com/plexus/dotfiles/blob/master/connect-the-dots][connect-the-dots]] -for a helpful script to do that. - -** Changing the default profile (e.g. for GUI editors) - -Where it is not possible to use the =--with-profile= flag or the CHEMACS_PROFILE -environment variable, the default profile can be set using a =~/.emacs-profile= -file. - -If your =~/.emacs-profiles.el= file contains the following: - -#+BEGIN_SRC emacs-lisp - (("default" . ((user-emacs-directory . "~/.emacs.default"))) - ("spacemacs" . ((user-emacs-directory . "~/spacemacs"))) - ("prelude" . ((user-emacs-directory . "~/prelude")))) -#+END_SRC - -you can create a file called =~/.emacs-profile=, containing the name of the -profile you'd like to be used when none is given on the command line: - -#+BEGIN_SRC shell -$ echo 'spacemacs' > ~/.emacs-profile -#+END_SRC - -This will set the default profile to be the "spacemacs" profile, instead of -"default". You can change the default by simply changing the contents of this -file: - -#+BEGIN_SRC shell -$ echo 'prelude' > ~/.emacs-profile -#+END_SRC - -If this file doesn't exist, then "default" will be used, as before. - -** Spacemacs - -Spacemacs is typically installed by cloning the Spacemacs repo to =~/.emacs.d=, -and doing extra customization from =~/.spacemacs= or =~/.spacemacs.d/init.el=. -This makes it tedious to switch between version of Spacemacs, or between -different Spacemacs configurations. - -With Chemacs you can point your =user-emacs-directory= to wherever you have -Spacemacs installed, and use the =SPACEMACSDIR= environment variable to point at -a directory with customizations that are applied on top of the base install. - -#+BEGIN_SRC emacs-lisp -(("spacemacs" . ((user-emacs-directory . "~/spacemacs") - (env . (("SPACEMACSDIR" . "~/.spacemacs.d"))))) - - ("spacemacs-develop" . ((user-emacs-directory . "~/spacemacs/develop") - (env . (("SPACEMACSDIR" . "~/.spacemacs.d"))))) - - ("new-config" . ((user-emacs-directory . "~/spacemacs/develop") - (env . (("SPACEMACSDIR" . "~/my-spacemacs-config")))))) -#+END_SRC - -** DOOM emacs - -You can add an entry similar to the following to your =.emacs-profiles.el= - -In the following snippet =~/doom-emacs= is where you have cloned doom emacs. - -(Depending on when you read this) =DOOMDIR= support is only in =develop= branch of doom emacs. Check commit history of =master= branch of doom emacs - -#+BEGIN_SRC emacs-lisp -("doom" . ((user-emacs-directory . "~/doom-emacs") - (env . (("DOOMDIR" . "~/doom-config"))))) -#+END_SRC - -Please refer to [[https://github.com/plexus/chemacs/issues/5][this]] discussion for details. - -** FreeDesktop Directories - -Both =~/.emacs-profiles.el= and =~/.emacs-profile= can also be stored under =$XDG_CONFIG_HOME/chemacs= (typically =~/.config/chemacs=) as =$XGD_CONFIG_HOME/chemacs/profiles.el= and =$XDG_CONFIG_HOME/chemacs/profile= respectively. - -Further, as indicated by the [[http://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-27][Emacs 27.1 changelog]], Emacs is now compatible with XDG Standards, looking for its configuration files in =${XDG_CONFIG_HOME}/emacs= directory too (provided the traditional =~/.emacs.d= and =~/.emacs= does not exist). -Therefore, it is perfectly viable to install Chemacs 2 in =${XDG_CONFIG_HOME}/emacs= (usually =~/.config/emacs=) directory - with the aforementioned caveat: _the directory =~/.emacs.d"= and the file ="~/.emacs"= does not exist_. - -** Example: emacs as daemon -- Profiles -You can add an entry similar to the following to your =.emacs-profiles.el= -#+BEGIN_SRC emacs-lisp -;; your custom or vanilla emacs profile -(("default" . ((user-emacs-directory . "~/.gnu-emacs") - (server-name . "gnu") - )) - -;; emacs distribution: DOOM-emacs -("doom" . ((user-emacs-directory . "~/.doom-emacs") - (server-name . "doom") - (env . (("DOOMDIR" . "~/.doom.d"))) - )) - ) -#+END_SRC - -- daemon -Set emacs daemon to always run in background -#+begin_src bash -# vanilla -emacs --daemon & -# Doom emacs -emacs --with-profile doom --daemon & -#+end_src - -- emacsclient -create a new frame, connect to the socket and use vanilla emacs as fallback -#+begin_src bash -emacsclient -c -s gnu -a emacs -emacsclient -c -s doom -a emacs -#+end_src - -** Troubleshooting - -*** Emacs cannot find packages installed by straight -Some users have [[https://github.com/plexus/chemacs2/issues/31][reported issues]] where packages installed by `straight.el` can no longer be found after switching to using `chemacs`. - -First, make sure you haven't hardcoded filepaths to "emacs.d" in your configuration. You should reference files inside a profile-specific emacs folder like this: - -#+begin_src elisp -(setq some-var (expand-file-name "path/to/file" user-emacs-directory)) -#+END_SRC - -Second, if the issue persists you should delete the `build` folder in your `straight` directory and rebuild your dependencies. - -If the issue persists please [[https://github.com/plexus/chemacs2/issues/31][comment on the issue]], because we are still trying to figure out the exact source of this problem, but this has solved the problem for some users. - -** LICENSE - -Copyright © Arne Brasseur and contributors, 2018-2022 - -Distributed under the terms of the GPL v3. diff --git a/.config/emacs/chemacs.el b/.config/emacs/chemacs.el deleted file mode 100644 index efc160a..0000000 --- a/.config/emacs/chemacs.el +++ /dev/null @@ -1,173 +0,0 @@ -;;; chemacs.el --- -*- lexical-binding: t; -*- -;;; Commentary: -;; :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -;; -;; ___ ___ ___ ___ ___ ___ ___ -;; / /\ /__/\ / /\ /__/\ / /\ / /\ / /\ -;; / /:/ \ \:\ / /:/_ | |::\ / /::\ / /:/ / /:/_ -;; / /:/ \__\:\ / /:/ /\ | |:|:\ / /:/\:\ / /:/ / /:/ /\ -;; / /:/ ___ ___ / /::\ / /:/ /:/_ __|__|:|\:\ / /:/~/::\ / /:/ ___ / /:/ /::\ -;; /__/:/ / /\ /__/\ /:/\:\ /__/:/ /:/ /\ /__/::::| \:\ /__/:/ /:/\:\ /__/:/ / /\ /__/:/ /:/\:\ -;; \ \:\ / /:/ \ \:\/:/__\/ \ \:\/:/ /:/ \ \:\~~\__\/ \ \:\/:/__\/ \ \:\ / /:/ \ \:\/:/~/:/ -;; \ \:\ /:/ \ \::/ \ \::/ /:/ \ \:\ \ \::/ \ \:\ /:/ \ \2.0 /:/ -;; \ \:\/:/ \ \:\ \ \:\/:/ \ \:\ \ \:\ \ \:\/:/ \__\/ /:/ -;; \ \::/ \ \:\ \ \::/ \ \:\ \ \:\ \ \::/ /__/:/ -;; \__\/ \__\/ \__\/ \__\/ \__\/ \__\/ \__\/ -;; -;; :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -;; -;; Chemacs - Emacs Profile Switcher -;; -;; See README.md for instructions. - -;; NOTE Don't require any libraries in this file. When emacs loads a library that -;; is byte compiled, it may start native-compiling it, so if we require anything -;; here, native compilation can start before the user has had a chance to configure -;; it in their init files. - -;;; Code: -(defvar chemacs-version "2.0") -(defvar config-home (or (getenv "XDG_CONFIG_HOME") "~/.config")) -(defvar chemacs-profiles-paths (list "~/.emacs-profiles.el" (format "%s/%s" config-home "chemacs/profiles.el" ))) -(defvar chemacs-default-profile-paths (list "~/.emacs-profile" (format "%s/%s" config-home "chemacs/profile"))) -(defvar chemacs-profile-env-var "CHEMACS_PROFILE") - -;; Copy `seq' library's `seq-filter' to avoid requiring it, see note above. -(defun chemacs--seq-filter (pred sequence) - (let ((exclude (make-symbol "exclude"))) - (delq exclude (mapcar (lambda (elt) - (if (funcall pred elt) - elt - exclude)) - sequence)))) - -(defvar chemacs-profiles-path (or (car (chemacs--seq-filter #'file-exists-p chemacs-profiles-paths)) - (car chemacs-profiles-paths))) -(defvar chemacs-default-profile-path (or (car (chemacs--seq-filter #'file-exists-p chemacs-default-profile-paths)) - (car chemacs-default-profile-paths))) - -(defun chemacs-handle-command-line (args) - (when args - ;; Handle either --with-profile profilename or - ;; --with-profile=profilename - (let ((s (split-string (car args) "="))) - (cond ((equal (car args) "--with-profile") - ;; This is just a no-op so Emacs knows --with-profile - ;; is a valid option. If we wait for - ;; command-switch-alist to be processed then - ;; after-init-hook has already run. - (add-to-list 'command-switch-alist - '("--with-profile" . - (lambda (_) (pop command-line-args-left)))) - (cadr args)) - - ;; Similar handling for `--with-profile=profilename' - ((equal (car s) "--with-profile") - (add-to-list 'command-switch-alist `(,(car args) . (lambda (_)))) - (mapconcat 'identity (cdr s) "=")) - - (t (chemacs-handle-command-line (cdr args))))))) - -(defvar chemacs--with-profile-value - (let* ((value (chemacs-handle-command-line command-line-args)) - (read-value (read value))) - (when value - (if (listp read-value) - read-value - value)))) - -(defvar chemacs-literal-profile-provided - (and chemacs--with-profile-value - (listp chemacs--with-profile-value))) - -(unless (or (file-exists-p chemacs-profiles-path) - (and chemacs--with-profile-value - (listp chemacs--with-profile-value))) - (error "[chemacs] %s does not exist." chemacs-profiles-path)) - -(defvar chemacs-default-profile-name - (if (file-exists-p chemacs-default-profile-path) - (with-temp-buffer - (insert-file-contents chemacs-default-profile-path) - (goto-char (point-min)) - ;; (buffer-string)) - (symbol-name (read (current-buffer)) )) - "default")) - - -(defvar chemacs-profile-name - (let ((env-profile-value (getenv chemacs-profile-env-var))) - (cond ((and chemacs--with-profile-value - (stringp chemacs--with-profile-value)) - chemacs--with-profile-value) - (env-profile-value env-profile-value) - (t chemacs-default-profile-name)))) - -(defvar chemacs-profile - (if (and chemacs--with-profile-value - (listp chemacs--with-profile-value)) - chemacs--with-profile-value - (let ((profiles - (with-temp-buffer - (insert-file-contents chemacs-profiles-path) - (goto-char (point-min)) - (read (current-buffer))))) - (cdr (assoc chemacs-profile-name profiles))))) - -(unless chemacs-profile - (error "No profile `%s' in %s" chemacs-profile-name chemacs-profiles-path)) - -(defun chemacs-profile-get (key &optional default) - (alist-get key chemacs-profile default)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(setq user-emacs-directory (file-name-as-directory - (chemacs-profile-get 'user-emacs-directory))) - -;; Allow multiple profiles to each run their server -;; use `emacsclient -s profile_name' to connect -(let ((name (chemacs-profile-get 'server-name))) - (when name (setq server-name name))) - -;; Set environment variables, these are visible to init-file with -;; getenv -(mapcar (lambda (env) - (setenv (car env) (cdr env))) - (chemacs-profile-get 'env)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defun chemacs-load-user-early-init () - (let ((early-init-file (expand-file-name "early-init.el" user-emacs-directory))) - (load early-init-file t t))) - -(defun chemacs-load-user-init () - (when (chemacs-profile-get 'straight-p) (chemacs-load-straight)) - (let ((init-file (expand-file-name "init.el" user-emacs-directory))) - (setq package-user-dir (expand-file-name "elpa" user-emacs-directory)) - (load init-file t t) - ;; Prevent customize from changing ~/.emacs (this file), but if - ;; init.el has set a value for custom-file then don't touch it. - (let ((chemacs-custom-file (chemacs-profile-get 'custom-file init-file))) - (when (not custom-file) - (setq custom-file chemacs-custom-file) - (unless (equal custom-file init-file) - (unless (file-exists-p custom-file) - (with-temp-buffer (write-file custom-file))) - (load custom-file)))))) - -(defun chemacs-load-straight () - (defvar bootstrap-version) - (let ((bootstrap-file (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) - (bootstrap-version 5)) - (unless (file-exists-p bootstrap-file) - (with-current-buffer - (url-retrieve-synchronously - "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" - 'silent 'inhibit-cookies) - (goto-char (point-max)) - (eval-print-last-sexp))) - (load bootstrap-file nil 'nomessage))) - -(provide 'chemacs) diff --git a/.config/emacs/early-init.el b/.config/emacs/early-init.el deleted file mode 100644 index c4ae04b..0000000 --- a/.config/emacs/early-init.el +++ /dev/null @@ -1,7 +0,0 @@ -;;; early-init.el --- -*- lexical-binding: t; -*- - -(require 'chemacs - (expand-file-name "chemacs.el" - (file-name-directory - (file-truename load-file-name)))) -(chemacs-load-user-early-init) diff --git a/.config/emacs/init.el b/.config/emacs/init.el deleted file mode 100644 index 44948e1..0000000 --- a/.config/emacs/init.el +++ /dev/null @@ -1,11 +0,0 @@ -;;; init.el --- -*- lexical-binding: t; -*- - -(require 'chemacs - (expand-file-name "chemacs.el" - (file-name-directory - (file-truename load-file-name)))) -(chemacs-load-user-init) - -;; this must be here to keep the package system happy, normally you do -;; `package-initialize' for real in your own init.el -;; (package-initialize) diff --git a/.doom.d/config.el b/.doom.d/config.el new file mode 100644 index 0000000..e6199d2 --- /dev/null +++ b/.doom.d/config.el @@ -0,0 +1,212 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +(setq user-full-name "JaeYoo-Im" + user-mail-address "cpu3792@gmail.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-unicode-font' -- for unicode glyphs +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(setq doom-theme 'doom-palenight) + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type t) + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will help you configure Doom. +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. + + +;; -------------------------------------------------------------------------------------------- +;; -Transparency +;; -------------------------------------------------------------------------------------------- +(defvar gvar/frame-transparency '(85 . 85)) + +(defun toggle-transparency () + (interactive) + (let ((alpha (frame-parameter nil 'alpha))) + (set-frame-parameter + nil 'alpha + (if (eql (cond ((numberp alpha) alpha) + ((numberp (cdr alpha)) (cdr alpha)) + ;; Also handle undocumented ( ) form. + ((numberp (cadr alpha)) (cadr alpha))) + 100) + gvar/frame-transparency '(100 . 100))))) + +(global-set-key (kbd "C-c t") 'toggle-transparency) + +;; -------------------------------------------------------------------------------------------- +;; - Screenshot +;; -------------------------------------------------------------------------------------------- +(defun my-org-paste-image () + "Paste an image into a time stamped unique-named file in the +same directory as the org-buffer and insert a link to this file." + (interactive) + (let* ((target-file + (concat + (make-temp-name + (concat (buffer-file-name) + "_" + (format-time-string "%Y%m%d_%H%M%S_"))) ".png")) + (wsl-path + (concat (as-windows-path(file-name-directory target-file)) + "/" + (file-name-nondirectory target-file))) + (ps-script + (concat "(Get-Clipboard -Format image).Save('" wsl-path "')"))) + + (powershell ps-script) + + (if (file-exists-p target-file) + (progn (insert (concat "[[" target-file "]]")) + (org-display-inline-images)) + (user-error + "Error pasting the image, make sure you have an image in the clipboard!")) + )) + +(defun as-windows-path (unix-path) + "Takes a unix path and returns a matching WSL path" + ;; substring removes the trailing \n + (substring + (shell-command-to-string + (concat "wslpath -w " unix-path)) 0 -1)) + +(defun powershell (script) + "executes the given script within a powershell and returns its return value" + (call-process "powershell.exe" nil nil nil + "-Command" (concat "& {" script "}"))) + + +;; -------------------------------------------------------------------------------------------- +;; - Org Mode +;; -------------------------------------------------------------------------------------------- +(with-eval-after-load 'org + ;; This is needed as of Org 9.2 + (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 '("hs" . "src haskell")) + (add-to-list 'org-structure-template-alist '("cc" . "src c")) + (add-to-list 'org-structure-template-alist '("cp" . "src c++")) + (add-to-list 'org-structure-template-alist '("rs" . "src rust")) + (add-to-list 'org-structure-template-alist '("py" . "src python")) + (add-to-list 'org-structure-template-alist '("oc" . "src octave")) + (add-to-list 'org-structure-template-alist '("vl" . "src verilog")) + (add-to-list 'org-structure-template-alist '("vh" . "src vhdl"))) +(setq org-odt-preferred-output-format "docx") +(use-package! ob-translate + :config + (setq ob-translate:default-dest "ko")) +;; -------------------------------------------------------------------------------------------- +;; - Org Roam UI Mode +;; -------------------------------------------------------------------------------------------- +(use-package! websocket + :after org-roam) + +(use-package! org-roam-ui + :after org-roam ;; or :after org +;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have +;; a hookable mode anymore, you're advised to pick something yourself +;; if you don't care about startup time, use +;; :hook (after-init . org-roam-ui-mode) + :config + (setq org-roam-ui-sync-theme t + org-roam-ui-follow t + org-roam-ui-update-on-save t + org-roam-ui-open-on-start t)) +;; -------------------------------------------------------------------------------------------- +;; - Org Publish +;; -------------------------------------------------------------------------------------------- +(setq org-publish-use-timestamps-flag nil) +(setq org-export-with-broken-lilnks t) +(setq org-publish-project-alist + '(("jaeus.net" + :base-directory "~/org/www/" + :base-extension "org" + :publishing-directory "~/Projects/html/" + :recursive t + :publishing-function org-html-publish-to-html + :headline-levels 4 + :auto-preamble t))) +;; -------------------------------------------------------------------------------------------- +;; - EPUB +;; -------------------------------------------------------------------------------------------- +(use-package! nov) +(add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode)) +;; -------------------------------------------------------------------------------------------- +;; - KeyBindings +;; -------------------------------------------------------------------------------------------- +(map! "C-s" 'consult-line) +(map! "C-M-l" 'consult-imenu) +(map! "C-M-j" 'persp-switch-to-buffer) +(use-package! dired + :config + (evil-collection-define-key 'normal 'dired-mode-map + "h" 'dired-up-directory + "l" 'dired-find-file)) +(use-package! dired-hide-dotfiles + :hook (dired-mode . dired-hide-dotfiles-mode) + :config + (evil-collection-define-key 'normal 'dired-mode-map + "H" 'dired-hide-dotfiles-mode)) diff --git a/.doom.d/custom.el b/.doom.d/custom.el new file mode 100644 index 0000000..f215921 --- /dev/null +++ b/.doom.d/custom.el @@ -0,0 +1,14 @@ +(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 + '("47db50ff66e35d3a440485357fb6acb767c100e135ccdf459060407f8baea7b2" "234dbb732ef054b109a9e5ee5b499632c63cc24f7c2383a849815dacc1727cb6" "835868dcd17131ba8b9619d14c67c127aa18b90a82438c8613586331129dda63" default))) +(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. + ) diff --git a/.doom.d/init.el b/.doom.d/init.el new file mode 100644 index 0000000..3cd1366 --- /dev/null +++ b/.doom.d/init.el @@ -0,0 +1,193 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all +;; of our modules are listed, including what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + (vertico +icons) ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + (emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + ;;indent-guides ; highlighted indent columns + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + ;;treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + vc-gutter ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + ;;word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + ;;docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + ;;gist ; interacting with github gists + lookup ; navigate your code and its documentation + ;;lsp ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if IS-MAC macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + ;;(cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + ;;(go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + ;;json ; At least it ain't XML + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + ;;nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + (org +roam2 +journal +jupyter +noter +pretty) ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + ;;web ; the tubes + ;;yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/.doom.d/packages.el b/.doom.d/packages.el new file mode 100644 index 0000000..391bd75 --- /dev/null +++ b/.doom.d/packages.el @@ -0,0 +1,58 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;(package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/raxod502/straight.el#the-recipe-format +;(package! another-package +; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;(package! this-package +; :recipe (:host github :repo "username/repo" +; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;(package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;(package! builtin-package :recipe (:nonrecursive t)) +;(package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see raxod502/straight.el#279) +;(package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;(package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;(unpin! pinned-package) +;; ...or multiple packages +;(unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;(unpin! t) +(unpin! org-roam) +(package! org-roam-ui) +(unpin! ob-translate) +(package! ob-translate) +(unpin! dired-hide-dotfiles) +(package! dired-hide-dotfiles) +(unpin! nov) +(package! nov) diff --git a/.zshrc b/.zshrc index 67952dc..b2fd91d 100644 --- a/.zshrc +++ b/.zshrc @@ -34,11 +34,11 @@ alias ytv-best="youtube-dl -f bestvideo+bestaudio " hostname=$(cat /etc/hostname) figlet -w 100 "$hostname" -cat ~/.cache/wal/sequences & +#cat ~/.cache/wal/sequences & # Fire it up for WSL2 -VETHER_IP=$(/bin/grep nameserver /etc/resolv.conf 2> /dev/null | /bin/tr -s ' ' | /bin/cut -d' ' -f2) -export DISPLAY=$VETHER_IP:10.0 +#VETHER_IP=$(/bin/grep nameserver /etc/resolv.conf 2> /dev/null | /bin/tr -s ' ' | /bin/cut -d' ' -f2) +#export DISPLAY=$VETHER_IP:10.0 #export DISPLAY=192.168.144.1:10.0 #export EDITOR=nvim