ange/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: work

Browse Source
This commit is contained in:
AngeD 2022-12-13 11:13:21 +01:00
commit 068145589b
9 changed files with 65 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.config/nvim/init.lua
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

1
.config/nvim/lua/pack-easy-align.lua
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)")

58
.config/nvim/lua/pack-lspconfig.lua
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
.config/nvim/pack/plugins/opt/black

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

2
.config/nvim/pack/plugins/opt/lspconfig

@ -1 +1 @@
Subproject commit 3bb0c53b1df74d4b3b70d5939a015b19064a5a06
Subproject commit 0c038493b37e67bed287ff99722a9ced5cdfe617

2
.config/nvim/pack/plugins/opt/treesitter

@ -1 +1 @@
Subproject commit 619f1ace03860d668c7a661332c38480f2db2584
Subproject commit ae0317d78a9f6fad78870d6645b60528e13ae6fa

2
.config/zsh/.zsh_aliases
View File

@ -2,7 +2,7 @@
alias cls='clear && ls -lah'
alias startgui='sway 2> $HOME/sway.log'
alias tmp='cd $(mktemp -d)'
alias update="paru -Syu; sudo npm update -g; pip freeze | cut -f1 -d= | xargs pip install -U; config submodule update --remote --recursive --init"
alias update="paru -Syu; pip freeze | cut -f1 -d= | xargs pip install -U; config submodule update --remote --recursive --init"
alias vi='$EDITOR'
# conf

38
.config/zsh/custom/themes/simpletheme.zsh-theme
View File

@ -1,12 +1,36 @@
PROMPT='$(kube_ps1)
%(?::%{$fg_bold[red]%}%? )%{$fg_bold[cyan]%}%~%{$reset_color%} $(git_prompt_info)'
KUBE_PS1_KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}"
KUBE_PS1_KUBECONFIGMD5=
KUBE_PS1_CTX=
KUBE_PS1_NS=
_update_KUBE_PS1() {
local md5="$(md5sum $KUBE_PS1_KUBECONFIG)"
[[ "$md5" == "$KUBE_PS1_KUBECONFIGMD5" ]] && return
KUBE_PS1_KUBECONFIGMD5="$md5"
KUBE_PS1_CTX="$(kubectl config current-context)"
KUBE_PS1_NS="$(kubectl config view --minify -o jsonpath='{..namespace}')"
}
precmd() {
_update_KUBE_PS1
local ctx="$KUBE_PS1_CTX"
local ns="$KUBE_PS1_NS"
local symbol='\u2388 '
local sep='/'
local bg='\e[44m'
local reset='\e[0m'
#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"
}
PROMPT='%(?::%{$fg_bold[red]%}%? )%{$fg_bold[cyan]%}%~%{$reset_color%} $(git_prompt_info)'
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗"
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
KUBE_PS1_PREFIX=
KUBE_PS1_SEPARATOR=' '
KUBE_PS1_DIVIDER=/
KUBE_PS1_SUFFIX=

2
.config/zsh/ohmyzsh

@ -1 +1 @@
Subproject commit 82c0db41bcfd3fd97d6170dcb7575f98e38fc68d
Subproject commit 29cf199b5d84eb4897f2e0e421a344174568eb9f