Merge branch 'main' of gitlab.com:elitherl/dotfiles into main

This commit is contained in:
Evie Litherland-Smith 2023-03-23 13:31:56 +00:00
commit ea361e8e36
6 changed files with 15 additions and 5 deletions

View file

@ -51,7 +51,6 @@ fi
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
command -v pyenv >/dev/null && eval "$(pyenv init -)"
command -v direnv > /dev/null 2>&1 && eval "$(direnv hook bash)" command -v direnv > /dev/null 2>&1 && eval "$(direnv hook bash)"
command -v starship > /dev/null 2>&1 && eval "$(starship init bash)" command -v starship > /dev/null 2>&1 && eval "$(starship init bash)"

1
.zshrc
View file

@ -52,7 +52,6 @@ fi
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
command -v pyenv >/dev/null && eval "$(pyenv init -)"
command -v direnv > /dev/null 2>&1 && eval "$(direnv hook zsh)" command -v direnv > /dev/null 2>&1 && eval "$(direnv hook zsh)"
command -v starship > /dev/null 2>&1 && eval "$(starship init zsh)" command -v starship > /dev/null 2>&1 && eval "$(starship init zsh)"

View file

@ -1,5 +1,4 @@
if status is-interactive if status is-interactive
set -gx PYENV_ROOT $HOME/.pyenv set -gx PYENV_ROOT $HOME/.pyenv
set -g fish_user_paths $PYENV_ROOT/bin $fish_user_paths set -g fish_user_paths $PYENV_ROOT/bin $fish_user_paths
pyenv init - | source
end end

View file

@ -13,4 +13,8 @@ return {
lazy = "💤 ", lazy = "💤 ",
}, },
}, },
checker = {
enabled = true,
frequency = 86400,
},
} }

View file

@ -2,7 +2,6 @@ return {
highlight = { highlight = {
enable = true, enable = true,
additional_vim_regex_highlighting = false, additional_vim_regex_highlighting = false,
disable = { "fortran" },
}, },
incremental_selection = { incremental_selection = {
enable = true, enable = true,
@ -15,7 +14,6 @@ return {
}, },
indent = { indent = {
enable = true, enable = true,
-- disable = { "python" },
}, },
refactor = { refactor = {
smart_rename = { smart_rename = {

View file

@ -39,12 +39,20 @@ cmp.setup {
}, },
sources = { sources = {
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" },
}, },
} }
-- Set configuration for specific filetype. -- Set configuration for specific filetype.
cmp.setup.filetype("python", {
sources = {
{ name = "nvim_lsp" },
},
})
cmp.setup.filetype("gitcommit", { cmp.setup.filetype("gitcommit", {
sources = { sources = {
{ name = "nvim_lsp" },
{ name = "git" }, { name = "git" },
{ name = "spell" }, { name = "spell" },
{ name = "commit" }, { name = "commit" },
@ -56,6 +64,7 @@ cmp.setup.filetype("gitcommit", {
cmp.setup.filetype("markdown", { cmp.setup.filetype("markdown", {
sources = { sources = {
{ name = "nvim_lsp" },
{ name = "spell" }, { name = "spell" },
{ name = "buffer" }, { name = "buffer" },
{ name = "luasnip" }, { name = "luasnip" },
@ -66,6 +75,7 @@ cmp.setup.filetype("markdown", {
cmp.setup.cmdline("/", { cmp.setup.cmdline("/", {
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
sources = { sources = {
{ name = "nvim_lsp" },
{ name = "buffer" }, { name = "buffer" },
}, },
}) })
@ -73,6 +83,7 @@ cmp.setup.cmdline("/", {
cmp.setup.cmdline(":", { cmp.setup.cmdline(":", {
mapping = cmp.mapping.preset.cmdline(), mapping = cmp.mapping.preset.cmdline(),
sources = { sources = {
{ name = "nvim_lsp" },
{ name = "path" }, { name = "path" },
{ name = "cmdline" }, { name = "cmdline" },
}, },