From fb68bbe163329a9faf7d83ff1807e2467f8bf3bb Mon Sep 17 00:00:00 2001 From: g-erson Date: Thu, 23 Mar 2023 11:21:36 +0000 Subject: [PATCH] updated --- .zshrc | 5 ++++- init.vim | 12 ++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.zshrc b/.zshrc index bf5e075..c83ab7d 100644 --- a/.zshrc +++ b/.zshrc @@ -173,7 +173,7 @@ if [ -f '/Users/g-erson/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then . [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh export PATH="/usr/local/opt/mysql-client/bin:$PATH" export PATH="/usr/local/lib/node_modules:$PATH" -export NODE_PATH=`npm root -g` +export NODE_PATH=$NODE_PATH:`npm root -g` export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion @@ -183,5 +183,8 @@ export PATH="/usr/local/opt/php@7.4/sbin:$PATH" export PATH="/Users/g-erson/projects/faust2er301/bin:$PATH" [ -f "/Users/g-erson/.ghcup/env" ] && source "/Users/g-erson/.ghcup/env" # ghcup-env +if [ -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' ]; then + . '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh' +fi export ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true \ No newline at end of file diff --git a/init.vim b/init.vim index 49648d5..2428b14 100644 --- a/init.vim +++ b/init.vim @@ -305,15 +305,15 @@ lua <wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'rf', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', 'lua vim.diagnostic.open_float()', opts) + buf_set_keymap('n', 'gtd', 'lua vim.lsp.buf.type_definition()', opts) + buf_set_keymap('n', ',rn', 'lua vim.lsp.buf.rename()', opts) + buf_set_keymap('n', ',ka', 'lua vim.lsp.buf.code_action()', opts) + buf_set_keymap('n', 'grf', 'lua vim.lsp.buf.references()', opts) + buf_set_keymap('n', ',d', 'lua vim.diagnostic.open_float()', opts) buf_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', opts) buf_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', opts) buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) - buf_set_keymap('n', 'f', 'lua vim.lsp.buf.format()', opts) + buf_set_keymap('n', ',f', 'lua vim.lsp.buf.format()', opts) end -- Use a loop to conveniently call 'setup' on multiple servers and