diff --git a/Justfile b/Justfile index a8bca1fa..a88d6a32 100644 --- a/Justfile +++ b/Justfile @@ -317,39 +317,6 @@ k3s-prod: k3s-test: colmena apply --on '@k3s-test-*' --verbose --show-trace -# ================================================= -# Emacs related commands -# ================================================= - -[group('emacs')] -emacs-test: - doom clean - doom sync - -[group('emacs')] -emacs-purge: - doom purge - doom clean - doom sync - -[linux] -[group('emacs')] -emacs-reload: - doom sync - systemctl --user restart emacs.service - systemctl --user status emacs.service - - -emacs-plist-path := "~/Library/LaunchAgents/org.nix-community.home.emacs.plist" - -[macos] -[group('emacs')] -emacs-reload: - doom sync - launchctl unload {{emacs-plist-path}} - launchctl load {{emacs-plist-path}} - tail -f ~/Library/Logs/emacs-daemon.stderr.log - # ================================================= # # Other useful commands diff --git a/README.md b/README.md index ecd94636..958c2e58 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ You don't have to go through the pain I've experienced again! Check out my | **Shell** | [Nushell][Nushell] + [Starship][Starship] | | **Music Player** | [mpd][mpd], [ncmpcpp][ncmpcpp], [mpc][mpc] | | **Media Player** | [mpv][mpv] | -| **Text Editor** | [Neovim][Neovim] + [DoomEmacs][DoomEmacs] | +| **Text Editor** | [Neovim][Neovim] | | **Fonts** | [Nerd fonts][Nerd fonts] | | **Image Viewer** | [imv][imv] | | **Screenshot Software** | [flameshot][flameshot] + [grim][grim] | @@ -80,22 +80,16 @@ You don't have to go through the pain I've experienced again! Check out my Wallpapers: https://github.com/ryan4yin/wallpapers -## Hyprland + AstroNvim + DoomEmacs +## Hyprland + AstroNvim ![](./_img/hyprland_2023-07-29_1.webp) ![](./_img/hyprland_2023-07-29_2.webp) -![](./_img/emacs-2024-01-07.webp) - ## Neovim See [./home/base/tui/editors/neovim/](./home/base/tui/editors/neovim/) for details. -## Emacs - -See [./home/base/tui/editors/emacs/](./home/base/tui/editors/emacs/) for details. - ## Secrets Management See [./secrets](./secrets) for details. @@ -199,7 +193,6 @@ Other dotfiles that inspired me: [Zellij]: https://github.com/zellij-org/zellij [Neovim]: https://github.com/neovim/neovim [AstroNvim]: https://github.com/AstroNvim/AstroNvim -[DoomEmacs]: https://github.com/doomemacs/doomemacs [flameshot]: https://github.com/flameshot-org/flameshot [grim]: https://github.com/emersion/grim [flameshot]: https://github.com/flameshot-org/flameshot diff --git a/flake.lock b/flake.lock index 970fd806..e697b9eb 100644 --- a/flake.lock +++ b/flake.lock @@ -303,22 +303,6 @@ "type": "github" } }, - "doomemacs": { - "flake": false, - "locked": { - "lastModified": 1744400981, - "narHash": "sha256-8bBhEmytBSPksB04vhcx0XUTW0wES0A5RATcvluTveg=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "c6f749e67c13342007f6aeaa4a81e6fdb00f529f", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -1642,7 +1626,6 @@ "anyrun": "anyrun", "blender-bin": "blender-bin", "disko": "disko", - "doomemacs": "doomemacs", "ghostty": "ghostty", "haumea": "haumea", "home-manager": "home-manager_2", diff --git a/flake.nix b/flake.nix index 2eae63fd..e31583b5 100644 --- a/flake.nix +++ b/flake.nix @@ -121,12 +121,6 @@ ######################## Some non-flake repositories ######################################### - # doom-emacs is a configuration framework for GNU Emacs. - doomemacs = { - url = "github:doomemacs/doomemacs"; - flake = false; - }; - polybar-themes = { url = "github:adi1090x/polybar-themes"; flake = false; diff --git a/home/base/tui/editors/README.md b/home/base/tui/editors/README.md index bcc309e2..cd7e307a 100644 --- a/home/base/tui/editors/README.md +++ b/home/base/tui/editors/README.md @@ -3,8 +3,7 @@ My editors: 1. Neovim -2. Emacs -3. Helix +2. Helix And `Zellij` for a smooth and stable terminal experience. diff --git a/home/base/tui/editors/Structured-Editing.md b/home/base/tui/editors/Structured-Editing.md index 0ed96b22..27c95fac 100644 --- a/home/base/tui/editors/Structured-Editing.md +++ b/home/base/tui/editors/Structured-Editing.md @@ -11,8 +11,6 @@ Some plugins: -- Emacs - - [parinfer-rusT-mode](https://github.com/justinbarclay/parinfer-rust-mode) - Neovim - [parinfer-rust](https://github.com/eraserhd/parinfer-rust) - diff --git a/home/base/tui/editors/emacs/README.md b/home/base/tui/editors/emacs/README.md deleted file mode 100644 index e3bc9fb7..00000000 --- a/home/base/tui/editors/emacs/README.md +++ /dev/null @@ -1,230 +0,0 @@ -# Emacs Editor - -## Why emacs? - -1. Explore the unknown, just for fun! -2. Org Mode -3. Lisp Coding -4. A top-level tutorial for Emacs(Chinese): -5. A Beginner's Guide to Emacs(Chinese): - - -## Screenshot - -![](/_img/emacs-2024-01-07.webp) - -## Useful Links - -- Framework: - - key bindings: - - source code: - - - docs: - - module index: -- LSP Client: -- Emacs Wiki: -- Awesome Emacs: -- Chinese(rime) support: -- modal editing: - - : evil mode, enabled by default in doom-emacs. - - - -## Install or Update - -After deploying this nix flake, run the following command to install or update emacs: - -```bash -doom sync -``` - -when in doubt, run `doom sync`! - -## Testing - -> via `Justfile` located at the root of this repo. - -```bash -# testing -just emacs-test -just emacs-purge -just emacs-reload - -# clear test data -just emacs-clean -``` - -## Limits - -- It's too slow to start up and install(compile/build) packages. - - I have to use emacs in daemon/client mode to avoid this issue. -- It's too large in size, not suitable for servers. - - So vim/neovim is still the best choice for servers. -- Emacs's markdown-mode works not well with tables, see: - - https://github.com/jrblevin/markdown-mode/issues/380 -- I use git command frequently, but doomemacs only autoupdates status of git diff / treemacs when - using magit. - - I have to learn magit to avoid this issue... -- GitHub's orgmode support is not well, Markdown is better for GitHub. - - Use markdown for repo's README.md, and use orgmode for my personal notes and docs only. - -## Cheetsheet - -Here is the cheetsheet related to my DoomEmacs configs. Please read vim's common cheetsheet at -[../README.md](../README.md) before reading the following. - -### Basics - -> Terminal(vterm) is useful in GUI mode, I use Zellij instead in terminal mode. - -| Action | Shortcut | -| ---------------------- | ------------------------------------------------- | -| Popup Terminal(vterm) | `SPC + o + t` | -| Open Terminal | `SPC + o + T` | -| Open file tree sidebar | `SPC + o + p` | -| Frame fullscreen | `SPC + t + F` | -| Exit | `M-x C-c` | -| Execute Command | `M-x`(hold on `Alt`/`option`, and then press `x`) | -| Eval Lisp Code | `M-:`(hold on `Alt`/`option`, and then press `:`) | - -### Window Navigation - -| Action | Shortcut | -| ------------------------------------------ | --------------------------------------------------------------------- | -| Split a window vertically and horizontally | `SPC w v/s` | -| Move to a window in a specific direction | `Ctrl-w + h/j/k/l` | -| Move a window to a specific direction | `Ctrl-w + H/J/K/L` | -| Move to the next window | `SPC w w` | -| Close the current window | `SPC w q` | -| Rebalance all windows | `SPC w =` | -| Set window's width(columns) | `80 SPC w \|` (the Vertical line is escaped due to markdown's limits) | -| Set window's height | `30 SPC w _ ` | - -### File Tree - -- treemacs: -- treemacs-evil: - - -| Action | Shortcut | -| ------------------------------------- | --------- | -| Resize Treemacs's window | `>` & `<` | -| Extra Wide Window | `W` | -| Rename | `R` | -| Delete File/Direcoty | `d` | -| New File | `cf` | -| New Directory | `cd` | -| Go to parent | `u` | -| Run shell command in for current node | `!` | -| Refresh file tree | `gr` | -| Copy project-path into pasteboard | `yp` | -| Copy absolute-path into pasteboard | `ya` | -| Copy relative-path into pasteboard | `yr` | -| Copy file to another location | `yf` | -| Move file to another location | `m` | -| quit | `q` | - -And bookmarks: - -- Add bookmarks in treemacs: `b` -- Show Bookmark List: `SPC s m` - -### Splitting and Buffers - -| Action | Shortcut | -| ----------------------- | ----------------- | -| Buffer List | ` + ,` | -| Save all buffers(Tab) | ` + b + S` | -| Kill the current buffer | ` + b + k` | -| Kill all buffers | ` + b + K` | - -### Editing and Formatting - -| Action | Shortcut | -| ------------------------------------------ | ------------------- | -| Format Document | ` + cf` | -| Code Actions | ` + ca` | -| Rename | ` + cr` | -| Opening LSP symbols | ` + cS` | -| Show all LSP Errors | ` + c + x/X` | -| Show infinite undo history(really useful!) | ` + s + u` | -| Open filepath/URL at cursor | `gf` | -| Find files by keyword in path | ` + ` | -| Grep string in files (vertico + ripgrep) | ` + sd` | - -### Image Preview(GUI mode only) - -Use `-`, `+` to resize the image, `r` to rotate the image. - -### Search & replace - -```bash -SPC s p foo C-; E C-c C-p :%s/foo/bar/g RET Z Z -``` - -1. `SPC s p`: search in project -1. `foo`: the keyword to search -1. `C-; E`: exports what you’re looking at into a new buffer in grep-mode -1. `C-c C-p` to run wgrep-change-to-wgrep-mode to make the search results writable. -1. `:%s/foo/bar/g RET`: replace in the current buffer(just like neovim/vim) -1. `Z Z`: to write all the changes to their respective files - -### Projects - -> easily switch between projects without exit emacs! - -| Action | Shortcut | -| -------------------------- | ------------- | -| Switch between projects | `SPC + p + p` | -| Browse the current project | `SPC + p + .` | -| Add new project | `SPC + p + a` | - -### Workspaces - -> Very useful when run emacs in daemon/client modes - -| Action | Shortcut | -| --------------------------- | --------------------------- | -| Switch between workspaces | `M-1/2/3/...`(Alt-1/2/3/..) | -| New Workspace | `SPC + TAB + n` | -| New Named Workspace | `SPC + TAB + N` | -| Delete Workspace | `SPC + TAB + d` | -| Display Workspaces bar blow | `SPC + TAB + TAB` | - -### Magit - -> https://github.com/magit/magit - -Magit is a powerful tool that make git operations easy and intuitive. - -| Action | Shortcut | -| ------------------------ | ------------------------ | -| Open Magit | `C-x g` or `SPC + g + g` | -| Switch branch | `SPC + g + b` | -| Show buffer's commit log | `SPC + g + L` | - -Shortcuts in magit's pane: - -> When run `git commit` / `git add` / `git push` /... via magit, multiple Arguments can be set. Set -> arguments won't trigger a git command immediately. Magit will try to run a git command only after -> an Action key is pressed. - -| Action | Shortcut | -| -------------------------------------------------- | --------------------------------------------- | -| Quit the current Magit pane | `q` | -| Show log | `l` | -| Show current branch's log | `l + l` | -| Show current reflog | `l + r` | -| Commit | `c` | -| Stage | `s` | -| Unstage | `u` | -| Push | `p` | -| Pull | `f` | -| Rebase | `r` | -| Rebase Interactively | `r + i`, select on a commit, then `C-c + C-c` | -| Stash | `z` | -| Merge | `m` | -| Fold/Unfold | `TAB` | -| Show details of the current unit(commit/stage/...) | `` | - -KeyBinding full list: - diff --git a/home/base/tui/editors/emacs/default.nix b/home/base/tui/editors/emacs/default.nix deleted file mode 100644 index 230add20..00000000 --- a/home/base/tui/editors/emacs/default.nix +++ /dev/null @@ -1,131 +0,0 @@ -# ============================================== -# Based on doomemacs's author's config: -# https://github.com/hlissner/dotfiles/blob/master/modules/editors/emacs.nix -# -# Emacs Tutorials: -# 1. Official: -# 2. Doom Emacs: -# -{ - config, - lib, - pkgs, - doomemacs, - ... -}: -with lib; let - cfg = config.modules.editors.emacs; - envExtra = lib.mkAfter '' - export PATH="${config.xdg.configHome}/emacs/bin:$PATH" - ''; - shellAliases = { - e = "emacsclient --create-frame"; # gui - et = "emacsclient --create-frame --tty"; # terminal - }; - librime-dir = "${config.xdg.dataHome}/emacs/librime"; - parinfer-rust-lib-dir = "${config.xdg.dataHome}/emacs/parinfer-rust"; - myEmacsPackagesFor = emacs: ((pkgs.emacsPackagesFor emacs).emacsWithPackages (epkgs: [ - epkgs.vterm - ])); - # to make this symlink work, we need to git clone this repo to your home directory. - configPath = "${config.home.homeDirectory}/nix-config/home/base/tui/editors/emacs/doom"; -in { - options.modules.editors.emacs = { - enable = mkEnableOption "Emacs Editor"; - }; - - config = mkIf cfg.enable (mkMerge [ - { - home.packages = with pkgs; [ - ## Doom dependencies - git - (ripgrep.override {withPCRE2 = true;}) - gnutls # for TLS connectivity - - ## Optional dependencies - fd # faster projectile indexing - imagemagick # for image-dired - fd # faster projectile indexing - zstd # for undo-fu-session/undo-tree compression - - # go-mode - # gocode # project archived, use gopls instead - - ## Module dependencies - # :checkers spell - # (aspellWithDicts (ds: with ds; [en en-computers en-science])) - # :tools editorconfig - editorconfig-core-c # per-project style config - # :tools lookup & :lang org +roam - sqlite - # :lang latex & :lang org (latex previews) - # texlive.combined.scheme-medium - ]; - - programs.bash.bashrcExtra = envExtra; - programs.zsh.envExtra = envExtra; - home.shellAliases = shellAliases; - programs.nushell.shellAliases = shellAliases; - - xdg.configFile."doom".source = config.lib.file.mkOutOfStoreSymlink configPath; - - home.activation.installDoomEmacs = lib.hm.dag.entryAfter ["writeBoundary"] '' - ${pkgs.rsync}/bin/rsync -avz --chmod=D2755,F744 ${doomemacs}/ ${config.xdg.configHome}/emacs/ - - # librime for emacs-rime - mkdir -p ${librime-dir} - ${pkgs.rsync}/bin/rsync -avz --chmod=D2755,F744 ${pkgs.librime}/ ${librime-dir}/ - - # libparinfer_rust for emacs' parinfer-rust-mode - mkdir -p ${parinfer-rust-lib-dir} - ${pkgs.rsync}/bin/rsync -avz --chmod=D2755,F744 ${pkgs.vimPlugins.parinfer-rust}/lib/libparinfer_rust.* ${parinfer-rust-lib-dir}/parinfer-rust.so - ''; - } - - (mkIf pkgs.stdenv.isLinux ( - let - # Do not use emacs-nox here, which makes the mouse wheel work abnormally in terminal mode. - # pgtk (pure gtk) build add native support for wayland. - # https://www.gnu.org/savannah-checkouts/gnu/emacs/emacs.html#Releases - emacsPkg = myEmacsPackagesFor pkgs.emacs30-pgtk; - in { - home.packages = [emacsPkg]; - services.emacs = { - enable = true; - package = emacsPkg; - client = { - enable = true; - arguments = [" --create-frame"]; - }; - startWithUserSession = true; - }; - } - )) - - (mkIf pkgs.stdenv.isDarwin ( - let - # macport adds some native features based on GNU Emacs 29 - # https://bitbucket.org/mituharu/emacs-mac/src/master/README-mac - emacsPkg = myEmacsPackagesFor pkgs.emacs30; - in { - home.packages = [emacsPkg]; - launchd.enable = true; - launchd.agents.emacs = { - enable = true; - config = { - ProgramArguments = [ - "${pkgs.bash}/bin/bash" - "-l" - "-c" - "${emacsPkg}/bin/emacs --fg-daemon" - ]; - StandardErrorPath = "${config.home.homeDirectory}/Library/Logs/emacs-daemon.stderr.log"; - StandardOutPath = "${config.home.homeDirectory}/Library/Logs/emacs-daemon.stdout.log"; - RunAtLoad = true; - KeepAlive = true; - }; - }; - } - )) - ]); -} diff --git a/home/base/tui/editors/emacs/doom/config.el b/home/base/tui/editors/emacs/doom/config.el deleted file mode 100644 index a560d855..00000000 --- a/home/base/tui/editors/emacs/doom/config.el +++ /dev/null @@ -1,175 +0,0 @@ -;;; $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 "John Doe" -;; user-mail-address "john@doe.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-symbol-font' -- for symbols -;; - `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 "JetBrainsMono Nerd Font" :size 18) - doom-variable-pitch-font (font-spec :family "DejaVu Sans") - doom-symbol-font (font-spec :family "Symbols Nerd Font Mono") - doom-big-font (font-spec :family "JetBrainsMono Nerd Font" :size 28)) - -;; Users should inject their own font logic in `after-setting-font-hook' -;; Add font for CJK charset -(defun init-cjk-fonts() - (dolist (charset '(kana han cjk-misc bopomofo)) - (set-fontset-font (frame-parameter nil 'font) - charset (font-spec :family "Source Han Sans SC")))) -(add-hook 'after-setting-font-hook 'init-cjk-fonts) - - -;; 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: -;; other doom's official themes: -;; https://github.com/doomemacs/themes -(setq doom-theme 'doom-dracula) ;; doom-one doom-dracula doom-nord -(if (eq system-type 'darwin) - ;; Transparent Backgroud - for macOS - ;;(set-frame-parameter (selected-frame) 'alpha '( . )) - ;;(set-frame-parameter (selected-frame) 'alpha ) - (progn - (set-frame-parameter (selected-frame) 'alpha '(85 . 70)) - (add-to-list 'default-frame-alist '(alpha . (85 . 70)))) - ;; Transparent Background - for Linux Xorg/Wayland - (set-frame-parameter nil 'alpha-background 93) ; For current frame - (add-to-list 'default-frame-alist '(alpha-background . 93))); For all new frames henceforth - -;; 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) -(setq warning-minimum-level :error) -;; 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. - -;; use alejandra to format nix files -(use-package! lsp-nix - :ensure lsp-mode - :after - (lsp-mode) - :demand t - :custom - (lsp-nix-nil-formatter - ["alejandra"])) - -(use-package! nushell-mode - :config - (setq nushell-enable-auto-indent 1)) -(after! vterm - (setq vterm-shell "nu")) ; use nushell by defualt - -;; emacs-rime -(use-package! rime - :custom - (default-input-method "rime") - (rime-librime-root "~/.local/share/emacs/librime")) - -;; use parinfer for lisp editing -(use-package! parinfer-rust-mode - :hook ((emacs-lisp-mode - clojure-mode - scheme-mode - lisp-mode - racket-mode - fennel-mode - hy-mode) . parinfer-rust-mode) - :init - ;; parinfer-rust library do not provide a apple silicon binary. - ;; fix: https://github.com/doomemacs/doomemacs/issues/6163 - (setq parinfer-rust-auto-download 0) - ;; we need to download it manually and put it in this path - (setq parinfer-rust-library "~/.local/share/emacs/parinfer-rust/parinfer-rust.so") - :config - (map! :map parinfer-rust-mode-map - :localleader - "p" #'parinfer-rust-switch-mode - "P" #'parinfer-rust-toggle-disable)) - -;; disable smatparens-mode here to void conflict with parinfer -;; https://discourse.doomemacs.org/t/disable-smartparens-or-parenthesis-completion/134 -(add-hook 'clojure-mode-hook #'turn-off-smartparens-mode) -(add-hook 'scheme-mode-hook #'turn-off-smartparens-mode) -(add-hook 'lisp-mode-hook #'turn-off-smartparens-mode) -(add-hook 'racket-mode-hook #'turn-off-smartparens-mode) -(add-hook 'fennel-mode-hook #'turn-off-smartparens-mode) -(add-hook 'hy-mode-hook #'turn-off-smartparens-mode) - -;; auto-save -(use-package super-save - :ensure t - :config - (super-save-mode +1) - (setq super-save-auto-save-when-idle t) - (setq auto-save-default nil)) - -;; save on find-file -(add-to-list 'super-save-hook-triggers 'find-file-hook) - -(use-package! copilot - :hook - (prog-mode . copilot-mode) - :bind - (:map copilot-completion-map - ("" . 'copilot-accept-completion) - ("TAB" . 'copilot-accept-completion) - ("C-TAB" . 'copilot-accept-completion-by-word) - ("C-" . 'copilot-accept-completion-by-word)) - :config - (copilot-mode +1)) - -(use-package! wakatime-mode :ensure t) - diff --git a/home/base/tui/editors/emacs/doom/init.el b/home/base/tui/editors/emacs/doom/init.el deleted file mode 100644 index af8b66c4..00000000 --- a/home/base/tui/editors/emacs/doom/init.el +++ /dev/null @@ -1,211 +0,0 @@ -;;; 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 +childframe) ; conflict with lsp-bridge - ; 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 ; 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) ; Emacs 29 provides native support for inserting Unicode emojis. - ; 🙂 - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - indent-guides ; highlighted indent columns - ligatures ; ligatures and symbols to make your code pretty again - modeline ; snazzy, Atom-inspired modeline, plus API - 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 +pretty) - ; 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 - ;; multiple-cursors ; editing in many places at once - ;; objed ; text object editing for the innocent, conflict with parinfer - parinfer ; turn lisp into python, sort of, conflict with copilot/objed/smartparens - ;;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) - ;;collab ; buffers with friends - ;;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) - lookup ; navigate your code and its documentation - lsp ; lsp-mode, conflict with lsp-bridge - 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 - (terraform) - ; infrastructure as code - tree-sitter ; syntax and parsing, sitting in a tree... - ;;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 +tree-sitter) - ; 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 +tree-sitter) ;; disable go-mode, use lsp-bridge instead - ; the hipster dialect - ;;(graphql) ; Give queries a REST - ;;(haskell) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - (json +lsp +tree-sitter) - ; At least it ain't XML - (java +lsp +tree-sitter) - ; the poster child for carpal tunnel syndrome - (javascript +lsp +tree-sitter) - ; 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 +lsp +tree-sitter) - ; one-based indices? one-based indices - (markdown +grip) - ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - (nix +lsp +tree-sitter) - ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - (org +pandoc +hugo +jupyter) ; organize your plain life in plain text - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - (python +lsp +tree-sitter +pyright) - ; 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 +lsp +tree-sitter) - ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - (scheme +guile) - ; a fully conniving family of lisps - (sh +lsp +tree-sitter) - ; 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 +lsp +tree-sitter) - ; support for various web languages, including HTML5, CSS, SASS/SCSS, Pug/Jade/Slim, and more - (yaml +lsp +tree-sitter) - ; 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/home/base/tui/editors/emacs/doom/packages.el b/home/base/tui/editors/emacs/doom/packages.el deleted file mode 100644 index 5a95f198..00000000 --- a/home/base/tui/editors/emacs/doom/packages.el +++ /dev/null @@ -1,64 +0,0 @@ -;; -*- 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'. - -(package! super-save) -(package! rime) -(package! wakatime-mode - :recipe - (:host github :repo "wakatime/wakatime-mode" :files - ("*.el" "dist"))) - -(package! nushell-mode :recipe - (:host github :repo "mrkkrp/nushell-mode")) - -(package! copilot - :recipe - (:host github :repo "copilot-emacs/copilot.el" :files - ("*.el" "dist"))) - -;; 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/radian-software/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 radian-software/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) diff --git a/home/base/tui/editors/emacs/doom/snippets/.keep b/home/base/tui/editors/emacs/doom/snippets/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/home/base/tui/editors/packages.nix b/home/base/tui/editors/packages.nix index 70db57ba..45bb4907 100644 --- a/home/base/tui/editors/packages.nix +++ b/home/base/tui/editors/packages.nix @@ -83,15 +83,6 @@ pyquery pyyaml boto3 - - ## emacs's lsp-bridge dependenciesge - # epc - # orjson - # sexpdata - # six - # setuptools - # paramiko - # rapidfuzz ] )) diff --git a/hosts/darwin-fern/home.nix b/hosts/darwin-fern/home.nix index b05d9d11..57e85c0a 100644 --- a/hosts/darwin-fern/home.nix +++ b/hosts/darwin-fern/home.nix @@ -11,8 +11,4 @@ IdentitiesOnly yes ''; }; - - modules.editors.emacs = { - enable = true; - }; } diff --git a/hosts/darwin-harmonica/home.nix b/hosts/darwin-harmonica/home.nix index 014180fd..0e311de0 100644 --- a/hosts/darwin-harmonica/home.nix +++ b/hosts/darwin-harmonica/home.nix @@ -11,7 +11,4 @@ _: { IdentitiesOnly yes ''; }; - modules.editors.emacs = { - enable = true; - }; } diff --git a/hosts/idols-ai/home.nix b/hosts/idols-ai/home.nix index 5361bcbc..1ed62c6c 100644 --- a/hosts/idols-ai/home.nix +++ b/hosts/idols-ai/home.nix @@ -12,9 +12,6 @@ }; }; }; - modules.editors.emacs = { - enable = true; - }; programs.ssh = { enable = true;