diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 85134a2..8160044 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -12,4 +12,13 @@ set fish_greeting "" set EDITOR vi set -x GOPATH ~/.go +if test -e $HOME/.asdf/asdf.fish + . ~/.asdf/asdf.fish +end + . ~/.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" diff --git a/.config/k9s/config.yml b/.config/k9s/config.yml index 09a109e..9bf600b 100644 --- a/.config/k9s/config.yml +++ b/.config/k9s/config.yml @@ -2,11 +2,13 @@ k9s: refreshRate: 2 maxConnRetry: 5 enableMouse: true - headless: true + headless: false logoless: true crumbsless: false readOnly: false + noExitOnCtrlC: false noIcons: true + skipLatestRevCheck: false logger: tail: 100 buffer: 5000 @@ -14,27 +16,30 @@ k9s: fullScreenLogs: false textWrap: false showTime: false - currentContext: kubernetes-admin@kubernetes - currentCluster: kubernetes + currentContext: gke_memvp-25499_us-central1-c_ke-cluster-1 + currentCluster: gke_memvp-25499_us-central1-c_ke-cluster-1 clusters: - kubernetes: + gke_memvp-25499_us-central1-c_ke-cluster-1: namespace: active: all + lockFavorites: false favorites: + - backfill - all - default view: - active: pods + active: job featureGates: nodeShell: false shellPod: - image: busybox:1.31 + image: busybox:1.35.0 command: [] args: [] namespace: default limits: cpu: 100m memory: 100Mi + labels: {} portForwardAddress: localhost thresholds: cpu: diff --git a/.vim/nvim.lua b/.vim/nvim.lua index 90b225a..e1bb878 100644 --- a/.vim/nvim.lua +++ b/.vim/nvim.lua @@ -55,7 +55,7 @@ local runtime_path = vim.split(package.path, ';') table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?/init.lua") -require 'lspconfig'.sumneko_lua.setup { +require 'lspconfig'.lua_ls.setup { settings = { Lua = { runtime = { @@ -103,7 +103,7 @@ end nvim_lsp.efm.setup { init_options = { documentFormatting = true }, settings = { - rootMarkers = { ".git/" }, + rootMarkers = { ".git/", "package.json" }, languages = { lua = { { formatCommand = "lua-format -i", formatStdin = true } @@ -113,6 +113,9 @@ nvim_lsp.efm.setup { }, rust = { { formatCommand = 'rustfmt', formatStdin = true } + }, + typescript = { + { formatCommand = 'pnpm exec eslint --fix' } } } } diff --git a/.vimrc b/.vimrc index f8aec23..d34bebb 100644 --- a/.vimrc +++ b/.vimrc @@ -147,7 +147,7 @@ Plug 'honza/vim-snippets' Plug 'tpope/vim-abolish' "Plug 'sheerun/vim-polyglot' Plug 'Shougo/denite.nvim' -Plug 'plytophogy/vim-virtualenv' +"Plug 'plytophogy/vim-virtualenv' "Plug 'ervandew/supertab' "Plug 'ncm2/ncm2' "Plug 'roxma/nvim-yarp' @@ -299,8 +299,9 @@ autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false}) 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 *.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 *.ts lua vim.lsp.buf.format({ async = false }) " Goto previous/next diagnostic warning/error nnoremap g[ lua vim.diagnostic.goto_prev()