Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ed138d143a
4 changed files with 28 additions and 10 deletions
|
|
@ -12,4 +12,13 @@ set fish_greeting ""
|
||||||
set EDITOR vi
|
set EDITOR vi
|
||||||
set -x GOPATH ~/.go
|
set -x GOPATH ~/.go
|
||||||
|
|
||||||
|
if test -e $HOME/.asdf/asdf.fish
|
||||||
|
. ~/.asdf/asdf.fish
|
||||||
|
end
|
||||||
|
|
||||||
. ~/.config/fish/fish_aliases.fish
|
. ~/.config/fish/fish_aliases.fish
|
||||||
|
|
||||||
|
# The next line updates PATH for the Google Cloud SDK.
|
||||||
|
if [ -f '/home/barak/local/google-cloud-sdk/path.fish.inc' ]; . '/home/barak/local/google-cloud-sdk/path.fish.inc'; end
|
||||||
|
|
||||||
|
set GOOGLE_APPLICATION_CREDENTIALS "/home/barak/.memtoken.json"
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,13 @@ k9s:
|
||||||
refreshRate: 2
|
refreshRate: 2
|
||||||
maxConnRetry: 5
|
maxConnRetry: 5
|
||||||
enableMouse: true
|
enableMouse: true
|
||||||
headless: true
|
headless: false
|
||||||
logoless: true
|
logoless: true
|
||||||
crumbsless: false
|
crumbsless: false
|
||||||
readOnly: false
|
readOnly: false
|
||||||
|
noExitOnCtrlC: false
|
||||||
noIcons: true
|
noIcons: true
|
||||||
|
skipLatestRevCheck: false
|
||||||
logger:
|
logger:
|
||||||
tail: 100
|
tail: 100
|
||||||
buffer: 5000
|
buffer: 5000
|
||||||
|
|
@ -14,27 +16,30 @@ k9s:
|
||||||
fullScreenLogs: false
|
fullScreenLogs: false
|
||||||
textWrap: false
|
textWrap: false
|
||||||
showTime: false
|
showTime: false
|
||||||
currentContext: kubernetes-admin@kubernetes
|
currentContext: gke_memvp-25499_us-central1-c_ke-cluster-1
|
||||||
currentCluster: kubernetes
|
currentCluster: gke_memvp-25499_us-central1-c_ke-cluster-1
|
||||||
clusters:
|
clusters:
|
||||||
kubernetes:
|
gke_memvp-25499_us-central1-c_ke-cluster-1:
|
||||||
namespace:
|
namespace:
|
||||||
active: all
|
active: all
|
||||||
|
lockFavorites: false
|
||||||
favorites:
|
favorites:
|
||||||
|
- backfill
|
||||||
- all
|
- all
|
||||||
- default
|
- default
|
||||||
view:
|
view:
|
||||||
active: pods
|
active: job
|
||||||
featureGates:
|
featureGates:
|
||||||
nodeShell: false
|
nodeShell: false
|
||||||
shellPod:
|
shellPod:
|
||||||
image: busybox:1.31
|
image: busybox:1.35.0
|
||||||
command: []
|
command: []
|
||||||
args: []
|
args: []
|
||||||
namespace: default
|
namespace: default
|
||||||
limits:
|
limits:
|
||||||
cpu: 100m
|
cpu: 100m
|
||||||
memory: 100Mi
|
memory: 100Mi
|
||||||
|
labels: {}
|
||||||
portForwardAddress: localhost
|
portForwardAddress: localhost
|
||||||
thresholds:
|
thresholds:
|
||||||
cpu:
|
cpu:
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ local runtime_path = vim.split(package.path, ';')
|
||||||
table.insert(runtime_path, "lua/?.lua")
|
table.insert(runtime_path, "lua/?.lua")
|
||||||
table.insert(runtime_path, "lua/?/init.lua")
|
table.insert(runtime_path, "lua/?/init.lua")
|
||||||
|
|
||||||
require 'lspconfig'.sumneko_lua.setup {
|
require 'lspconfig'.lua_ls.setup {
|
||||||
settings = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
runtime = {
|
runtime = {
|
||||||
|
|
@ -103,7 +103,7 @@ end
|
||||||
nvim_lsp.efm.setup {
|
nvim_lsp.efm.setup {
|
||||||
init_options = { documentFormatting = true },
|
init_options = { documentFormatting = true },
|
||||||
settings = {
|
settings = {
|
||||||
rootMarkers = { ".git/" },
|
rootMarkers = { ".git/", "package.json" },
|
||||||
languages = {
|
languages = {
|
||||||
lua = {
|
lua = {
|
||||||
{ formatCommand = "lua-format -i", formatStdin = true }
|
{ formatCommand = "lua-format -i", formatStdin = true }
|
||||||
|
|
@ -113,6 +113,9 @@ nvim_lsp.efm.setup {
|
||||||
},
|
},
|
||||||
rust = {
|
rust = {
|
||||||
{ formatCommand = 'rustfmt', formatStdin = true }
|
{ formatCommand = 'rustfmt', formatStdin = true }
|
||||||
|
},
|
||||||
|
typescript = {
|
||||||
|
{ formatCommand = 'pnpm exec eslint --fix' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
5
.vimrc
5
.vimrc
|
|
@ -147,7 +147,7 @@ Plug 'honza/vim-snippets'
|
||||||
Plug 'tpope/vim-abolish'
|
Plug 'tpope/vim-abolish'
|
||||||
"Plug 'sheerun/vim-polyglot'
|
"Plug 'sheerun/vim-polyglot'
|
||||||
Plug 'Shougo/denite.nvim'
|
Plug 'Shougo/denite.nvim'
|
||||||
Plug 'plytophogy/vim-virtualenv'
|
"Plug 'plytophogy/vim-virtualenv'
|
||||||
"Plug 'ervandew/supertab'
|
"Plug 'ervandew/supertab'
|
||||||
"Plug 'ncm2/ncm2'
|
"Plug 'ncm2/ncm2'
|
||||||
"Plug 'roxma/nvim-yarp'
|
"Plug 'roxma/nvim-yarp'
|
||||||
|
|
@ -300,8 +300,9 @@ autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false})
|
||||||
autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_seq_sync(nil, 1000)
|
autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_seq_sync(nil, 1000)
|
||||||
autocmd BufWritePre *.py lua vim.lsp.buf.formatting_seq_sync(nil, 1000)
|
autocmd BufWritePre *.py lua vim.lsp.buf.formatting_seq_sync(nil, 1000)
|
||||||
autocmd BufWritePre *.rs lua vim.lsp.buf.formatting_seq_sync(nil, 1000)
|
autocmd BufWritePre *.rs lua vim.lsp.buf.formatting_seq_sync(nil, 1000)
|
||||||
autocmd BufWritePre *.go lua vim.lsp.buf.formatting_seq_sync(nil, 1000)
|
autocmd BufWritePre *.go lua vim.lsp.buf.format({ async = false })
|
||||||
autocmd BufWritePre *.go silent! lua org_imports(3000)
|
autocmd BufWritePre *.go silent! lua org_imports(3000)
|
||||||
|
autocmd BufWritePre *.ts lua vim.lsp.buf.format({ async = false })
|
||||||
|
|
||||||
" Goto previous/next diagnostic warning/error
|
" Goto previous/next diagnostic warning/error
|
||||||
nnoremap <silent> g[ <cmd>lua vim.diagnostic.goto_prev()<CR>
|
nnoremap <silent> g[ <cmd>lua vim.diagnostic.goto_prev()<CR>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue