From 8379927ec705269cf51d876e1de33f192227b3df Mon Sep 17 00:00:00 2001 From: FollieHiyuki Date: Sun, 28 Mar 2021 04:14:11 +0300 Subject: [PATCH] emacs: adjust some settings --- README.md | 2 +- home/.config/doom/config.el | 5 ++--- home/.config/doom/init.el | 16 +++++++++------- home/.local/share/gnupg/gpg-agent.conf | 3 ++- setup/lua-language-server.sh | 4 ++-- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 3951b31..fe41327 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ - **Shell prompt:** [starship](https://starship.rs/) - **Anime/Manga/Wallpaper:** [gallery-dl](https://github.com/mikf/gallery-dl) / [mangadl-bash](https://github.com/Akianonymus/mangadl-bash), [anime-downloader](https://github.com/anime-dl/anime-downloader) + [trackma](https://github.com/z411/trackma) + [adl](https://github.com/RaitaroH/adl) / [anigrab](https://github.com/ngomile/anigrab) - **CLI/TUI for the Internet:** [translate-shell](https://github.com/soimort/translate-shell) / [argos-translate](https://github.com/argosopentech/argos-translate), [ddgr](https://github.com/jarun/ddgr), [howdoi](https://github.com/gleitz/howdoi), [amfora](https://github.com/makeworld-the-better-one/amfora), [cointop](https://github.com/miguelmota/cointop), [newsboat](https://github.com/newsboat/newsboat), [youtube-dl](https://github.com/ytdl-org/youtube-dl) + [ytmdl](https://github.com/deepjyoti30/ytmdl) / [pipe-viewer](https://github.com/trizen/pipe-viewer), [github-cli](https://github.com/cli/cli), [pup](https://github.com/ericchiang/pup), [weechat](https://github.com/weechat/weechat), [curl](https://curl.haxx.se) / [wget](https://www.gnu.org/software/wget/wget.html) / [aria2](https://github.com/aria2/aria2), [tremc](https://github.com/tremc/tremc) + [transmission](https://github.com/transmission/transmission) / [rtorrent](https://github.com/rakshasa/rtorrent), [goaccess](https://github.com/allinurl/goaccess) - - **CLI/TUI for other things:** [tt](https://github.com/runrin/tt), [forgit](https://github.com/wfxr/forgit), [borg](https://github.com/borgbackup/borg), [wendy](https://git.z3bra.org/wendy/log.html), [tokei](https://github.com/XAMPPRocky/tokei), [onefetch](https://github.com/o2sh/onefetch), [calcurse](https://github.com/lfos/calcurse), [qalculate](https://github.com/Qalculate/libqalculate), [fzf](https://github.com/junegunn/fzf), [fd](https://github.com/sharkdp/fd), [ripgrep](https://github.com/BurntSushi/ripgrep), [atool](http://www.nongnu.org/atool/), [rsync](https://rsync.samba.org/), [bottom](https://github.com/clementtsang/bottom), [hyperfine](https://github.com/sharkdp/hyperfine), [delta](https://github.com/dandavison/delta), [bat](https://github.com/sharkdp/bat), [glow](https://github.com/charmbracelet/glow) / [mdcat](https://github.com/lunaryorn/mdcat) / [mdr](https://github.com/MichaelMure/mdr), [exa](https://github.com/ogham/exa), [pandoc](https://github.com/jgm/pandoc), [csview](https://github.com/wfxr/csview), [libsixel](https://github.com/saitoha/libsixel), [buku](https://github.com/jarun/buku), [jq](https://github.com/stedolan/jq), [zoxide](https://github.com/ajeetdsouza/zoxide) / [z.lua](https://github.com/skywind3000/z.lua), [xlsx2csv](https://github.com/dilshod/xlsx2csv), [qrencode](https://github.com/fukuchi/libqrencode), sysstat, psmisc, wireless_tools, tree, renameutils + - **CLI/TUI for other things:** [tt](https://github.com/runrin/tt), [forgit](https://github.com/wfxr/forgit), [borg](https://github.com/borgbackup/borg), [wendy](https://git.z3bra.org/wendy/log.html), [tokei](https://github.com/XAMPPRocky/tokei), [onefetch](https://github.com/o2sh/onefetch), [calcurse](https://github.com/lfos/calcurse), [qalculate](https://github.com/Qalculate/libqalculate), [fzf](https://github.com/junegunn/fzf), [fd](https://github.com/sharkdp/fd), [ripgrep](https://github.com/BurntSushi/ripgrep), [atool](http://www.nongnu.org/atool/), [rsync](https://rsync.samba.org/), [bottom](https://github.com/clementtsang/bottom), [hyperfine](https://github.com/sharkdp/hyperfine), [delta](https://github.com/dandavison/delta), [bat](https://github.com/sharkdp/bat), [glow](https://github.com/charmbracelet/glow) / [mdcat](https://github.com/lunaryorn/mdcat) / [mdr](https://github.com/MichaelMure/mdr), [exa](https://github.com/ogham/exa), [pandoc](https://github.com/jgm/pandoc), [csview](https://github.com/wfxr/csview), [libsixel](https://github.com/saitoha/libsixel), [buku](https://github.com/jarun/buku), [jq](https://github.com/stedolan/jq), [zoxide](https://github.com/ajeetdsouza/zoxide) / [z.lua](https://github.com/skywind3000/z.lua), [xlsx2csv](https://github.com/dilshod/xlsx2csv), [qrencode](https://github.com/fukuchi/libqrencode), [hledger](https://github.com/simonmichael/hledger), sysstat, psmisc, wireless_tools, tree, renameutils - **Selfhosted service:** [LibreTranslate](https://github.com/uav4geo/LibreTranslate), [searx](https://github.com/searx/searx), [yacy](https://github.com/yacy/yacy_search_server), [synapse](https://github.com/matrix-org/synapse), [mastodon](https://github.com/tootsuite/mastodon), [gitea](https://gitea.io/) > `Emacs` deserves its own set of dependencies listed, but I'm lazy -> Check my Doom config for details diff --git a/home/.config/doom/config.el b/home/.config/doom/config.el index 25a8ffe..29fdff8 100644 --- a/home/.config/doom/config.el +++ b/home/.config/doom/config.el @@ -152,9 +152,8 @@ "--header-insertion-decorators")) (after! lsp-clangd (set-lsp-priority! 'clangd 2)) ;; Prefer clangd instead of default ccls (after! lsp-lua - (setq lua-lsp-dir (expand-file-name "lsp/lua-language-server/" doom-etc-dir) - lsp-clients-lua-language-server-bin (expand-file-name "bin/Linux/lua-language-server" lua-lsp-dir) - lsp-clients-lua-language-server-main-location (expand-file-name "main.lua" lua-lsp-dir) + (setq lsp-clients-lua-language-server-bin (expand-file-name "lsp/lua-language-server/bin/Linux/lua-language-server" doom-etc-dir) + lsp-clients-lua-language-server-main-location (expand-file-name "lsp/lua-language-server/main.lua" doom-etc-dir) lsp-lua-completion-call-snippet "Replace" lsp-lua-telemetry-enable nil lsp-lua-hint-enable t)) diff --git a/home/.config/doom/init.el b/home/.config/doom/init.el index a714302..e2a0908 100644 --- a/home/.config/doom/init.el +++ b/home/.config/doom/init.el @@ -26,7 +26,8 @@ ;;ido ; the other *other* search engine... (ivy ; a search engine for love and life +fuzzy - ;;+prescient + +prescient + ;;+childframe +icons) :ui @@ -55,7 +56,7 @@ 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 + vi-tilde-fringe ; fringe tildes to mark beyond EOB (window-select ; visually switch windows +numbers) workspaces ; tab emulation, persistence & separate workspaces @@ -120,7 +121,7 @@ rgb ; creating color strings ;;taskrunner ; taskrunner for all your projects ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux + tmux ; an API for interacting with tmux ;;upload ; map local to remote projects via ssh/ftp :os @@ -163,9 +164,10 @@ ;;lean ;;factor ;;ledger ; an accounting system in Emacs - (lua +lsp) ; one-based indices? one-based indices - (markdown ; writing docs for people to ignore - +grip) + (lua ; one-based indices? one-based indices + +moonscript + +lsp) + (markdown +grip) ; 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 @@ -196,7 +198,7 @@ ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good - ;;scheme ; a fully conniving family of lisps + scheme ; a fully conniving family of lisps (sh ; she sells {ba,z,fi}sh shells on the C xor +lsp +fish) diff --git a/home/.local/share/gnupg/gpg-agent.conf b/home/.local/share/gnupg/gpg-agent.conf index bdd9306..e3806ad 100644 --- a/home/.local/share/gnupg/gpg-agent.conf +++ b/home/.local/share/gnupg/gpg-agent.conf @@ -11,5 +11,6 @@ enable-ssh-support # the default password prompt allow-emacs-pinentry -pinentry-program /usr/bin/pinentry-curses +#pinentry-program /usr/bin/pinentry-curses #pinentry-program /usr/bin/pinentry-gnome3 +pinentry-program /usr/bin/pinentry-qt diff --git a/setup/lua-language-server.sh b/setup/lua-language-server.sh index 90a424f..8d7ef08 100755 --- a/setup/lua-language-server.sh +++ b/setup/lua-language-server.sh @@ -16,7 +16,7 @@ cd ../ # For coc.nvim mkdir -pv ~/.local/share/nvim/lsp -cp -rfv lua-language-server ~/.local/share/nvim/lsp/ +cp -rf lua-language-server ~/.local/share/nvim/lsp/ && echo "Copied to ~/.local/share/nvim/lsp/lua-language-server" # For Doom Emacs mkdir -pv ~/.config/emacs/.local/etc/lsp -mv -rv lua-language-server ~/.config/emacs/.local/etc/lsp/ +mv -fv lua-language-server ~/.config/emacs/.local/etc/lsp/