summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zshrc7
-rw-r--r--alacritty/alacritty.toml2
-rw-r--r--nvim/init.lua13
3 files changed, 19 insertions, 3 deletions
diff --git a/.zshrc b/.zshrc
index 8b295c3..a602c3c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -8,7 +8,7 @@ HISTFILE=~/.zsh_history
HISTSIZE=5000
SAVEHIST=5000
-bindkey -v
+# bindkey -v
export KEYTIMEOUT=1
autoload -Uz compinit && compinit
@@ -21,6 +21,7 @@ PROMPT='%F{green}%n@%m%f %F{yellow}%~%f '
export CLICOLOR=1
export LSCOLORS=GxFxCxDxBxegedabagaced
export PATH="$HOME/.local/omnisharp:$PATH"
+export PATH="$HOME/.dotnet/tools:$PATH"
alias grep='grep --color=auto'
alias ll='lsd -all'
@@ -48,3 +49,7 @@ if command -v tmux >/dev/null 2>&1; then
fi
fi
PATH=~/cli/sf/bin:$PATH
+
+export PYENV_ROOT="$HOME/.pyenv"
+[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init - zsh)"
diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml
index ab71900..43bd365 100644
--- a/alacritty/alacritty.toml
+++ b/alacritty/alacritty.toml
@@ -5,7 +5,7 @@ decorations = "full"
[font]
normal = { family = "JetBrainsMonoNF", style = "Regular" }
-size = 11.0
+size = 12.0
[terminal.shell]
program = "/bin/zsh"
diff --git a/nvim/init.lua b/nvim/init.lua
index e851b31..b42bedd 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -79,8 +79,18 @@ lspconfig.lua_ls.setup({
},
})
+lspconfig.pyright.setup({
+ capabilities = capabilities,
+ on_attach = on_attach,
+ on_new_config = function(config, root_dir)
+ local env = vim.trim(vim.fn.system('cd "' .. root_dir .. '"; poetry env info -p 2>/dev/null'))
+ if string.len(env) > 0 then
+ config.settings.python.pythonPath = env .. '/bin/python'
+ end
+ end
+})
+
lspconfig.jdtls.setup({})
-lspconfig.pyright.setup({})
lspconfig.cssls.setup({})
lspconfig.clangd.setup({})
@@ -99,6 +109,7 @@ lspconfig.omnisharp.setup({
vim.keymap.set("n", "K", vim.diagnostic.open_float, { noremap = true, silent = true })
vim.keymap.set("i", "<C-s>", vim.lsp.buf.signature_help, { buffer = true })
+vim.keymap.set("x", "<leader>p", '"_dP', { desc = "aaaa" })
local cmp = require("cmp")
local cmp_autopairs = require("nvim-autopairs.completion.cmp")