diff --git a/constants.nix b/constants.nix index 038fef18..53da8ed1 100644 --- a/constants.nix +++ b/constants.nix @@ -9,7 +9,7 @@ rec { x64_system = "x86_64-linux"; riscv64_system = "riscv64-linux"; aarch64_system = "aarch64-linux"; - # darwin systems + #darwin systems x64_darwin = "x86_64-darwin"; aarch64_darwin = "aarch64-darwin"; }; diff --git a/home/base/desktop/editors/emacs/README.md b/home/base/desktop/editors/emacs/README.md index a6082ced..7dac09f5 100644 --- a/home/base/desktop/editors/emacs/README.md +++ b/home/base/desktop/editors/emacs/README.md @@ -1,7 +1,9 @@ # Emacs Editor - Framework: - - key bindings: + - key bindings: + - source code: + - docs: - Chinese(rime) support: - modal editing: - : evil mode, enabled by default in doom-emacs. @@ -81,7 +83,8 @@ The same as neovim/vim: | Code Actions | ` + ca` | | Rename | ` + cr` | | Opening LSP symbols | ` + cS` | -| Comment Line(support multiple lines) | ` + /` | +| (Un)Comment the selected context | `gc` | +| (Un)Comment the current line | `gcc` | | Open filepath/URL at cursor | `gf` | | Find files by keyword in path | ` + ` | | Grep string in files (vertico + ripgrep) | ` + sd` | diff --git a/home/base/desktop/editors/emacs/doom/config.el b/home/base/desktop/editors/emacs/doom/config.el index d8deeec5..0a77ecf4 100644 --- a/home/base/desktop/editors/emacs/doom/config.el +++ b/home/base/desktop/editors/emacs/doom/config.el @@ -32,7 +32,11 @@ ;; 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-one) +;; (setq doom-theme 'doom-one) +;; https://github.com/catppuccin/emacs/ +(setq doom-theme 'catppuccin) +(setq catppuccin-flavor 'mocha) ;; or 'latte, 'macchiato, or 'frappe +(catppuccin-reload) ;; 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'. diff --git a/home/base/desktop/editors/emacs/doom/packages.el b/home/base/desktop/editors/emacs/doom/packages.el index e1d7557b..590f56ca 100644 --- a/home/base/desktop/editors/emacs/doom/packages.el +++ b/home/base/desktop/editors/emacs/doom/packages.el @@ -14,6 +14,7 @@ (package! wakatime-mode :recipe (:host github :repo "wakatime/wakatime-mode" :files ("*.el" "dist"))) +(package! catppuccin-theme) ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: ;; (package! some-package)