feat: remove node / npm, fix zsh theme + color

This commit is contained in:
AngeD 2022-12-13 11:04:59 +01:00
parent 0c36458c4e
commit 0af4b67ab6
8 changed files with 37 additions and 39 deletions

View File

@ -14,6 +14,7 @@ vim.o.list = true
vim.o.number = true
vim.o.relativenumber = true
vim.o.laststatus = 3
vim.o.cmdheight = 0
vim.o.ignorecase = true
vim.o.smartcase = true

View File

@ -1,3 +1,4 @@
vim.cmd("packadd easy-align")
vim.keymap.set("n", "ga", "<Plug>(EasyAlign)")
vim.keymap.set("x", "ga", "<Plug>(EasyAlign)")

View File

@ -1,7 +1,33 @@
vim.cmd("packadd lspconfig")
lspconfig = require"lspconfig"
local servers = {
"jedi_language_server",
}
local on_attach = function(client, bufnr)
-- Enable completion triggered by <c-x><c-o>
vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
-- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap=true, silent=true, buffer=bufnr }
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts)
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts)
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts)
vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, bufopts)
vim.keymap.set("n", "<Leader>wa", vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set("n", "<Leader>wr", vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set("n", "<Leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set("n", "<Leader>D", vim.lsp.buf.type_definition, bufopts)
vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename, bufopts)
vim.keymap.set("n", "<Leader>ca", vim.lsp.buf.code_action, bufopts)
vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts)
end
-- Mappings.
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
local opts = { noremap=true, silent=true }
@ -10,34 +36,6 @@ vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
vim.keymap.set("n", "<Leader>q", vim.diagnostic.setloclist, opts)
local servers = {
"bashls",
"pyright",
}
for _, server in ipairs(servers) do
lspconfig[server].setup {
on_attach = function(client, bufnr)
-- Enable completion triggered by <c-x><c-o>
vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
-- Mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local bufopts = { noremap=true, silent=true, buffer=bufnr }
vim.keymap.set("n", "gD", vim.lsp.buf.declaration, bufopts)
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts)
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts)
vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, bufopts)
vim.keymap.set("n", "<Leader>wa", vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set("n", "<Leader>wr", vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set("n", "<Leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set("n", "<Leader>D", vim.lsp.buf.type_definition, bufopts)
vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename, bufopts)
vim.keymap.set("n", "<Leader>ca", vim.lsp.buf.code_action, bufopts)
vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts)
end
}
lspconfig[server].setup {on_attach = on_attach}
end

@ -1 +0,0 @@
Subproject commit d4a85643a465f5fae2113d07d22d021d4af4795a

@ -1 +1 @@
Subproject commit c7206327096bedf2e213788a60624a84b3b7552d
Subproject commit 0c038493b37e67bed287ff99722a9ced5cdfe617

@ -1 +1 @@
Subproject commit 0b00eb4b826bde517e87a0993bdb8409435b2378
Subproject commit ae0317d78a9f6fad78870d6645b60528e13ae6fa

View File

@ -2,7 +2,7 @@
alias cls='clear && ls -lah'
alias startgui='startx'
alias tmp='cd $(mktemp -d)'
alias update="sudo apt-get update && sudo apt-get upgrade; sudo npm update -g; pip freeze | cut -f1 -d= | xargs pip install -U; config submodule update --remote --recursive --init"
alias update="sudo apt-get update && sudo apt-get upgrade; pip freeze | cut -f1 -d= | xargs pip install -U; config submodule update --remote --recursive --init"
alias vi='$EDITOR'
# conf

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
KUBE_PS1_KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}"
KUBE_PS1_KUBECONFIGMD5=
KUBE_PS1_CTX=
@ -20,11 +19,11 @@ precmd() {
local ns="$KUBE_PS1_NS"
local symbol='\u2388 '
local sep='/'
local bg='\e[45m'
local bg='\e[44m'
local reset='\e[0m'
#local end=" $reset\e[35m\ue0b4" # 
#local end=" $reset\e[35m\ue0bc" # 
local end=" $reset\e[35m\ue0b0" # 
#local end=" $reset\e[34m\ue0b4" # 
#local end=" $reset\e[34m\ue0bc" # 
local end=" $reset\e[34m\ue0b0" # 
echo "$bg$symbol$ctx$sep$ns$end$reset"
}